ether-code 0.7.4 → 0.7.6

package/cli/ether.js

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

package/ether-parser.js

@@ -2222,6 +2222,21 @@ class EtherParser {
   parseFunctionDeclaration(lang) {
     this.advance()
     
+    let isAsync = false
+    let isGenerator = false
+    
+    const modifierToken = this.current()
+    if (modifierToken && modifierToken.type === TokenType.IDENTIFIER) {
+      const modVal = this.normalizeAccents(modifierToken.value.toLowerCase())
+      if (modVal === 'asynchrone' || modVal === 'async') {
+        isAsync = true
+        this.advance()
+      } else if (modVal === 'generatrice' || modVal === 'generator' || modVal === 'generateur') {
+        isGenerator = true
+        this.advance()
+      }
+    }
+    
     const nameToken = this.current()
     if (!nameToken || nameToken.type !== TokenType.IDENTIFIER) {
       return null
@@ -2232,11 +2247,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()) {
@@ -2269,7 +2287,9 @@ class EtherParser {
       name: name,
       params: params,
       returnType: returnType,
-      body: body
+      body: body,
+      async: isAsync,
+      generator: isGenerator
     }
   }
 
@@ -2289,11 +2309,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 +2741,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
@@ -2832,6 +2863,9 @@ class EtherParser {
       } else if (this.match(TokenType.GT) || this.matchValue('superieur') || this.matchValue('supérieur')) {
         const right = this.parseAdditive(lang)
         left = { type: 'BinaryExpression', operator: '>', left, right }
+      } else if (this.matchValue('instance de') || this.matchValue('instanceof')) {
+        const right = this.parseAdditive(lang)
+        left = { type: 'BinaryExpression', operator: 'instanceof', left, right }
       } else {
         break
       }
@@ -2871,6 +2905,9 @@ class EtherParser {
       } else if (this.match(TokenType.PERCENT) || this.matchValue('modulo')) {
         const right = this.parseUnary(lang)
         left = { type: 'BinaryExpression', operator: '%', left, right }
+      } else if (this.match(TokenType.DOUBLE_STAR) || this.matchValue('puissance')) {
+        const right = this.parseUnary(lang)
+        left = { type: 'BinaryExpression', operator: '**', left, right }
       } else {
         break
       }
@@ -2890,7 +2927,12 @@ class EtherParser {
       return { type: 'UnaryExpression', operator: '-', operand }
     }
     
-    if (this.matchValue('nouveau') || this.matchValue('new')) {
+    if (this.matchValue('type de') || this.matchValue('typeof')) {
+      const operand = this.parseUnary(lang)
+      return { type: 'UnaryExpression', operator: 'typeof', operand }
+    }
+    
+    if (this.matchValue('nouveau') || this.matchValue('new') || this.matchValue('nouvelle')) {
       const callee = this.parseCall(lang)
       if (callee.type === 'CallExpression') {
         return { type: 'NewExpression', callee: callee.callee, arguments: callee.arguments }
@@ -2908,8 +2950,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)) {

package/package.json

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