Merge pull request #74 from fink-lang/features

Features

package.json

@@ -36,21 +36,21 @@
     }
   },
   "devDependencies": {
-    "@fink/cli": "^6.0.0",
-    "@fink/jest": "^5.0.2",
-    "@fink/larix": "^12.0.0",
-    "@fink/loxia": "^12.0.1",
+    "@fink/cli": "^6.1.0",
+    "@fink/jest": "^5.1.0",
+    "@fink/larix": "^12.1.0",
+    "@fink/loxia": "^12.0.2",
     "commitizen": "^4.1.2",
     "cz-conventional-changelog": "^3.1.0",
     "jest-cli": "^26.1.0",
     "npx-run": "^2.1.2",
     "semantic-release": "^17.1.1"
   },
   "dependencies": {
-    "@babel/core": "^7.10.4",
-    "@babel/traverse": "^7.10.4",
-    "@babel/types": "^7.10.4",
-    "@fink/js-interop": "^1.0.0",
-    "@fink/std-lib": "^3.0.0"
+    "@babel/core": "^7.10.5",
+    "@babel/traverse": "^7.10.5",
+    "@babel/types": "^7.10.5",
+    "@fink/js-interop": "^1.1.0",
+    "@fink/std-lib": "^3.1.1"
   }
 }

src/lang/assignment/index.fnk

@@ -12,12 +12,13 @@
 {add, any} = import '../context'
 {transform_value} = import '../partial'
 
+
 # TODO: std-lib
 find_index = fn iterable, func:
   iterable.findIndex func
 
 
-is_spread_not_last = fn {left}:
+has_spread_not_last = fn {left}:
   match left:
     {type: 'array', exprs: 1 < length ?}:
       idx = find_index left.exprs, fn expr:
@@ -26,7 +27,8 @@ is_spread_not_last = fn {left}:
           else: false
 
       exprs_len = length left.exprs
-      idx > -1 and idx < exprs_len - 1
+      # TODO: add support for  -1 < idx < exprs_len - 1
+      -1 < idx and idx < exprs_len - 1
     else:
       false
 
@@ -114,7 +116,7 @@ transform_spread_right = fn expr, ctx:
 
 transform_assign = fn node, ctx:
   match node:
-    is_spread_not_last ?:
+    has_spread_not_last ?:
       left = transform_spread_left node, ctx
       right = transform_spread_right node, ctx
       assignmentExpression '=', left, right

src/lang/comparison/index.fnk

@@ -1,7 +1,8 @@
-{binaryExpression} = import '@babel/types'
+{binaryExpression, logicalExpression} = import '@babel/types'
 
 {add, any} = import '../context'
 
+
 transform_op = dict:
   '==': '==='
   '!=': '!=='
@@ -11,9 +12,18 @@ transform_comp = fn {op, left, right}, {transform}:
   {(op): operator=op} = transform_op
 
   bin_left = transform left
-  bin_right = transform right
 
-  binaryExpression operator, bin_left, bin_right
+  match left:
+    {op: ? in ['<', '>', '<=', '>=', '==', '!=']}:
+      bin_right = binaryExpression
+        operator
+        bin_left.right
+        transform right
+
+      logicalExpression '&&', bin_left, bin_right
+    else:
+      bin_right = transform right
+      binaryExpression operator, bin_left, bin_right
 
 
 add_comparison = fn ctx: