Merge pull request #39 from fink-lang/upgrade-parser

feat(parser): upgrade to latest prattler

Author: kollhof

package-lock.json

@@ -30,7 +30,7 @@
     "release": "semantic-release"
   },
   "dependencies": {
-    "@fink/prattler": "^2.0.0"
+    "@fink/prattler": "^3.0.0"
   },
   "devDependencies": {
     "@fink/cli": "^2.3.0",

package.json

@@ -1,4 +1,4 @@
-{add_operator_like} = import '@fink/prattler/symbols'
+{add_operator} = import '@fink/prattler/symbols'
 
 {infix, infix_right} = import '../generic/infix'
 {prefix} = import '../generic/prefix'
@@ -11,12 +11,12 @@ arithm_prefix = fn op: prefix:: op, 'arithm_prefix'
 
 add_arithmetic_operators = fn ctx:
   pipe ctx:
-    add_operator_like:: arithm:: '+'
-    add_operator_like:: arithm:: '-'
+    add_operator:: arithm:: '+'
+    add_operator:: arithm:: '-'
 
-    add_operator_like:: arithm:: '*'
-    add_operator_like:: arithm:: '/'
-    add_operator_like:: arithm:: '%'
-    add_operator_like:: arithm_right:: '^'
+    add_operator:: arithm:: '*'
+    add_operator:: arithm:: '/'
+    add_operator:: arithm:: '%'
+    add_operator:: arithm_right:: '^'
 
-    add_operator_like:: arithm_prefix:: '-'
+    add_operator:: arithm_prefix:: '-'

src/lang/arithmitic/index.fnk

@@ -1,4 +1,4 @@
-{add_non_binding, add_operator_like} = import '@fink/prattler/symbols'
+{add_operator} = import '@fink/prattler/symbols'
 {infix_right} = import '../generic/infix'
 
 
@@ -7,4 +7,4 @@ assign = fn op: infix_right:: op, 'assign'
 
 add_assignment_operators = fn ctx:
   pipe ctx:
-    add_operator_like:: assign:: '='
+    add_operator:: assign:: '='

src/lang/assignment/index.fnk

@@ -42,11 +42,7 @@ call_no_parens = fn op:
         params:: ctx
       else:
         [{exprs, comments}, next_ctx] = get_block:: ctx
-        # TODO: remove backward compatibility
-        [...args] = pipe exprs:
-          filter expr: expr.value != ','
-
-        [args, next_ctx, comments]
+        [exprs, next_ctx, comments]
 
     {start: end} = curr_loc:: next_ctx
 

src/lang/call/call.fnk

@@ -33,7 +33,7 @@ describe:: 'call() - parsing failures', fn:
         1| foobar(
                   ^
 
-        Expected ')' but found Symbol(end).`
+        Expected one of [ ')' ] but found Symbol(end).`
 
 
   it:: `throws when missing ')'`, fn:
@@ -44,7 +44,7 @@ describe:: 'call() - parsing failures', fn:
         1| foobar(1:)
                    ^
 
-        Expected ')' but found ':'.`
+        Expected one of [ ')' ] but found ':'.`
 
 
 describe:: 'call:: ...', fn:
@@ -67,16 +67,6 @@ describe:: 'call:: ...', fn:
       `
       to_match_snapshot
 
-  it:: 'parses multiline with comma (TODO)', fn:
-    expect::
-      parse_expr:: `
-        foo::
-          bar,
-          ni,
-          shrub
-      `
-      to_match_snapshot
-
 
 describe:: 'pipe foo: ...', fn:
 

src/lang/call/call.test.fnk

@@ -33,15 +33,6 @@ call (1:0-6:20)
   # trailing comment
 `;
 
-exports[`call:: ... parses multiline with comma (TODO) 1`] = `
-call (1:0-4:2)
-  ident (1:0-1:3) foo
-  ident (2:2-2:5) bar
-  ident (3:2-3:4) ni
-  ident (4:2-4:7) shrub
-
-`;
-
 exports[`call:: ... parses single line 1`] = `
 call (1:0-1:15)
   ident (1:0-1:6) foobar

src/lang/call/call.test.fnk.snap

@@ -1,5 +1,5 @@
 {
-  add_operator_like, add_non_binding, add_non_separating
+  add_operator, add_separator, add_non_separating
 } = import '@fink/prattler/symbols'
 
 {call, call_no_parens} = import './call'
@@ -9,8 +9,8 @@
 
 add_call_operators = fn ctx:
   pipe ctx:
-    add_operator_like:: call:: '('
-    add_non_binding:: symbol:: ','
-    add_non_binding:: symbol:: ')'
-    add_operator_like:: call_no_parens:: '::'
+    add_operator:: call:: '('
+    add_separator:: symbol:: ','
+    add_separator:: symbol:: ')'
+    add_operator:: call_no_parens:: '::'
     add_non_separating:: named_block:: 'pipe'

src/lang/call/index.fnk

@@ -1,4 +1,4 @@
-{add_operator_like} = import '@fink/prattler/symbols'
+{add_operator} = import '@fink/prattler/symbols'
 
 {symbol} = import '../symbols'
 {get_block} = import '../block'
@@ -17,6 +17,6 @@ colon = fn op, type:
 
 add_colon = fn ctx:
   pipe ctx:
-    add_operator_like:: colon:: ':', 'block'
+    add_operator:: colon:: ':', 'block'
 
 

src/lang/colon/index.fnk

@@ -1,5 +1,5 @@
 {
-  next_is_end, next_loc, collect_text, advance, expression
+  next_is_end, next_is, next_loc, collect_text, advance, expression
 } = import '@fink/prattler'
 
 {next_is_unindented} = import '../indentation'
@@ -12,7 +12,7 @@ collect_comments = fn ctx, op:
   comment = {op, ...text}
 
   match next_ctx:
-    {next_token: {value: '#'}}:
+    next_is:: ?, '#':
       [comments, final_ctx] = collect_comments::
         advance:: next_ctx
         op

src/lang/comments/comment.fnk

@@ -1,10 +1,10 @@
-{add_non_binding} = import '@fink/prattler/symbols'
+{add_separator} = import '@fink/prattler/symbols'
 
 {comment} = import './comment'
 {doc_comment} = import './doc-comment'
 
 
 add_comments = fn ctx:
   pipe ctx:
-    add_non_binding:: comment:: '#'
-    add_non_binding:: doc_comment:: '---'
+    add_separator:: comment:: '#'
+    add_separator:: doc_comment:: '---'

src/lang/comments/index.fnk

@@ -1,15 +1,15 @@
-{add_operator_like} = import '@fink/prattler/symbols'
+{add_operator} = import '@fink/prattler/symbols'
 {infix} = import '../generic/infix'
 
 
 comp = fn op: infix:: op, 'comp'
 
-
+# TODO: support combining e.g. 0 < foo < 10
 add_comparison_operators = fn ctx:
   pipe ctx:
-    add_operator_like:: comp:: '=='
-    add_operator_like:: comp:: '!='
-    add_operator_like:: comp:: '>='
-    add_operator_like:: comp:: '<='
-    add_operator_like:: comp:: '>'
-    add_operator_like:: comp:: '<'
+    add_operator:: comp:: '=='
+    add_operator:: comp:: '!='
+    add_operator:: comp:: '>='
+    add_operator:: comp:: '<='
+    add_operator:: comp:: '>'
+    add_operator:: comp:: '<'

src/lang/comparison/index.fnk

@@ -1,4 +1,4 @@
-{add_operator_like, add_non_binding} = import '@fink/prattler/symbols'
+{add_operator, add_separator} = import '@fink/prattler/symbols'
 {next_is, curr_loc} = import '@fink/prattler'
 
 {symbol} = import '../symbols'
@@ -21,6 +21,6 @@ group = fn op:
 
 add_group = fn ctx:
   pipe ctx:
-    add_operator_like:: group:: '('
-    add_non_binding:: symbol:: ','
-    add_non_binding:: symbol:: ')'
+    add_operator:: group:: '('
+    add_separator:: symbol:: ','
+    add_separator:: symbol:: ')'