Remove unnecessary semicolons from the grammar

ditto-lang · Jan 13, 2023 · 8ef1dd9 · 8ef1dd9
1 parent 1b3bb40
commit 8ef1dd9
Show file tree

Hide file tree

Showing 47 changed files with 8,135 additions and 5,333 deletions.
diff --git a/rules/expressions/let.js b/rules/expressions/let.js
@@ -13,7 +13,6 @@ module.exports = {
       field("binder", $._pattern),
       field("type_annotation", optional($.type_annotation)),
       "=",
-      field("expression", $._expression),
-      ";"
+      field("expression", $._expression)
     ),
 };
diff --git a/rules/module/declarations.js b/rules/module/declarations.js
@@ -11,37 +11,34 @@ module.exports = {
 
   _type_declaration: $ => choice($.type_declaration, $.type_declaration_empty),
 
-  // type Maybe(a) = Just(a) | Nothing;
+  // type Maybe(a) = Just(a) | Nothing
   type_declaration: $ =>
     seq(
       "type",
       field("name", $.type_declaration_name),
       field("variables", optional($.type_declaration_variables)),
       "=",
       field("constructor", seq(optional("|"), $.type_declaration_constructor)),
-      field("constructor", repeat(seq("|", $.type_declaration_constructor))),
-      ";"
+      field("constructor", repeat(seq("|", $.type_declaration_constructor)))
     ),
 
-  // type Unknown;
+  // type Unknown
   type_declaration_empty: $ =>
     seq(
       "type",
       field("name", $.type_declaration_name),
-      field("variables", optional($.type_declaration_variables)),
-      ";"
+      field("variables", optional($.type_declaration_variables))
     ),
 
-  // type alias Double = Float;
+  // type alias Double = Float
   type_alias_declaration: $ =>
     seq(
       "type",
       "alias",
       field("name", $.type_declaration_name),
       field("variables", optional($.type_declaration_variables)),
       "=",
-      field("aliased_type", $._type),
-      ";"
+      field("aliased_type", $._type)
     ),
 
   type_declaration_name: $ => $._proper_name,
@@ -62,25 +59,23 @@ module.exports = {
   type_declaration_constructor_fields: $ =>
     seq("(", field("field", commaSep1($._type)), ")"),
 
-  // five = 5;
+  // five = 5
   value_declaration: $ =>
     seq(
       field("name", $.value_declaration_name),
       field("type_annotation", optional($.type_annotation)),
       "=",
-      field("expression", $._expression),
-      ";"
+      field("expression", $._expression)
     ),
 
   value_declaration_name: $ => $._name,
 
-  // foreign is_eq_impl = (Int, Int) -> Bool;
+  // foreign is_eq_impl = (Int, Int) -> Bool
   foreign_value_declaration: $ =>
     seq(
       "foreign",
       field("name", $.foreign_value_declaration_name),
-      field("type_annotation", $.type_annotation),
-      ";"
+      field("type_annotation", $.type_annotation)
     ),
 
   foreign_value_declaration_name: $ => $._name,

diff --git a/rules/module/header.js b/rules/module/header.js
@@ -7,8 +7,7 @@ module.exports = {
       "module",
       field("module_name", $.module_name),
       "exports",
-      field("exports", $._exposing),
-      ";"
+      field("exports", $._exposing)
     ),
 
   module_name: $ => sep1($._proper_name, "."),
@@ -20,8 +19,7 @@ module.exports = {
       field("package", optional($.module_import_package)),
       field("module_name", $.module_name),
       field("alias", optional(seq("as", $.module_import_alias))),
-      field("imports", optional($._exposing)),
-      ";"
+      field("imports", optional($._exposing))
     ),
 
   module_import_package: $ => seq("(", $._package_name, ")"),

diff --git a/src/grammar.json b/src/grammar.json
@@ -63,10 +63,6 @@
             "type": "SYMBOL",
             "name": "_exposing"
           }
-        },
-        {
-          "type": "STRING",
-          "value": ";"
         }
       ]
     },
@@ -166,10 +162,6 @@
               }
             ]
           }
-        },
-        {
-          "type": "STRING",
-          "value": ";"
         }
       ]
     },
@@ -437,10 +429,6 @@
               ]
             }
           }
-        },
-        {
-          "type": "STRING",
-          "value": ";"
         }
       ]
     },
@@ -474,10 +462,6 @@
               }
             ]
           }
-        },
-        {
-          "type": "STRING",
-          "value": ";"
         }
       ]
     },
@@ -527,10 +511,6 @@
             "type": "SYMBOL",
             "name": "_type"
           }
-        },
-        {
-          "type": "STRING",
-          "value": ";"
         }
       ]
     },
@@ -721,10 +701,6 @@
             "type": "SYMBOL",
             "name": "_expression"
           }
-        },
-        {
-          "type": "STRING",
-          "value": ";"
         }
       ]
     },
@@ -754,10 +730,6 @@
             "type": "SYMBOL",
             "name": "type_annotation"
           }
-        },
-        {
-          "type": "STRING",
-          "value": ";"
         }
       ]
     },
@@ -1899,10 +1871,6 @@
             "type": "SYMBOL",
             "name": "_expression"
           }
-        },
-        {
-          "type": "STRING",
-          "value": ";"
         }
       ]
     },