fix(records): spreads in records should not be rec:kv expr but just s…

…pread expr BREAKING CHANGE: spreads in records where part of a `rec:kv` expr inside record expressions, they are now simply children of record expressions
fink-lang · Nov 30, 2020 · 7b085d2 · 7b085d2
1 parent 7385c8d
commit 7b085d2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/lang/literals/record.fnk b/src/lang/literals/record.fnk
@@ -63,7 +63,11 @@ get_key_val = fn ctx, key_or_default:
 
 key_val_expr = fn ctx:
   [key_or_default, value_ctx] = key_expr ctx
-  get_key_val value_ctx, key_or_default
+  match key_or_default:
+    {type: 'spread'}:
+      [key_or_default, value_ctx]
+    else:
+      get_key_val value_ctx, key_or_default
 
 
 

diff --git a/src/lang/literals/record.test.fnk.snap b/src/lang/literals/record.test.fnk.snap
@@ -447,9 +447,8 @@ exports[`record {...} parses spread prop 1`] = `
 rec (1:0-1:13)
   rec:kv (1:1-1:4)
     ident (1:1-1:4) foo
-  rec:kv (1:6-1:12)
-    spread ... (1:6-1:12)
-      ident (1:9-1:12) bar
+  spread ... (1:6-1:12)
+    ident (1:9-1:12) bar
 `;
 
 exports[`record {...} parses unicode as keys 1`] = `

diff --git a/src/lang/partial/init.test.fnk.snap b/src/lang/partial/init.test.fnk.snap
@@ -100,9 +100,8 @@ rec (1:0-1:12)
 
 exports[`partial parses record 2`] = `
 rec (1:0-1:18)
-  rec:kv (1:1-1:5)
-    spread ... (1:1-1:5)
-      partial (1:4-1:5) ?
+  spread ... (1:1-1:5)
+    partial (1:4-1:5) ?
   rec:kv (1:7-1:17)
     ident (1:7-1:10) foo
     string ' (1:12-1:17)