Merge pull request #750 from ossf/regex0_mv_answers

david-a-wheeler · web-flow · commit 77bee8505630 · 2025-01-29T17:37:48.000-05:00
Move regex0 lab answers
diff --git a/docs/labs/regex0.html b/docs/labs/regex0.html
@@ -12,21 +12,6 @@
 
 <!-- See create_labs.md for how to create your own lab! -->
 
-<!-- Sample expected answer -->
-<script id="expected0" type="plain/text">cat</script>
-
-<!-- Full pattern of correct answer -->
-<script id="correct0" type="plain/text">cat</script>
-
-<!-- Sample expected answer -->
-<script id="expected1" type="plain/text">A+BB*</script>
-
-<!-- Full pattern of correct answer -->
-<script id="correct1" type="plain/text">
-A(\+|A\*)
-B(\+|B\*)
-</script>
-
 </head>
 <body>
 <!-- For GitHub Pages formatting: -->
diff --git a/docs/labs/regex0.js b/docs/labs/regex0.js
@@ -48,6 +48,23 @@ info =
       text: "Use \"B+\" to indicate \"one or more B\". You could also write \"BB*\"."
     }
   ],
+  expected: [
+    'cat',
+    'A+BB*'
+  ],
+  correct: [
+    'cat',
+    // Spaces are removed by the preprocessor for this lab.
+    String.raw`A(\+|A\*) B(\+|B\*)`
+  ],
+  successes: [
+    [ 'cat', 'A+B+' ],
+    [ 'cat', 'AA*BB*' ],
+  ],
+  failures: [
+    [ 'Cat', 'A+B+' ],
+    [ 'cat', 'A*B*' ],
+  ],
   preprocessing: [
     [
       "\\s*",
