Merge pull request #75 from fink-lang/features

features

Author: kollhof

src/lang/block/expr.fnk

@@ -41,6 +41,7 @@ next_is_end_of_block = fn ctx:
     next_is_unindented ?: true
     # TODO: should be responsibility of enclosing block
     next_is ?, ':': true
+    next_is ?, '/>': true
     else: false
 
 
@@ -175,7 +176,8 @@ single_expression = fn ctx, lbp=0:
     next_is_new_expr ?:
       [expr, next_ctx]
 
-    next_is_call_arg expr, lbp, ?:
+
+    not ctx.jsx and next_is_call_arg expr, lbp, ?:
       indented_block = fn ctx, block_expr=single_expression:
         expressions ctx, end_of_block_indent, block_expr
 

src/lang/block/init.fnk

@@ -9,7 +9,7 @@
 
 
 terminated_block = fn ctx, end_symbol, block_expr=single_expression:
-  expressions ctx, end_symbol, block_expr
+  expressions {...ctx, jsx: false}, end_symbol, block_expr
 
 
 

src/lang/call/init.fnk

@@ -1,10 +1,27 @@
+{add_operator} = import '@fink/prattler/symbols.fnk'
+
 {add_named_block} = import '../block/init.fnk'
+{single_expression} = import '../block/expr.fnk'
+{infix} = import '../symbols.fnk'
+
+
+
+infix_pipe = fn op:
+  dict:
+    ...infix op, 'call'
+
+    led: fn lbp:  fn ctx, left:
+      {loc: {start}} = left
+      [callee, next_ctx] = single_expression ctx, lbp
+      {loc: {end}} = callee
+      [{type: 'call', callee, args: [left], op, loc: {start,end}}, next_ctx]
 
 
 
 add_pipe = fn ctx:
   pipe ctx:
     add_named_block 'pipe'
+    add_operator infix_pipe '|'
 
 
 

src/lang/call/init.test.fnk

@@ -14,3 +14,21 @@ describe 'pipe foo: ...', fn:
       '
       to_match_snapshot
 
+
+
+describe 'small pipe |', fn:
+  it 'pipes', fn:
+    expect
+      parse '
+        foo = 134 | is_int
+      '
+      to_match_snapshot
+
+
+  it 'handles precedence', fn:
+    expect
+      parse '
+        foo = "foo" | matches rx"[a-z]", ?
+        bar = [spam | ham, shrub | ni]
+      '
+      to_match_snapshot

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

@@ -10,3 +10,35 @@ module (1:0-4:0)
       ident (2:6-2:11) shrub
     ident (3:2-3:4) ni
 `;
+
+exports[`small pipe | handles precedence 1`] = `
+module (1:0-3:0)
+  assign = (1:0-1:34)
+    ident (1:0-1:3) foo
+    call | (1:6-1:34)
+      call (1:14-1:34)
+        ident (1:14-1:21) matches
+        string " (1:22-1:31)
+           rx'[a-z]'
+        partial (1:33-1:34) ?
+      string " (1:6-1:11)
+        'foo'
+  assign = (2:0-2:30)
+    ident (2:0-2:3) bar
+    list (2:6-2:30)
+      call | (2:7-2:17)
+        ident (2:14-2:17) ham
+        ident (2:7-2:11) spam
+      call | (2:19-2:29)
+        ident (2:27-2:29) ni
+        ident (2:19-2:24) shrub
+`;
+
+exports[`small pipe | pipes 1`] = `
+module (1:0-2:0)
+  assign = (1:0-1:18)
+    ident (1:0-1:3) foo
+    call | (1:6-1:18)
+      ident (1:12-1:18) is_int
+      number (1:6-1:9) 134
+`;

src/lang/comparison/init.fnk

@@ -14,7 +14,6 @@ lt = fn op:
     ...comp op
 
     lbp: fn lbp: fn ctx:
-
       match ctx:
         # TODO: this is a prattler internal interface
         {tokenizer: {partial_token: {value: starts_with ?, ' '}}}:
@@ -24,6 +23,16 @@ lt = fn op:
           0
 
 
+gt = fn op:
+  dict:
+    ...comp op
+
+    lbp: fn lbp: fn ctx:
+      match ctx:
+        {jsx: true}: 0
+        else: lbp
+
+
 
 # TODO just enforce space before and after e.g. < to allow jsx overloading?
 add_comparison_operators = fn ctx:
@@ -32,5 +41,5 @@ add_comparison_operators = fn ctx:
     add_operator comp '!='
     add_operator comp '>='
     add_operator comp '<='
-    add_operator comp '>'
+    add_operator gt '>'
     add_operator lt '<'

src/lang/jsx/init.test.fnk

@@ -1,6 +1,7 @@
 {describe, it, expect, to_match_snapshot} = import '@fink/jest/test.fnk'
 
-{parse_expr, parse} = import '../../parser.fnk'
+{parse_expr} = import '../../parser.fnk'
+
 
 
 describe 'JSX', fn:
@@ -23,9 +24,9 @@ describe 'JSX', fn:
       to_match_snapshot
 
 
-  it 'parses self closing elem with str attr: <Foobar spam=\'ni\' />', fn:
+  it "parses self closing elem with str attr: <Foobar spam='ni' />", fn:
     expect
-      parse_expr '<Foobar spam="ni" />'
+      parse_expr "<Foobar spam='ni' />"
       to_match_snapshot
 
 
@@ -70,16 +71,46 @@ describe 'JSX', fn:
       '
       to_match_snapshot
 
+    expect
+      parse_expr '<></>'
+      to_match_snapshot
+
     expect
       parse_expr '
-        <></>
+        <div>
+          <></>
+        </div>
       '
       to_match_snapshot
 
 
 
-describe 'JSX parse failures', fn:
-  it 'errors with invalid attr value', fn:
+describe 'JSX extensions',  fn:
+  it 'parses spread', fn:
+    expect
+      parse_expr '<Foobar spam ...ham shrub />'
+      to_match_snapshot
+
+
+  it "parses template str attr", fn:
+    expect
+      parse_expr "<Foobar spam='ni: \${1 + 2}' />"
+      to_match_snapshot
+
+
+  it "parses fink expr as attr values", fn:
+    expect
+      parse_expr "<Foobar spam=ham shrub=1234 ni=-123> foo </Foobar>"
+      to_match_snapshot
+
+
+  it "parses fink expr with gt comparison", fn:
+    expect
+      parse_expr "<Foobar spam=(foo > 123) shrub=1234> ni </Foobar>"
+      to_match_snapshot
+
+
+  it "parses expr group with call for attr value", fn:
     expect
-      parse '<Foobar spam=123 />', 'test.fnk'
+      parse_expr "<Foobar spam=(ham ni) shrub=1234 />"
       to_match_snapshot

src/lang/jsx/init.test.fnk.snap

@@ -1,21 +1,61 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`JSX parse failures errors with invalid attr value 1`] = `
-module (1:0-1:19)
-  jsx:elem (1:0-1:19) Foobar
-    jsx:attr (1:8-1:13) spam
-            ::error::
-    jsx:attr (1:13-1:16) 123
-
-error:
-test.fnk:1:13
-1| <Foobar spam=123 />
-                ^
+exports[`JSX extensions parses expr group with call for attr value 1`] = `
+jsx:elem (1:0-1:35) Foobar
+  jsx:attr (1:8-1:21) spam
+        group (1:13-1:21)
+      call (1:14-1:20)
+        ident (1:14-1:17) ham
+        ident (1:18-1:20) ni
+  jsx:attr (1:22-1:32) shrub
+        number (1:28-1:32) 1234
+`;
 
-Expected one of \`{,",'\` but found \`123\`.
+exports[`JSX extensions parses fink expr as attr values 1`] = `
+jsx:elem (1:0-1:50) Foobar
+  jsx:attr (1:8-1:16) spam
+        ident (1:13-1:16) ham
+  jsx:attr (1:17-1:27) shrub
+        number (1:23-1:27) 1234
+  jsx:attr (1:28-1:35) ni
+        arithm:prefix - (1:31-1:35)
+      number (1:32-1:35) 123
+  :
+  jsx:text (1:36-1:41)
+    " foo "
+`;
 
+exports[`JSX extensions parses fink expr with gt comparison 1`] = `
+jsx:elem (1:0-1:49) Foobar
+  jsx:attr (1:8-1:24) spam
+        group (1:13-1:24)
+      comp > (1:14-1:23)
+        ident (1:14-1:17) foo
+        number (1:20-1:23) 123
+  jsx:attr (1:25-1:35) shrub
+        number (1:31-1:35) 1234
+  :
+  jsx:text (1:36-1:40)
+    " ni "
+`;
 
+exports[`JSX extensions parses spread 1`] = `
+jsx:elem (1:0-1:28) Foobar
+  jsx:attr (1:8-1:12) spam
+  spread ... (1:13-1:19)
+    ident (1:16-1:19) ham
+  jsx:attr (1:20-1:25) shrub
+`;
 
+exports[`JSX extensions parses template str attr 1`] = `
+jsx:elem (1:0-1:30) Foobar
+  jsx:attr (1:8-1:27) spam
+        string ' (1:13-1:27)
+      'ni: '
+            arithm + (1:20-1:25)
+              number (1:20-1:21) 1
+              number (1:24-1:25) 2
+      ''
 `;
 
 exports[`JSX parses elem with children: <Foobar><Spam /></Foobar> 1`] = `
@@ -61,6 +101,16 @@ jsx:frag (1:0-3:3)
 
 exports[`JSX parses fragment 2`] = `jsx:frag (1:0-1:5) `;
 
+exports[`JSX parses fragment 3`] = `
+jsx:elem (1:0-3:6) div
+  :
+  jsx:text (1:5-2:2)
+    "\\n  "
+  jsx:frag (2:2-2:7) 
+  jsx:text (2:7-3:0)
+    "\\n"
+`;
+
 exports[`JSX parses self closing elem with expr attr: <Foobar spam={ni} /> 1`] = `
 jsx:elem (1:0-1:20) Foobar
   jsx:attr (1:8-1:17) spam
@@ -77,14 +127,14 @@ jsx:elem (1:0-1:15) Foobar
 exports[`JSX parses self closing elem with str attr: <Foobar spam="ni" /> 1`] = `
 jsx:elem (1:0-1:20) Foobar
   jsx:attr (1:8-1:17) spam
-        jsx:string (1:14-1:16)
+        string " (1:13-1:17)
       'ni'
 `;
 
 exports[`JSX parses self closing elem with str attr: <Foobar spam='ni' /> 1`] = `
 jsx:elem (1:0-1:20) Foobar
   jsx:attr (1:8-1:17) spam
-        jsx:string (1:14-1:16)
+        string ' (1:13-1:17)
       'ni'
 `;