Fix regression: Change regex disamb to use follow restriction, disall…

…owing newlines in regex patterns.
webdsl · Jun 21, 2021 · 37e1a0a · 37e1a0a
1 parent 8e2af06
commit 37e1a0a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/org/webdsl/dsl/syntax/WebDSL-Regex.sdf b/src/org/webdsl/dsl/syntax/WebDSL-Regex.sdf
@@ -128,14 +128,17 @@ sorts ClassKeyword
     [\&\]\-]                                      -> BracketLiteral {reject}
     [a-zA-Z0-9\!\#\%\'\,\:\;\<\=\>\@\_\`\~\&\]\-]
                                                   -> AtomLiteral
-%%    "/"                                           -> AtomLiteral  %%Dropped, causes ambs when having subsequent stats/exps with regexes
+    "/"                                           -> AtomLiteral
     [\}\)\|\[]                                    -> AtomLiteral {reject}
 
     [\\\|\$\*\+\?\.\{\}\(\)\&\]\-\[\^\!\#\%\'\,\:\;\<\=\>\@\_\`\~a-zA-Z0-9\t\n\r]*              
           -> AllChars
     "/"   -> AllChars
-    "\""  -> AllChars {cons("DoubleQuote") } 
-
+    "\""  -> AllChars {cons("DoubleQuote") }
+
+   lexical restrictions                                                 
+   AtomLiteral -/- [\n]
+
   sorts BracketCharacter AtomCharacter
   context-free syntax
 %%d    "\{"                -> BracketCharacter {cons("CurlyBraceOpen") }

diff --git a/test/syntax/regex-0.txt b/test/syntax/regex-0.txt
@@ -0,0 +1,4 @@
+  function multiRegex(){
+    var first := /bla\n/.replaceAll("$1", x);
+    var second := /alb/.find(x);
+  }
diff --git a/test/syntax/regex.sdf b/test/syntax/regex.sdf
@@ -0,0 +1,11 @@
+module regex
+
+hiddens
+  context-free start-symbols
+    TestDef
+
+  context-free syntax
+    Function -> TestDef
+
+imports
+  WebDSL