fix: Fix jsx regexes in Lexer

madlib-lang · Apr 25, 2021 · 7db4800 · 7db4800
1 parent 6943da2
commit 7db4800
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/Parse/Madlib/Lexer.x b/src/Parse/Madlib/Lexer.x
@@ -147,7 +147,7 @@ whiteList :: Regex
 whiteList = toRegex "\\`[\ \t \n]*[a-zA-Z0-9\"]+[\\(]?.*"
 
 toRegex :: String -> Regex
-toRegex = makeRegexOpts defaultCompOpt { multiline = False } defaultExecOpt
+toRegex = makeRegexOpts defaultCompOpt { multiline = True, newSyntax = True } defaultExecOpt
 
 jsxTagOpen :: Regex
 jsxTagOpen = toRegex "\\`<[a-zA-Z1-9]+([ \n\t]+[a-zA-Z]+=(\"[^\"]*\"|{.*}))*[ \n\t]*>"
@@ -160,7 +160,6 @@ jsxTagClose = toRegex "\\`<\\/[a-zA-Z1-9]+([ \n\t]+[a-zA-Z]+=(\"[^\"]*\"|{.*}))*
 
 constraintRegex :: Regex
 constraintRegex = toRegex "\\`[^={]*(=>)[^}]*"
--- constraintRegex = toRegex "\\`[^={]*(=>)[^}]*([^=]=[^=]|{[\\t\\ ]*\n).*"
 
 -- Int: commentDepth
 -- (String, Int): (stringBuffer, curlyCount)
@@ -348,17 +347,16 @@ mapToken tokenizer (posn, prevChar, pending, input) len = do
           if sc /= instanceHeader then
             return $ TokenName s
           else
-            let next = BLU.fromString $ take 250 input 
+            let next    = BLU.fromString $ take 500 input 
                 matched = match constraintRegex next :: Bool
-                -- matched = match constraintRegex next :: BS.ByteString -- 10.4
             in
               if not matched then
                 return $ TokenName s
               else
                 return $ TokenConstraintName s
 
         TokenRightChevron ->
-          let next  = BLU.fromString $ ((tail . (take 200)) input)
+          let next    = BLU.fromString $ ((tail . (take 200)) input)
               matchWL = match whiteList next :: BS.ByteString
               matchBL = match blackList matchWL :: Bool
           in
@@ -367,9 +365,9 @@ mapToken tokenizer (posn, prevChar, pending, input) len = do
             else return TokenTupleEnd
 
         TokenLeftChevron ->
-          let next    = BLU.fromString $ take 400 input
-              matchedOpen = match jsxTagOpen next :: Bool
-              matchedClose = match jsxTagClose next :: Bool
+          let next          = BLU.fromString $ take 800 input
+              matchedOpen   = match jsxTagOpen next :: Bool
+              matchedClose  = match jsxTagClose next :: Bool
               matchedSingle = match jsxTagSingle next :: Bool
           in
             if matchedSingle then do