Merge pull request #3 from fink-lang/regex

regex module

Author: kollhof

src/regex.fnk

@@ -0,0 +1,33 @@
+{raw} = import './str'
+
+
+regex = fn pattern, flags:
+  new RegExp pattern, flags
+
+
+rx = fn strings, ...exprs:
+  regex raw strings, ...exprs
+
+
+match_all = fn str, rx:
+  str.matchAll regex rx, 'g'
+
+
+find_index = fn str, rx:
+  str.search rx
+
+
+split = fn str, rx, ...args:
+  str.split rx, ...args
+
+
+replace = fn str, rx, replacement:
+  str.replace rx, replacement
+
+
+replace_all = fn str, rx, replacement:
+  rxg = regex rx, 'g'
+  str.replace rxg, replacement
+
+
+matches = fn str, rx: rx.test str

src/regex.test.fnk

@@ -0,0 +1,61 @@
+{describe, it, expect, to_equal} = import '@fink/jest'
+
+{matches, match_all, find_index, split, replace_all, replace, rx} = import './regex'
+
+
+describe 'regex', fn:
+  it 'matches single', fn:
+    expect
+      matches 'foobar', rx/.+oo.+/
+      to_equal
+        true
+
+    expect
+      matches 'foobar', rx/ni/
+      to_equal
+        false
+
+
+  it 'matches multiple', fn:
+    [...matches] = pipe match_all 'foobar, spam, ham', rx/(?<=\s).+?am/:
+      map [m]: m
+
+    expect
+      matches
+      to_equal
+        ['spam', 'ham']
+
+
+  it 'searches', fn:
+    expect
+      find_index 'foobar, spam, ham', rx/(?<=\s).+?am/
+      to_equal 8
+
+
+  it 'splits', fn:
+    expect
+      split 'foobar, spam , ham', rx/\s*,\s*/
+      to_equal
+        ['foobar', 'spam', 'ham']
+
+
+  it 'replaces all', fn:
+    expect
+      replace_all 'foobar, spam, ham, ni', rx/,.+?am/, ''
+      to_equal 'foobar, ni'
+
+
+  it 'replaces single', fn:
+    expect
+      replace 'foobar, spam, ham, ni', rx/,.+?am/, ''
+      to_equal 'foobar, ham, ni'
+
+
+
+describe 'string templates', fn:
+
+  expect
+    rx'\(.+?\)(foo{${1},${4}})'
+    to_equal rx/\(.+?\)(foo{1,4})/
+
+

src/stack-trace.test.fnk

@@ -1,6 +1,6 @@
 {describe, it, expect, to_equal} = import '@fink/jest'
 
-{replace, split} = import './str'
+{replace_all, split} = import './regex'
 
 {stack_trace} = import './stack-trace'
 
@@ -10,7 +10,7 @@ describe 'stack_trace', fn:
     foo = fn:
       stack = stack_trace()
       [, line] = pipe stack:
-        replace ?, rx/\(.+\//mg, '('
+        replace_all ?, rx/\(.+\//, '('
         split ?, '\n'
       line
 

src/str.fnk

@@ -10,17 +10,6 @@ code_point = fn str, idx: str.codePointAt idx
 ends_with = fn str, end, ...args: str.endsWith end, ...args
 starts_with = fn str, end, ...args: str.startsWith end, ...args
 
-# TODO move to regex module?
-matches = fn str, rx:
-  result = str.match rx
-  match result:
-    {}: result
-    else: []
-match_all = fn str, rx: str.matchAll rx
-find_index = fn str, rx: str.search rx
-split = fn str, rx, ...args: str.split rx, ...args
-replace = fn str, rx, replacement: str.replace rx, replacement
-
 slice = fn str, ...args: str.slice ...args
 
 
@@ -41,6 +30,3 @@ lower_case = fn str: str.toLowerCase()
 upper_case = fn str: str.toUpperCase()
 
 raw = String.raw
-
-rx = fn strings, ...exprs:
-  new RegExp raw strings, ...exprs

src/str.test.fnk

@@ -56,46 +56,6 @@ describe 'string assertions', fn:
 
 
 
-describe 'regex', fn:
-  it 'matches single', fn:
-    [,spam, ham] = matches 'foobar, spam, ham', rx/,\s*(\w+),\s*(\w+)/
-
-    expect
-      [spam, ham]
-      to_equal
-        ['spam', 'ham']
-
-    expect
-      matches 'foobar', rx/ni/g
-      to_equal
-        []
-
-  it 'matches multiple', fn:
-    [...matches] = pipe match_all 'foobar, spam, ham', rx/(?<=\s).+?am/g:
-      map [m]: m
-
-    expect
-      matches
-      to_equal
-        ['spam', 'ham']
-
-  it 'searches', fn:
-    expect
-      find_index 'foobar, spam, ham', rx/(?<=\s).+?am/g
-      to_equal 8
-
-  it 'splits', fn:
-    expect
-      split 'foobar, spam, ham', rx/\s*,\s*/
-      to_equal
-        ['foobar', 'spam', 'ham']
-
-  it 'replaces', fn:
-    expect
-      replace 'foobar, spam, ham, ni', rx/,.+?am/g, ''
-      to_equal 'foobar, ni'
-
-
 describe 'slice', fn:
   it 'slices', fn:
     expect
@@ -107,6 +67,7 @@ describe 'slice', fn:
       to_equal '67'
 
 
+
 describe 'formatting', fn:
   it 'pads', fn:
     expect
@@ -145,13 +106,9 @@ describe 'formatting', fn:
       to_equal 'FOOBAR'
 
 
+
 describe 'string templates', fn:
   expect
     raw'\a\('
     to_equal '\\a\\('
 
-  expect
-    rx'\(.+?\)(foo{${1},${4}})'
-    to_equal rx/\(.+?\)(foo{1,4})/
-
-