lab hello.html: Move answer to JavaScript file

david-a-wheeler · david-a-wheeler · commit 053999158c4a · 2025-01-29T12:20:23.000-05:00
For internationalization it's better to have the
expected answer and correct answer pattern in a shared .js
file. Do this for lab hello.html, fixing a bug in this
previously-unused functionality.

Signed-off-by: David A. Wheeler &lt;dwheeler@dwheeler.com&gt;
diff --git a/docs/labs/checker.js b/docs/labs/checker.js
@@ -781,12 +781,15 @@ function setupInfo() {
         };
     };
     if (info.correct != null) {
-        if (correct.length > 0) {
+        if (correctRe.length > 0) {
             alert("Error: Info defines correct value but it's overridden.");
 	} else if (!(info.correct instanceof Array)) {
             alert('Error: Info correct hints must be array.');
         } else {
-            correct = info.correct.map((s) => trimNewlines(s));
+            let correct = info.correct.map((s) => trimNewlines(s));
+            // Set global variable with compiled correct answer
+            correctRe = correct.map((s) =>
+              processRegex(s, `correct answer ${s}`, true));
         };
     };
 }
diff --git a/docs/labs/hello.html b/docs/labs/hello.html
@@ -11,17 +11,6 @@
 <link rel="license" href="https://creativecommons.org/licenses/by/4.0/">
 
 <!-- See create_labs.md for how to create your own lab! -->
-
-<!-- Sample expected answer -->
-<script id="expected0" type="plain/text">
-console.log("Hello, world!");
-</script>
-
-<!-- Full pattern of correct answer -->
-<script id="correct0" type="plain/text">
-\s* console \. log \( (["'`])Hello,\x20world!\1 \) ; \s*
-</script>
-
 </head>
 <body>
 <!-- For GitHub Pages formatting: -->
diff --git a/docs/labs/hello.js b/docs/labs/hello.js
@@ -65,6 +65,10 @@ info =
       examples: [ [ "  console.log(\"Hello, world!\")  " ] ]
     }
   ],
+  expected: ['console.log("Hello, world!");'],
+  correct:
+    [String.raw`\s* console \. log \(
+	       (["'${BACKQUOTE}])Hello,\x20world!\1 \) ; \s*`],
   successes: [
     [ " console . log( \"Hello, world!\" ) ; " ],
     [ " console . log( 'Hello, world!' ) ; " ],
