Optional semicolon in the require syntax (#63)

esy · Sep 29, 2019 · 4661656 · 4661656
1 parent 2333d2e
commit 4661656
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/e2e-tests/pesy-configure-test-projects/pesy-npm-scoped/package.json b/e2e-tests/pesy-configure-test-projects/pesy-npm-scoped/package.json
@@ -21,8 +21,8 @@
     "library/foo/bar": {},
     "executable": {
       "imports": [
-        "Bar = require('@my-scope/pesy-npm/library/foo/bar')",
-        "Library = require('@my-scope/pesy-npm/library')"
+        "Bar = require('@my-scope/pesy-npm/library/foo/bar');",
+        "Library = require('@my-scope/pesy-npm/library');"
       ],
       "bin": {
         "pesy-npm-app.exe": "PesyNpmApp.re"

diff --git a/lib/Lexer.mll b/lib/Lexer.mll
@@ -6,6 +6,7 @@ rule read = parse
 [' ' '\t']   { read lexbuf }     (* skip blanks *)
 | ['(']      { LPAREN }
 | [')']      { RPAREN }
+| [';']      { SEMICOLON }
 | ['=']      { ASSN }
 | "require"  { REQUIRE }
 | ['\'']      { SQUOTE }

diff --git a/lib/Parser.mly b/lib/Parser.mly
@@ -1,10 +1,11 @@
-%token LPAREN RPAREN
+%token LPAREN RPAREN SEMICOLON
 %token EOL ASSN SQUOTE EOF REQUIRE
 %token <string> MODULE_NAME
 %token <string> MODULE_PATH 
 %start main             /* the entry point */
 %type <string * string> main
 %%
 main:
-    MODULE_NAME ASSN REQUIRE LPAREN SQUOTE MODULE_PATH SQUOTE RPAREN EOF                { ($1, $6) }
+  MODULE_NAME ASSN REQUIRE LPAREN SQUOTE MODULE_PATH SQUOTE RPAREN EOF                { ($1, $6) }
+    | MODULE_NAME ASSN REQUIRE LPAREN SQUOTE MODULE_PATH SQUOTE RPAREN SEMICOLON EOF                { ($1, $6) }
 ;