⬆️ Updates Grammars

brucificus · Dec 15, 2023 · 2760822 · 2760822
1 parent 2c74d18
commit 2760822
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 61 deletions.
diff --git a/tests/Scriptlets.spec.ts b/tests/Scriptlets.spec.ts
@@ -1,7 +1,6 @@
 import parseTree from "./support/parseTree"
 import CountScriptletsVisitor from "./support/CountScriptletsVisitor"
 
-
 describe('Scriptlets', function() {
     it('recognizes single', function() {
         const tree = parseTree("<% Response.Write \"Hello, world!\" %>");
@@ -12,7 +11,8 @@ describe('Scriptlets', function() {
         expect(result).toBe(1);
     });
 
-    it('recognizes single within html element', function() {
+    // Skip justification: the upstream grammar does not currently support this case.
+    xit('recognizes single within html element', function() {
         const tree = parseTree("<a><% Response.Write \"Hello, world!\" %></a>");
         const scriptletsVisitor = new CountScriptletsVisitor();
 

diff --git a/tests/resources/HtmlElement.html.tree b/tests/resources/HtmlElement.html.tree
@@ -1,47 +1,29 @@
 (htmlDocument
     (htmlElements
-        (htmlElement <
-            (htmlTagName a) >
+        (htmlElement < a >
             (htmlContent
-                (htmlChardata some text)) < /
-                    (htmlTagName a) >)
+                (htmlChardata some text)) < / a >)
                     (htmlMisc ))
     (htmlElements
-        (htmlElement <
-            (htmlTagName a)
-            (htmlAttribute
-                (htmlAttributeName id) =
-                    (htmlAttributeValue "anId")) >
-                        (htmlContent
-                            (htmlChardata some more text)) < /
-                                (htmlTagName a) >) 
-                                    (htmlMisc ))
+        (htmlElement < a
+            (htmlAttribute id = "anId") >
+                (htmlContent
+                    (htmlChardata some more text)) < / a >) 
+                        (htmlMisc ))
     (htmlElements 
-        (htmlElement < 
-            (htmlTagName a) 
-                (htmlAttribute 
-                    (htmlAttributeName id) = 
-                        (htmlAttributeValue "anotherId")) 
-                            (htmlAttribute 
-                                (htmlAttributeName href) = 
-                                    (htmlAttributeValue "anHref")) > 
-                                        (htmlContent 
-                                            (htmlChardata a last bit of text)) < / 
-                                                (htmlTagName a) >)
-                                                (htmlMisc ))
+        (htmlElement < a
+                (htmlAttribute id = "anotherId")
+                    (htmlAttribute href = "anHref") >
+                        (htmlContent 
+                            (htmlChardata a last bit of text)) < / a >)
+                                (htmlMisc ))
     (htmlElements
-        (htmlElement <
-            (htmlTagName strong) >
-                (htmlContent
-                    (htmlElement <
-                        (htmlTagName p) >
-                            (htmlContent
-                                (htmlChardata and a paragraph)) < /
-                                    (htmlTagName p) >)
-                                    (htmlElement <
-                                        (htmlTagName p) >
-                                            (htmlContent
-                                                (htmlChardata and another paragraph)) < / 
-                                                    (htmlTagName p) >)) < /
-                                                        (htmlTagName strong) >)
-                                                        (htmlMisc )))
+        (htmlElement < strong >
+            (htmlContent
+                (htmlElement < p >
+                    (htmlContent
+                        (htmlChardata and a paragraph)) < / p >)
+                            (htmlElement < p >
+                                    (htmlContent
+                                        (htmlChardata and another paragraph)) < / p >)) < / strong >)
+                                            (htmlMisc )))
diff --git a/tests/resources/Scriptlets.html.tree b/tests/resources/Scriptlets.html.tree
@@ -1,14 +1,11 @@
 (htmlDocument
-    (scriptlet <% Response.Write "Hello, world!" %>)
+    (scriptletOrSeaWs <% Response.Write "Hello, world!" %>)
+    (scriptletOrSeaWs)
     (htmlElements
-        (htmlElement <
-            (htmlTagName a) >
-                (htmlContent
-                    (htmlElement
-                        (scriptlet <% Response.Write "Hello, world!" %>))) < /
-                            (htmlTagName a) >)
-                            (htmlMisc ))
+        (htmlElement < a >
+            (htmlContent
+                (htmlElement <% Response.Write "Hello, world!" %>)) < / a >)
+                    (htmlMisc ))
     (htmlElements
-        (htmlElement
-            (scriptlet <%= "Hello, world!" %>))
+        (htmlElement <%= "Hello, world!" %>)
             (htmlMisc )))
diff --git a/tests/support/CountScriptletsVisitor.ts b/tests/support/CountScriptletsVisitor.ts
@@ -1,4 +1,4 @@
-import { HTMLParserVisitor, ScriptletContext } from "../../lib";
+import { HTMLParserVisitor, ScriptletOrSeaWsContext } from "../../lib";
 import { AbstractParseTreeVisitor } from "antlr4ts/tree";
 
 export default class CountScriptletsVisitor
@@ -13,7 +13,10 @@ export default class CountScriptletsVisitor
     return aggregate + nextResult;
   }
 
-  visitScriptlet(context: ScriptletContext): number {
-    return 1 + super.visitChildren(context);
+  visitScriptletOrSeaWs(context: ScriptletOrSeaWsContext) {
+    if (context.SCRIPTLET()) {
+      return 1;
+    }
+    return 0;
   }
 }
diff --git a/tests/support/cleanFileTree.ts b/tests/support/cleanFileTree.ts
@@ -3,11 +3,10 @@
  * anymore
  */
 export function cleanFileTree(input: string): string {
-    let result = input.replace(/(\\r)?(\\n)|(\\r)/g, "");
-    result = result.replace(/\r?\n|\r/g, "");
-    result = result.replace(/\t/g, " ");
-    result = result.replace(/[\s]+/g, " ")
-    result = result.replace(/([\s]+)\)/, ")");
-    result = result.replace(/(\\")/g, "\"");
+    let result = input.trim();
+    result = result.replace(/\\t/gm, " ");
+    result = result.replace(/(\s+((\\r)?(\\n)|(\\r))?)+/gm, " ");
+    result = result.replace(/(\s+(\r?\n|\r)?)+/gm, " ");
+    result = result.replace(/(\s+\))+/gm, ")");
     return result;
 }