ether-code 0.7.3 → 0.7.5

package/cli/ether.js

@@ -6,7 +6,7 @@ const http = require('http')
 const { EtherCompiler } = require('./compiler')
 const { Watcher } = require('./watcher')
 
-const VERSION = '0.7.3'
+const VERSION = '0.7.5'
 
 const COLORS = {
   reset: '\x1b[0m',

package/ether-parser.js

@@ -2232,11 +2232,14 @@ class EtherParser {
     const params = []
     if (this.match(TokenType.LPAREN)) {
       while (!this.isAtEnd() && !this.match(TokenType.RPAREN)) {
+        while (this.match(TokenType.NEWLINE) || this.match(TokenType.INDENT) || this.match(TokenType.DEDENT)) {}
+        if (this.check(TokenType.RPAREN)) break
         const param = this.parseParameter(lang)
         if (param) {
           params.push(param)
         }
         this.match(TokenType.COMMA)
+        while (this.match(TokenType.NEWLINE) || this.match(TokenType.INDENT) || this.match(TokenType.DEDENT)) {}
       }
     } else {
       while (!this.isAtEnd()) {
@@ -2289,11 +2292,14 @@ class EtherParser {
     const params = []
     if (this.match(TokenType.LPAREN)) {
       while (!this.isAtEnd() && !this.match(TokenType.RPAREN)) {
+        while (this.match(TokenType.NEWLINE) || this.match(TokenType.INDENT) || this.match(TokenType.DEDENT)) {}
+        if (this.check(TokenType.RPAREN)) break
         const param = this.parseParameter(lang)
         if (param) {
           params.push(param)
         }
         this.match(TokenType.COMMA)
+        while (this.match(TokenType.NEWLINE) || this.match(TokenType.INDENT) || this.match(TokenType.DEDENT)) {}
       }
     }
     
@@ -2718,6 +2724,14 @@ class EtherParser {
           break
         }
         
+        if (current && current.type === TokenType.COMMA) {
+          break
+        }
+        
+        if (current && current.type === TokenType.RPAREN) {
+          break
+        }
+        
         if (current && (current.type === TokenType.INDENT || current.type === TokenType.NEWLINE)) {
           this.advance()
           continue
@@ -2908,8 +2922,11 @@ class EtherParser {
       if (this.match(TokenType.LPAREN)) {
         const args = []
         while (!this.isAtEnd() && !this.match(TokenType.RPAREN)) {
+          while (this.match(TokenType.NEWLINE) || this.match(TokenType.INDENT) || this.match(TokenType.DEDENT)) {}
+          if (this.check(TokenType.RPAREN)) break
           args.push(this.parseExpression(lang))
           this.match(TokenType.COMMA)
+          while (this.match(TokenType.NEWLINE) || this.match(TokenType.INDENT) || this.match(TokenType.DEDENT)) {}
         }
         expr = { type: 'CallExpression', callee: expr, arguments: args }
       } else if (this.match(TokenType.DOT)) {
@@ -3001,6 +3018,7 @@ class EtherParser {
       this.advance()
       const expr = this.parseExpression(lang)
       this.expect(TokenType.RPAREN)
+      expr.parenthesized = true
       return expr
     }
     

package/generators/js-generator.js

@@ -1764,7 +1764,8 @@ class JSGenerator {
     const left = this.generateNode(node.left)
     const right = this.generateNode(node.right)
     const op = this.translateOperator(node.operator)
-    return `${left} ${op} ${right}`
+    const expr = `${left} ${op} ${right}`
+    return node.parenthesized ? `(${expr})` : expr
   }
 
   generateUnaryExpression(node) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ether-code",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "description": "Ether - Le langage intentionnel",
   "main": "cli/compiler.js",
   "bin": {