Lab regex1: Move answers to JavaScript

david-a-wheeler · david-a-wheeler · commit 0e267ec18958 · 2025-01-29T19:32:09.000-05:00
Signed-off-by: David A. Wheeler &lt;dwheeler@dwheeler.com&gt;
diff --git a/docs/labs/regex1.html b/docs/labs/regex1.html
@@ -12,84 +12,6 @@
 
 <!-- See create_labs.md for how to create your own lab! -->
 
-<!-- Sample expected answer -->
-<script id="expected0" type="plain/text">
-^[YN]$
-</script>
-
-<!-- Full pattern of correct answer -->
-<script id="correct0" type="plain/text">
-\^(
-\[YN\]|
-\[NY\]|
-\( (\?\:)? Y\|N \)|
-\( (\?\:)? N\|Y \)
-)\$
-</script>
-
-<!-- Sample expected answer -->
-<script id="expected1" type="plain/text">
-^[A-Z]+$
-</script>
-
-<!-- Full pattern of correct answer -->
-<script id="correct1" type="plain/text">
-\^
-\[A-Z\]
-(\+|\[A-Z\]\*)
-\$
-</script>
-
-<!-- Sample expected answer -->
-<script id="expected2" type="plain/text">
-^(true|false)$
-</script>
-
-<!-- Full pattern of correct answer -->
-<script id="correct2" type="plain/text">
-\^\( (\?\:)?
-(
-true\|false|
-false\|true
-)\)\$
-</script>
-
-<!-- Sample expected answer -->
-<script id="expected3" type="plain/text">
-^[A-Z]+\Z
-</script>
-
-<!-- Full pattern of correct answer -->
-<script id="correct3" type="plain/text">
-\^
-\[A-Z\]
-(\+|\[A-Z\]\*)
-\\Z
-</script>
-
-<!-- Sample expected answer.
-Only matches one Latin letters (A through Z), followed by a
-dash ("-"), followed by one or more digits.
-This time, do it for Ruby (not JavaScript or Python).
- -->
-<script id="expected4" type="plain/text">
-\A[A-Z]-[0-9]+\z
-</script>
-
-<!-- Full pattern of correct answer -->
-<script id="correct4" type="plain/text">
-\\A
-\[A-Z\]
--
-(\[0-9\]|\\d)
-(\+|(\[0-9\]|\\d)\*)
-\\z
-</script>
-
-<!--
-
--->
-
 </head>
 <body>
 <!-- For GitHub Pages formatting: -->
diff --git a/docs/labs/regex1.js b/docs/labs/regex1.js
@@ -162,6 +162,27 @@ info =
       text: "In this case we are only matching one letter, not many of them. Do not use \"*\" or \"+\" after [A-Z]."
     }
   ],
+  expected: [
+    '^[YN]$',
+    '^[A-Z]+$',
+    '^(true|false)$',
+    String.raw`^[A-Z]+\Z`,
+    String.raw`\A[A-Z]-[0-9]+\z`,
+  ],
+  correct: [
+    String.raw`\^(
+      \[YN\]|\[NY\]|
+      \( (\?\:)? Y\|N \)|
+      \( (\?\:)? N\|Y \) )\$`,
+    String.raw`\^ \[A-Z\](\+|\[A-Z\]\*) \$`,
+    String.raw`\^\( (\?\:)?
+      (true\|false|false\|true)\)\$`,
+    // Python uses \Z
+    String.raw`\^ \[A-Z\] (\+|\[A-Z\]\*) \\Z`,
+    // Ruby uses \A and \z
+    String.raw`\\A \[A-Z\]-(\[0-9\]|\\d)
+      (\+|(\[0-9\]|\\d)\*) \\z`,
+  ],
   preprocessing: [
     [
       "\\s*",
