Merge pull request #61 from cheddar-lang/fix-float-ranges

Fix float ranges
cheddar-lang · Jul 14, 2016 · c3dad6a · c3dad6a
2 parents e0fd2aa + 6c82e22
commit c3dad6a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/src/interpreter/core/primitives/op/number.es6 b/src/interpreter/core/primitives/op/number.es6
@@ -5,17 +5,17 @@ import CheddarBool from '../Bool';
 
 import HelperInit from '../../../../helpers/init';
 
-// from Cyoce the almighty platypus modified;
+// from Cyoce the almighty platypus, modified quite heavily.
 // http://chat.stackexchange.com/transcript/message/27392766#27392766
 const range = (a, b) => {
-    let CheddarNumber = require('../Number');
-    if (a > b) return range(b, a).reverse();
-    b = ~~b;
-    var iPart = a - ~~a;
-    a = ~~a;
-    var out = Array(b - a + 1);
-    while (b + iPart >= a) out[b - a] = HelperInit(CheddarNumber, 10, 0, b-- + iPart);
-    if(iPart) out.pop();
+let CheddarNumber = require('../Number');
+    let out = [];
+    let i = 0;
+    if(b < a){
+        while(a >= b) out[i++] = HelperInit(CheddarNumber, 10, 0, a--);
+    } else {
+        while(a <= b) out[i++] = HelperInit(CheddarNumber, 10, 0, a++);
+    }
     return out;
 };
 
@@ -164,10 +164,12 @@ export default new Map([
     }],
 
     // Special Operators
-    [':', (LHS, RHS) => {
+    ['|>', (LHS, RHS) => {
         let CheddarArray = require("../Array");
         if (LHS && RHS instanceof LHS.constructor)
             return HelperInit(CheddarArray, ...range(LHS.value, RHS.value));
+        else if(LHS === null)
+            return HelperInit(CheddarArray, ...range(0, RHS.value - 1));
         else
             return CheddarError.NO_OP_BEHAVIOR;
     }],
@@ -261,8 +263,7 @@ export default new Map([
 
 /*
 TODO:
-'&', '|', // will do later
 '+=', '-=', '*=', '/=', '^=', '%=', '&=', '|=', '<<', '>>', '<<=', '>>=',
 
 'and', 'or', 'xor',
-*/
+*/
diff --git a/src/tokenizer/consts/ops.es6 b/src/tokenizer/consts/ops.es6
@@ -27,7 +27,7 @@ export const EXCLUDE_META_ASSIGNMENT = new Set(['==', '!=', '<=', '>=' ]);
 export const OP = [
 '^', '*', '/', '%', '+', '-', '<=', '>=', '<', '>', '==', '&', '|',
 '!=', '=', '+=', '-=', '*=', '/=', '^=', '%=', '&=', '|=', '<<', '>>', '<<=', '>>=',
-':', '::',
+'|>', '::',
 '@"', 'has',
 'and', 'or', 'xor',
 'log', 'sign',
@@ -38,6 +38,7 @@ export const OP = [
 export const UOP = [
 '-', '+',
 '!',
+'|>',
 'sqrt', 'cbrt',
 'sin', 'cos', 'tan',
 'acos', 'asin', 'atan',
@@ -126,4 +127,4 @@ export const TYPE = {
     UNARY: Symbol('Unary Operator'),
     LTR: Symbol('LTR Operator'),
     RTL: Symbol('RTL Operator')
-}
+}
diff --git a/test/tests/primitives/op/number.js b/test/tests/primitives/op/number.js
@@ -262,13 +262,13 @@ describe('Numbers', function(){
 
     describe('range', function(){
         it('should work', TestCheddarFrom.Code(
-            'print "1:5=" + String::(1:5)',
-            '1:5=[1, 2, 3, 4, 5]'
+            'print "1|>5=" + String::(1|>5)',
+            '1|>5=[1, 2, 3, 4, 5]'
         ))
 
         it('should work reversed', TestCheddarFrom.Code(
-            'print "5:1=" + String::(5:1)',
-            '5:1=[5, 4, 3, 2, 1]'
+            'print "5|>1=" + String::(5|>1)',
+            '5|>1=[5, 4, 3, 2, 1]'
         ))
     })