Remove m postfix from all_ws() (#108)

* remove m postfix * add test normalize \r\n to \n on the test runner + make line-comment absorb \r\n correctly.
w3c · Nov 3, 2017 · 407aaef · 407aaef
1 parent 8f7c37e
commit 407aaef
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/lib/webidl2.js b/lib/webidl2.js
@@ -115,7 +115,7 @@
           let w = t.value;
           const re = {
             "ws": /^([\t\n\r ]+)/,
-            "line-comment": /^\/\/(.*)\n?/m,
+            "line-comment": /^\/\/(.*)\r?\n?/,
             "multiline-comment": /^\/\*((?:.|\n|\r)*?)\*\//
           };
           const wsTypes = [];

diff --git a/test/syntax.js b/test/syntax.js
@@ -26,7 +26,7 @@ describe("Parses all of the IDLs to produce the correct ASTs", () => {
         if (fs.existsSync(optFile))
           opt = JSON.parse(fs.readFileSync(optFile, "utf8"));
         const diff = jdp.diff(JSON.parse(fs.readFileSync(json, "utf8")),
-          wp.parse(fs.readFileSync(idl, "utf8"), opt));
+          wp.parse(fs.readFileSync(idl, "utf8").replace(/\r\n/g, "\n"), opt));
         if (diff && debug) console.log(JSON.stringify(diff, null, 4));
         expect(diff).toBe(undefined);
       }

diff --git a/test/syntax/idl/linecomment.widl b/test/syntax/idl/linecomment.widl
@@ -0,0 +1,2 @@
+/* first */
+// second
diff --git a/test/syntax/json/linecomment.json b/test/syntax/json/linecomment.json
@@ -0,0 +1,14 @@
+[
+    {
+        "type": "multiline-comment",
+        "value": " first "
+    },
+    {
+        "type": "ws",
+        "value": "\n"
+    },
+    {
+        "type": "line-comment",
+        "value": " second"
+    }
+]
diff --git a/test/syntax/opt/linecomment.json b/test/syntax/opt/linecomment.json
@@ -0,0 +1,3 @@
+{
+    "ws": true
+}