Merge pull request #100 from fink-lang/remove-iter-blocks

feat(iter): remove iter blocks

src/ast/analyze.test.fnk

@@ -1,6 +1,6 @@
 {describe, it, expect, to_match_snapshot} = import '@fink/jest/test.fnk'
 
-{map, fold, flatten} = import '@fink/std-lib/iter.fnk'
+{map, fold: fold_, flatten} = import '@fink/std-lib/iter.fnk'
 
 
 {parse} = import '../parser.fnk'
@@ -10,7 +10,7 @@
 
 
 
-collect_exprs = fold fn [expr], , , ctx: [expr, ctx]
+collect_exprs = fold_ [], fn [expr], , , ctx: [expr, ctx]
 
 
 collect_bindings = fn parsed:

src/lang/block/init.fnk

@@ -1,4 +1,4 @@
-{advance, curr_loc, curr_value, next_is} = import '@fink/prattler/parser.fnk'
+{curr_loc, curr_value} = import '@fink/prattler/parser.fnk'
 
 {add_separator, add_operator} = import '@fink/prattler/expressions.fnk'
 
@@ -24,27 +24,13 @@ named_block = fn token_type, expr_type, block_expr:
     ...prefix token_type
 
     nud: fn: fn ctx:
-      {start, end} = curr_loc ctx
+      {start} = curr_loc ctx
       op = curr_value ctx
 
-      match ctx:
-        next_is ?, 'fn':
-          [expr, next_ctx] = single_expression ctx
-          args = [expr]
-          callee = {type: 'ident', value: token_type, loc: {start, end}}
-          [{type: 'call', callee, args, loc: {...expr.loc, start}}, next_ctx]
+      [{exprs: args}, body_ctx] = terminated_block ctx, ':'
 
-        next_is ?, '=':
-          op = '='
-          left = {type: 'ident', value: token_type, loc: {start, end}}
-          [right, next_ctx] = single_expression advance ctx
-          [{type: 'assign', op, left, right, loc: {start, end: right.loc.end}}, next_ctx]
-
-        else:
-          [{exprs: args}, body_ctx] = terminated_block ctx, ':'
-
-          [{exprs, comments, loc}, next_ctx] = indented_block body_ctx, block_expr
-          [{type: expr_type, op, args, exprs, comments, loc: {start, end: loc.end}}, next_ctx]
+      [{exprs, comments, loc}, next_ctx] = indented_block body_ctx, block_expr
+      [{type: expr_type, op, args, exprs, comments, loc: {start, end: loc.end}}, next_ctx]
 
 
 

src/lang/init.fnk

@@ -11,7 +11,6 @@
 {add_func} = import './func/init.fnk'
 {add_group} = import './group/init.fnk'
 {add_assignment_operators} = import './assignment/init.fnk'
-{add_iterables} = import './iterable/init.fnk'
 {add_spread_operator} = import './spread/init.fnk'
 {add_async} = import './async/init.fnk'
 {add_import} = import './import/init.fnk'
@@ -32,7 +31,6 @@ init_language = fn ctx:
     add_func
 
     add_conditionals
-    add_iterables
 
     add_assignment_operators