Merge pull request #757 from ossf/conversion_no_yaml

david-a-wheeler · web-flow · commit 7d64c3f66ad6 · 2025-01-29T19:32:47.000-05:00
Lab conversion: Convert YAML to JavaScript, move answers
diff --git a/docs/labs/conversion.html b/docs/labs/conversion.html
@@ -7,29 +7,11 @@
 <link rel="stylesheet" href="checker.css">
 <script src="js-yaml.min.js"></script>
 <script src="checker.js"></script>
+<script src="conversion.js"></script>
 <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">
-unsigned int queue_count = 0;
-</script>
-<!--
--->
-
-<!-- Full pattern of correct answer -->
-<script id="correct0" type="plain/text">
-^ unsigned\s+int\s+queue_count = 0 ; $
-</script>
-
-<script id="info" type="application/yaml">
----
-hints:
-- absent: "unsigned"
-  text: The type defined for queue_count should exactly match the return type of get_queue.
-# debug: true
-</script>
 </head>
 <body>
 <!-- For GitHub Pages formatting: -->
diff --git a/docs/labs/conversion.js b/docs/labs/conversion.js
@@ -0,0 +1,19 @@
+info =
+{
+  hints: [
+    {
+      absent: "unsigned",
+      text: "The type defined for queue_count should exactly match the return type of get_queue."
+    },
+    {
+      present: String.raw`unsigned\s+queue_count`,
+      text: "The declared return type of get_queue is `unsigned int`; you should match it exactly instead of using a synonym like `unsigned`."
+    }
+  ],
+  expected: [
+    'unsigned int queue_count = 0;'
+  ],
+  correct: [
+    String.raw`^ unsigned\s+int\s+queue_count = 0 ; $`
+  ],
+}
