allowed ...: o as {...o}

gkz · Jul 12, 2012 · 4319d45 · 4319d45
1 parent ff9f887
commit 4319d45
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/lib/ast.js b/lib/ast.js
@@ -1165,6 +1165,9 @@ exports.Prop = Prop = (function(superclass){
     var that, fun, __i, __len, __this = this instanceof __ctor ? this : new __ctor;
     __this.key = key;
     __this.val = val;
+    if (key.value === '...') {
+      return Splat(__this.val);
+    }
     if (that = val.getAccessors()) {
       __this.val = that;
       for (__i = 0, __len = that.length; __i < __len; ++__i) {

diff --git a/lib/lexer.js b/lib/lexer.js
@@ -588,7 +588,15 @@ exports.doLiteral = function(code, index){
     }
     break;
   case ':':
-    if ((__ref = this.last[0]) !== 'ID' && __ref !== 'STRNUM' && __ref !== ')') {
+    switch (this.last[0]) {
+    case 'ID':
+    case 'STRNUM':
+    case ')':
+      break;
+    case '...':
+      this.last[0] = 'STRNUM';
+      break;
+    default:
       tag = 'LABEL';
       val = '';
     }

diff --git a/src/ast.co b/src/ast.co
@@ -705,6 +705,7 @@ class exports.Obj extends List
 # `x: y`
 class exports.Prop extends Node
   (@key, @val) ~>
+    return Splat @val if key.value is \...
     if val.getAccessors!
       @val = that
       for fun of that

diff --git a/src/lexer.co b/src/lexer.co
@@ -387,8 +387,11 @@ exports import
       fallthrough
     case \] \)
       @lpar = @parens.pop! if \) is tag = val = @pair val
-    case \: then if @last.0 not of <[ ID STRNUM ) ]>
-      tag = \LABEL; val = ''
+    case \:
+      switch @last.0
+      case \ID \STRNUM \) then break
+      case \...           then @last.0 = \STRNUM
+      default tag = \LABEL; val = ''
     case <[ = := += -= *= /= %= &= ^= |= <<= >>= >>>= <?= >?= **= ]>
       if @last.1 is \. or @last.0 is \? and @adi!
         @last.1 += val

diff --git a/test/literal.co b/test/literal.co
@@ -303,7 +303,7 @@ obj = {
   (--i) or 'default value'
   /*      splat       */
   ...o
-  ...{splatMe: 'too'}
+  ...: splatMe: 'too'
   /*   normal keys    */
   key: ok
   's': ok