ether-code 0.8.4 → 0.8.5

package/cli/ether.js

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

package/generators/php-generator.js

@@ -519,7 +519,7 @@ class PHPGenerator {
   }
 
   generateIfStatement(node) {
-    const test = this.generateNode(node.test)
+    const test = this.generateNode(node.test || node.condition)
     this.writeLine(`if (${test}) {`)
     this.indent++
     this.generateNode(node.consequent)
@@ -527,7 +527,7 @@ class PHPGenerator {
     
     if (node.alternate) {
       if (node.alternate.type === 'IfStatement') {
-        this.write('} else')
+        this.write('} else ')
         this.generateIfStatement({ ...node.alternate, isElseIf: true })
       } else {
         this.writeLine('} else {')
@@ -566,7 +566,7 @@ class PHPGenerator {
   }
 
   generateWhileStatement(node) {
-    const test = this.generateNode(node.test)
+    const test = this.generateNode(node.test || node.condition)
     this.writeLine(`while (${test}) {`)
     this.indent++
     this.generateNode(node.body)
@@ -579,7 +579,7 @@ class PHPGenerator {
     this.indent++
     this.generateNode(node.body)
     this.indent--
-    const test = this.generateNode(node.test)
+    const test = this.generateNode(node.test || node.condition)
     this.writeLine(`} while (${test});`)
   }
 
@@ -812,21 +812,21 @@ class PHPGenerator {
   }
 
   generateUnaryExpression(node) {
-    const argument = this.generateNode(node.argument)
+    const argument = this.generateNode(node.argument || node.operand)
     let op = node.operator
     if (op === 'non' || op === 'not') op = '!'
     
-    if (node.prefix) {
+    if (node.prefix !== false) {
       return `${op}${argument}`
     }
     return `${argument}${op}`
   }
 
   generateUpdateExpression(node) {
-    const argument = this.generateNode(node.argument)
+    const argument = this.generateNode(node.argument || node.operand)
     const op = node.operator
     
-    if (node.prefix) {
+    if (node.prefix !== false) {
       return `${op}${argument}`
     }
     return `${argument}${op}`

package/package.json

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

package/parsers/ether-parser-php.js

@@ -1158,6 +1158,7 @@ class EtherParserPHP extends EtherParserBase {
     let variadic = false
     let byReference = false
     let defaultValue = null
+    let name = null
 
     const val = this.current() ? this.normalizeAccents(String(this.current().value).toLowerCase()) : ''
     if (this.phpVisibility.includes(val)) {
@@ -1171,16 +1172,6 @@ class EtherParserPHP extends EtherParserBase {
       this.advance()
     }
 
-    const currentType = this.current()
-    if (currentType && currentType.type === TokenType.IDENTIFIER) {
-      const typeLower = this.normalizeAccents(String(currentType.value).toLowerCase())
-      if (this.phpTypes[typeLower] || typeLower[0] === typeLower[0].toUpperCase()) {
-        if (!this.peek(1) || this.peek(1).type !== TokenType.EQUALS) {
-          typeHint = this.parseTypeHint(lang)
-        }
-      }
-    }
-
     if (this.match(TokenType.SPREAD) || this.matchValue('...')) {
       variadic = true
     }
@@ -1189,14 +1180,34 @@ class EtherParserPHP extends EtherParserBase {
       byReference = true
     }
 
-    const nameToken = this.current()
-    if (!nameToken) return null
+    const currentToken = this.current()
+    if (!currentToken) return null
+
+    const nextToken = this.peek(1)
     
-    let name = this.safeStr(nameToken.value)
-    if (name.startsWith('$')) {
-      name = name.substring(1)
+    if (nextToken && nextToken.type === TokenType.COLON) {
+      name = this.safeStr(currentToken.value)
+      if (name.startsWith('$')) name = name.substring(1)
+      this.advance()
+      this.advance()
+      typeHint = this.parseTypeHint(lang)
+    } else {
+      const typeLower = this.normalizeAccents(String(currentToken.value).toLowerCase())
+      if (this.phpTypes[typeLower] || /^[A-Z]/.test(currentToken.value)) {
+        typeHint = this.parseTypeHint(lang)
+      }
+      
+      const nameToken = this.current()
+      if (nameToken && nameToken.type === TokenType.IDENTIFIER) {
+        name = this.safeStr(nameToken.value)
+        if (name.startsWith('$')) name = name.substring(1)
+        this.advance()
+      }
+    }
+
+    if (!name) {
+      name = 'param'
     }
-    this.advance()
 
     if (this.match(TokenType.EQUALS)) {
       defaultValue = this.parseExpression(lang)
@@ -1312,9 +1323,10 @@ class EtherParserPHP extends EtherParserBase {
       condition = this.parseExpression(lang)
       this.match(TokenType.RPAREN)
     } else {
-      condition = this.parseExpression(lang)
+      condition = this.parseConditionUntilColon(lang)
     }
 
+    this.match(TokenType.COLON)
     this.skipNewlines()
     const consequent = this.parseBlock(lang)
 
@@ -1322,31 +1334,64 @@ class EtherParserPHP extends EtherParserBase {
     this.skipNewlines()
     
     const elseVal = this.current() ? this.normalizeAccents(String(this.current().value).toLowerCase()) : ''
-    if (elseVal === 'sinon si' || elseVal === 'elseif') {
-      this.advance()
-      alternate = this.parseConditional(lang)
-      alternate.type = 'ElseIfStatement'
-    } else if (elseVal === 'sinon' || elseVal === 'else') {
+    if (elseVal === 'sinon') {
       this.advance()
       
       const nextVal = this.current() ? this.normalizeAccents(String(this.current().value).toLowerCase()) : ''
       if (nextVal === 'si' || nextVal === 'if') {
         alternate = this.parseConditional(lang)
-        alternate.type = 'ElseIfStatement'
+        alternate.type = 'IfStatement'
       } else {
+        this.match(TokenType.COLON)
         this.skipNewlines()
         alternate = this.parseBlock(lang)
       }
+    } else if (elseVal === 'else') {
+      this.advance()
+      this.match(TokenType.COLON)
+      this.skipNewlines()
+      alternate = this.parseBlock(lang)
     }
 
     return {
       type: 'IfStatement',
-      condition: condition,
+      test: condition,
       consequent: consequent,
       alternate: alternate
     }
   }
 
+  parseConditionUntilColon(lang) {
+    const startPos = this.pos
+    let depth = 0
+    
+    while (!this.isAtEnd()) {
+      const token = this.current()
+      if (!token) break
+      
+      if (token.type === TokenType.LPAREN) depth++
+      if (token.type === TokenType.RPAREN) depth--
+      
+      if (depth === 0 && token.type === TokenType.COLON) {
+        break
+      }
+      if (depth === 0 && token.type === TokenType.NEWLINE) {
+        break
+      }
+      
+      this.advance()
+    }
+    
+    const endPos = this.pos
+    this.pos = startPos
+    
+    if (endPos > startPos) {
+      return this.parseExpression(lang)
+    }
+    
+    return { type: 'Literal', value: true }
+  }
+
   parseLoop(lang) {
     const token = this.current()
     const value = this.normalizeAccents(String(token.value).toLowerCase())
@@ -1385,7 +1430,7 @@ class EtherParserPHP extends EtherParserBase {
 
   parseFor(lang) {
     this.advance()
-
+    
     let init = null
     let test = null
     let update = null
@@ -1405,8 +1450,23 @@ class EtherParserPHP extends EtherParserBase {
         update = this.parseExpression(lang)
       }
       this.match(TokenType.RPAREN)
+    } else {
+      if (!this.check(TokenType.SEMICOLON) && !this.check(TokenType.COLON)) {
+        init = this.parseExpression(lang)
+      }
+      this.match(TokenType.SEMICOLON)
+      
+      if (!this.check(TokenType.SEMICOLON) && !this.check(TokenType.COLON)) {
+        test = this.parseExpression(lang)
+      }
+      this.match(TokenType.SEMICOLON)
+      
+      if (!this.check(TokenType.COLON) && !this.check(TokenType.NEWLINE)) {
+        update = this.parseExpression(lang)
+      }
     }
 
+    this.match(TokenType.COLON)
     this.skipNewlines()
     const body = this.parseBlock(lang)
 
@@ -1450,7 +1510,7 @@ class EtherParserPHP extends EtherParserBase {
         }
         
         const valueVar = this.current()
-        let value = this.safeStr(valueVar ? valueVar.value : 'value')
+        value = this.safeStr(valueVar ? valueVar.value : 'value')
         if (value.startsWith('$')) value = value.substring(1)
         this.advance()
       } else {
@@ -1458,8 +1518,44 @@ class EtherParserPHP extends EtherParserBase {
       }
 
       this.match(TokenType.RPAREN)
+    } else {
+      const arrayToken = this.current()
+      if (arrayToken) {
+        array = { type: 'Identifier', name: this.safeStr(arrayToken.value) }
+        this.advance()
+      }
+      
+      const asVal = this.current() ? this.normalizeAccents(String(this.current().value).toLowerCase()) : ''
+      if (asVal === 'comme' || asVal === 'as') {
+        this.advance()
+      }
+
+      if (this.match(TokenType.AMPERSAND)) {
+        byRef = true
+      }
+
+      const firstVar = this.current()
+      let firstName = this.safeStr(firstVar ? firstVar.value : 'item')
+      if (firstName.startsWith('$')) firstName = firstName.substring(1)
+      this.advance()
+
+      if (this.match(TokenType.DOUBLE_ARROW) || this.matchValue('=>')) {
+        key = firstName
+        
+        if (this.match(TokenType.AMPERSAND)) {
+          byRef = true
+        }
+        
+        const valueVar = this.current()
+        value = this.safeStr(valueVar ? valueVar.value : 'value')
+        if (value.startsWith('$')) value = value.substring(1)
+        this.advance()
+      } else {
+        value = firstName
+      }
     }
 
+    this.match(TokenType.COLON)
     this.skipNewlines()
     const body = this.parseBlock(lang)
 
@@ -1479,15 +1575,16 @@ class EtherParserPHP extends EtherParserBase {
       condition = this.parseExpression(lang)
       this.match(TokenType.RPAREN)
     } else {
-      condition = this.parseExpression(lang)
+      condition = this.parseConditionUntilColon(lang)
     }
 
+    this.match(TokenType.COLON)
     this.skipNewlines()
     const body = this.parseBlock(lang)
 
     return {
       type: 'WhileStatement',
-      condition: condition,
+      test: condition,
       body: body
     }
   }