ether-code 0.4.7 → 0.4.8

package/cli/ether.js

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

package/ether-parser.js

@@ -2026,6 +2026,14 @@ class EtherParser {
       return { type: 'UnaryExpression', operator: '-', operand }
     }
     
+    if (this.matchValue('nouveau') || this.matchValue('new')) {
+      const callee = this.parseCall(lang)
+      if (callee.type === 'CallExpression') {
+        return { type: 'NewExpression', callee: callee.callee, arguments: callee.arguments }
+      }
+      return { type: 'NewExpression', callee, arguments: [] }
+    }
+    
     return this.parseCall(lang)
   }
 
@@ -2141,26 +2149,32 @@ class EtherParser {
       this.match(TokenType.COMMA)
     }
     
-    return { type: 'ArrayLiteral', elements }
+    return { type: 'ArrayExpression', elements }
   }
 
   parseObjectLiteral(lang) {
     this.expect(TokenType.LBRACE)
     const properties = []
     
-    while (!this.isAtEnd() && !this.match(TokenType.RBRACE)) {
+    this.skipWhitespace()
+    
+    while (!this.isAtEnd() && !this.check(TokenType.RBRACE)) {
+      this.skipWhitespace()
+      
       const keyToken = this.current()
-      if (!keyToken) break
+      if (!keyToken || keyToken.type === TokenType.RBRACE) break
       
       let key
       if (keyToken.type === TokenType.STRING) {
-        key = keyToken.value.replace(/^["']|["']$/g, '')
+        const keyValue = keyToken.value.replace(/^["']|["']$/g, '')
+        key = { type: 'Literal', value: keyValue }
+        this.advance()
       } else if (keyToken.type === TokenType.IDENTIFIER) {
-        key = keyToken.value
+        key = { type: 'Identifier', name: keyToken.value }
+        this.advance()
       } else {
         break
       }
-      this.advance()
       
       this.match(TokenType.COLON) || this.match(TokenType.EQUALS)
       
@@ -2168,9 +2182,21 @@ class EtherParser {
       properties.push({ key, value })
       
       this.match(TokenType.COMMA)
+      this.skipWhitespace()
     }
     
-    return { type: 'ObjectLiteral', properties }
+    this.match(TokenType.RBRACE)
+    
+    return { type: 'ObjectExpression', properties }
+  }
+  
+  skipWhitespace() {
+    while (this.match(TokenType.NEWLINE) || this.match(TokenType.INDENT) || this.match(TokenType.DEDENT)) {}
+  }
+  
+  check(type) {
+    const token = this.current()
+    return token && token.type === type
   }
 
   parseSQLProgram() {

package/package.json

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