Merge pull request #9 from fink-lang/regex

regex

Author: kollhof

src/regex.fnk

@@ -1,8 +1,8 @@
 {raw} = import './str'
 
 
-regex = fn pattern, flags:
-  new RegExp pattern, flags
+regex = fn pattern, flags='':
+  new RegExp pattern, 'u${flags}'
 
 
 ---
@@ -18,11 +18,15 @@ reg = rx'
 ```
 ---
 rx = fn strings, ...exprs:
-  ingorables = regex raw'(\s*#.*\n)|(\n\s*)'
+  # implement in loxia or larix for optimization
+  ingorables = regex raw'(\s+#.*\n)|(\n\s*)'
+  esc = regex raw`(^|[^\\])((\\{2})*)\\(?=[#'"${'`'}'])`
 
   [...parts] = pipe strings.raw:
     map part:
-      replace_all part, ingorables, ''
+      pipe part:
+        replace_all ?, ingorables, ''
+        replace_all ?, esc, '$1$3'
 
   regex raw {raw: parts}, ...exprs
 

src/regex.test.fnk

@@ -62,22 +62,25 @@ describe 'string templates', fn:
   it 'handles multiline commented regex', fn:
     expect
       rx'
-        (?<year>\d{4})-    # year part of a date
+        (?<year>\d{4})-   # year part of a date
         (?<month>\d{2})-  # month part of a date
-        (?<day>\d{2})      # day part of a date
+        (?<day>\d{2})     # day part of a date
       '
       to_equal rx'(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})'
 
 
-  it 'handles escaping comment', fn:
+  it 'handles escaping', fn:
     expect
-      rx'foo\#bar'
-      to_equal regex 'foo\\#bar'
+      rx'
+        \'\"\`
+        foo \# bar
+        \${2}
+        \\*
+      '
+      to_equal regex `'"\`foo # bar\\\${2}\\\\*`
 
 
   it 'handles spaces', fn:
     expect
       rx'[ ]{3}'
       to_equal regex '[ ]{3}'
-
-