organize grammar, improve content node, update tests

ventojs · Mar 7, 2024 · c1eb14b · c1eb14b
1 parent 0915d91
commit c1eb14b
Show file tree

Hide file tree

Showing 4 changed files with 218 additions and 231 deletions.
diff --git a/corpus/main.txt b/corpus/main.txt
@@ -17,17 +17,13 @@ Variables
   (content)
   (tag
     (code))
-  (content)
   (tag
     (code))
-  (content)
   (tag
     (keyword)
     (code))
-  (content)
   (tag
     (code))
-  (content)
   (tag
     (keyword))
   (content))
@@ -41,6 +37,9 @@ Comments
   {{# This is a comment #}}
   {{# a comment #}}
   {{# comment #}}
+
+  <h1>Hello world!</h1>
+
   {{# life is pain comment #}}
   {{ This is not a comment }}
   {{# I'm a multi-line comment #}}
@@ -52,19 +51,15 @@ Comments
   (content)
   (tag
     (comment))
-  (content)
   (tag
     (comment))
-  (content)
   (tag
     (comment))
   (content)
   (tag
     (comment))
-  (content)
   (tag
     (code))
-  (content)
   (tag
     (comment))
   (content))
@@ -85,40 +80,33 @@ Filters
 ---
 
 (template
-  (content)
   (tag
     (keyword)
     (code)
     (filter
       (code)))
-  (content)
   (tag
     (keyword)
     (code)
     (filter
       (code)
       (code)))
-  (content)
   (tag
     (keyword)
     (code)
     (filter
       (code)))
-  (content)
   (tag
     (keyword)
     (code))
-  (content)
   (tag
     (keyword)
     (code))
-  (content)
   (tag
     (keyword)
     (code)
     (filter
       (code)))
-  (content)
   (tag
     (keyword)
     (code)
@@ -144,42 +132,34 @@ Expressions
 ---
 
 (template
-  (content)
   (tag
     (keyword)
     (code))
-  (content)
   (tag
     (code))
-  (content)
   (tag
     (code))
-  (content)
   (tag
     (keyword)
     (code))
-  (content)
   (tag
     (keyword)
     (code)
     (filter
       (code)))
-  (content)
   (tag
     (keyword)
     (code)
     (filter
       (code)
       (code)))
-  (content)
   (tag
     (keyword)
     (code)
     (filter
       (code)
       (code)
       (code)))
-  (content)
   (tag
     (keyword))
   (content))
@@ -200,27 +180,20 @@ Expressions 2
 ---
 
 (template
-  (content)
   (tag
     (keyword)
     (code))
-  (content)
   (tag)
-  (content)
   (tag)
-  (content)
   (tag
     (keyword)
     (code))
-  (content)
   (tag
     (keyword)
     (code))
-  (content)
   (tag
     (keyword)
     (code))
-  (content)
   (tag
     (code))
   (content))
@@ -233,31 +206,44 @@ Stress Keywords
 {{ code }}
 {{ keyword code }}
 {{ keyword() code }}
-
+<h1>Hello!</h1>
 {{ Deno }}
 {{ Deno thing }}
 
 ---
 
 (template
-  (content)
   (tag
     (keyword)
     (code))
-  (content)
   (tag
     (code))
-  (content)
   (tag
     (keyword)
     (code))
-  (content)
   (tag
     (code))
   (content)
   (tag
     (code))
+  (tag
+    (code))
+  (content))
+
+====================
+Test parens
+====================
+
+<h1 style="color: rgba(color)">Hello!</h1>
+{{ hello }}
+{{ code().doStuff!() }}
+
+---
+
+(template
   (content)
+  (tag
+    (code))
   (tag
     (code))
   (content))
diff --git a/src/grammar.json b/src/grammar.json
@@ -137,27 +137,6 @@
         }
       ]
     },
-    "keyword": {
-      "type": "PATTERN",
-      "value": "[a-z>][a-zA-Z]*? |if|for|include|set|import|export|layout|function"
-    },
-    "code_snippet": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "PATTERN",
-          "value": "[a-zA-Z>\\.\\(\\)\\!_\\?]"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_code"
-        }
-      ]
-    },
-    "close_keyword": {
-      "type": "PATTERN",
-      "value": "\\/([a-zA-Z]+|if|for|include|set|import|export|layout|function)"
-    },
     "filter": {
       "type": "REPEAT1",
       "content": {
@@ -179,6 +158,27 @@
         ]
       }
     },
+    "keyword": {
+      "type": "PATTERN",
+      "value": "[a-z>][a-zA-Z]*? |if|for|include|set|import|export|layout|function"
+    },
+    "code_snippet": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "PATTERN",
+          "value": "[a-zA-Z>\\.\\(\\)\\!_\\?]"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_code"
+        }
+      ]
+    },
+    "close_keyword": {
+      "type": "PATTERN",
+      "value": "\\/([a-zA-Z]+|if|for|include|set|import|export|layout|function)"
+    },
     "comment": {
       "type": "PATTERN",
       "value": "#[^#]+#"
@@ -201,3 +201,4 @@
   "inline": [],
   "supertypes": []
 }
+