fixed the handling of 1 to i etc. (#143)

Author: satyr

lib/lexer.js

@@ -1235,7 +1235,7 @@ function addImplicitBraces(tokens){
   }
 }
 function expandLiterals(tokens){
-  var i, token, sig, lno, from, char, to, tochar, by, byp, ts, enc, add, n, word, that, __ref, __i, __len;
+  var i, token, sig, next, lno, from, char, to, tochar, by, byp, ts, enc, add, n, word, that, __ref, __i, __len;
   i = 0;
   while (token = tokens[++i]) {
     switch (token[0]) {
@@ -1249,9 +1249,11 @@ function expandLiterals(tokens){
       }
       break;
     case 'RANGE':
-      __ref = decode(token[1], lno = token[2]), from = __ref[0], char = __ref[1];
-      __ref = decode(tokens[i + 1][1], lno), to = __ref[0], tochar = __ref[1];
-      if (char ^ tochar) {
+      next = tokens[i + 1];
+      lno = token[2];
+      __ref = decode(token[1], lno), from = __ref[0], char = __ref[1];
+      __ref = next[0] === 'STRNUM' && decode(next[1], lno), to = __ref[0], tochar = __ref[1];
+      if (to == null || char ^ tochar) {
         carp('bad "to" in range', lno);
       }
       by = 1;

src/lexer.co

@@ -829,9 +829,11 @@ character = if JSON!? then uxxxx else ->
         tokens.splice i++ 0 [\+- sig, token.2]
       continue if token.callable
     case \RANGE
-      [from, char] = decode token.     1, lno = token.2
-      [to, tochar] = decode tokens[i+1]1, lno
-      carp 'bad "to" in range' lno if char ^ tochar
+      next = tokens[i+1]
+      lno  = token.2
+      [from, char] = decode token.1, lno
+      [to, tochar] = next.0 is \STRNUM and decode next.1, lno
+      carp 'bad "to" in range' lno if to!? or char ^ tochar
       by = 1
       if byp = tokens[i+2]?0 is \RANGE_BY
         carp 'bad "by" in range' tokens[i+2]2 unless by = +tokens[i+3]?1

test/literal.co

@@ -431,6 +431,7 @@ compileThrows 'empty range' 2 '\n1 to 0'
 compileThrows 'empty range' 2 '\n1 til 1'
 compileThrows 'empty range' 2 '\n2 to 3 by -1'
 compileThrows 'bad "to" in range' 2 '\n0 to "q"'
+compileThrows 'bad "to" in range' 2 '\n1 to i'
 compileThrows 'bad "by" in range' 2 '\n0 to 9 by "2"'
 compileThrows 'bad string in range' 2 '\n"a" to "bc"'