ether-code 0.8.3 → 0.8.4

package/cli/ether.js

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

package/generators/php-generator.js

@@ -101,6 +101,8 @@ class PHPGenerator {
 
     const generators = {
       'Program': () => this.generateProgram(node),
+      'DeclareStatement': () => this.generateDeclareStatement(node),
+      'NamespaceDeclaration': () => this.generateNamespaceDeclaration(node),
       'FunctionDeclaration': () => this.generateFunctionDeclaration(node),
       'ClassDeclaration': () => this.generateClassDeclaration(node),
       'InterfaceDeclaration': () => this.generateInterfaceDeclaration(node),
@@ -110,6 +112,7 @@ class PHPGenerator {
       'PropertyDeclaration': () => this.generatePropertyDeclaration(node),
       'VariableDeclaration': () => this.generateVariableDeclaration(node),
       'ConstantDeclaration': () => this.generateConstantDeclaration(node),
+      'DefineDeclaration': () => this.generateDefineDeclaration(node),
       'IfStatement': () => this.generateIfStatement(node),
       'ForStatement': () => this.generateForStatement(node),
       'ForEachStatement': () => this.generateForEachStatement(node),
@@ -176,6 +179,33 @@ class PHPGenerator {
     }
   }
 
+  generateDeclareStatement(node) {
+    const directives = (node.directives || []).map(d => {
+      const name = this.safeString(d.name)
+      const value = this.generateNode(d.value)
+      return `${name}=${value}`
+    }).join(', ')
+    
+    this.writeLine(`declare(${directives});`)
+    this.writeLine('')
+  }
+
+  generateNamespaceDeclaration(node) {
+    const name = this.safeString(node.name)
+    this.writeLine(`namespace ${name};`)
+    this.writeLine('')
+    
+    if (node.body) {
+      this.generateNode(node.body)
+    }
+  }
+
+  generateDefineDeclaration(node) {
+    const name = this.safeString(node.name)
+    const value = this.generateNode(node.value)
+    this.writeLine(`define('${name}', ${value});`)
+  }
+
   generateFunctionDeclaration(node) {
     const name = this.safeString(node.name || node.id?.name || 'anonymous')
     const translatedName = this.translate(name)
@@ -465,7 +495,7 @@ class PHPGenerator {
   generateVariableDeclaration(node) {
     for (const decl of node.declarations || [node]) {
       const name = this.safeString(decl.name || decl.id?.name || decl.id)
-      const varName = '$' + this.translate(name)
+      const varName = '$' + name
       
       if (decl.init !== undefined) {
         const value = this.generateNode(decl.init)
@@ -640,7 +670,8 @@ class PHPGenerator {
   }
 
   generateEchoStatement(node) {
-    const args = (node.arguments || [node.argument]).filter(Boolean).map(a => this.generateNode(a)).join(', ')
+    const exprs = node.expressions || node.arguments || [node.argument]
+    const args = exprs.filter(Boolean).map(a => this.generateNode(a)).join(', ')
     this.writeLine(`echo ${args};`)
   }
 
@@ -656,10 +687,19 @@ class PHPGenerator {
   }
 
   generateUseStatement(node) {
-    const name = this.safeString(node.name || node.source)
-    const alias = node.alias ? ' as ' + node.alias : ''
-    const type = node.type === 'function' ? 'function ' : (node.type === 'const' ? 'const ' : '')
-    this.writeLine(`use ${type}${name}${alias};`)
+    const typePrefix = node.useType === 'function' ? 'function ' : (node.useType === 'const' ? 'const ' : '')
+    
+    if (node.imports && node.imports.length > 0) {
+      for (const imp of node.imports) {
+        const path = this.safeString(imp.path)
+        const alias = imp.alias ? ' as ' + imp.alias : ''
+        this.writeLine(`use ${typePrefix}${path}${alias};`)
+      }
+    } else {
+      const name = this.safeString(node.name || node.source)
+      const alias = node.alias ? ' as ' + node.alias : ''
+      this.writeLine(`use ${typePrefix}${name}${alias};`)
+    }
   }
 
   generateIncludeStatement(node) {
@@ -878,43 +918,41 @@ class PHPGenerator {
     if (!node) return '$var'
     
     const name = this.safeString(node.name || node.id?.name || node)
-    const translated = this.translate(name)
-    const translatedStr = String(translated)
+    const nameStr = String(name)
     
-    if (translatedStr.startsWith('$')) return translatedStr
-    return '$' + translatedStr
+    if (nameStr.startsWith('$')) return nameStr
+    return '$' + nameStr
   }
 
   generateIdentifier(node) {
     if (!node) return '$var'
     
     const name = this.safeString(node.name || node.id?.name || node)
-    const translated = this.translate(name)
-    const translatedStr = String(translated)
+    const nameStr = String(name)
     
-    if (translatedStr.startsWith('$')) return translatedStr
+    if (nameStr.startsWith('$')) return nameStr
     
     const keywords = [
       'true', 'false', 'null', 
       'self', 'parent', 'static',
       'this', '$this'
     ]
-    if (keywords.includes(translatedStr.toLowerCase())) {
-      if (translatedStr.toLowerCase() === 'this') return '$this'
-      return translatedStr
+    if (keywords.includes(nameStr.toLowerCase())) {
+      if (nameStr.toLowerCase() === 'this') return '$this'
+      return nameStr
     }
     
-    if (/^[A-Z]/.test(translatedStr)) return translatedStr
+    if (/^[A-Z]/.test(nameStr)) return nameStr
     
-    if (translatedStr.includes('(') || translatedStr.includes('::')) return translatedStr
+    if (nameStr.includes('(') || nameStr.includes('::')) return nameStr
     
     const superglobals = ['_GET', '_POST', '_SERVER', '_SESSION', '_COOKIE', '_FILES', '_REQUEST', '_ENV', 'GLOBALS']
-    const upper = translatedStr.toUpperCase()
-    if (superglobals.includes(translatedStr) || superglobals.includes(upper)) {
+    const upper = nameStr.toUpperCase()
+    if (superglobals.includes(nameStr) || superglobals.includes(upper)) {
       return '$' + upper
     }
     
-    return '$' + translatedStr
+    return '$' + nameStr
   }
 
   generateLiteral(node) {

package/package.json

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

package/parsers/ether-parser-php.js

@@ -278,6 +278,10 @@ class EtherParserPHP extends EtherParserBase {
 
     const value = token.value != null ? this.normalizeAccents(String(token.value).toLowerCase()) : ''
 
+    if (this.isDeclare(value)) {
+      return this.parseDeclare(lang)
+    }
+
     if (this.isNamespace(value)) {
       return this.parseNamespace(lang)
     }
@@ -371,7 +375,17 @@ class EtherParserPHP extends EtherParserBase {
   }
 
   isNamespace(value) {
-    return ['namespace', 'espace de noms'].includes(value)
+    if (value === 'namespace') return true
+    if (value === 'espace') {
+      const next1 = this.peek(1)
+      const next2 = this.peek(2)
+      if (next1 && next2) {
+        const val1 = this.normalizeAccents(String(next1.value).toLowerCase())
+        const val2 = this.normalizeAccents(String(next2.value).toLowerCase())
+        if (val1 === 'de' && val2 === 'noms') return true
+      }
+    }
+    return false
   }
 
   isUse(value) {
@@ -469,8 +483,54 @@ class EtherParserPHP extends EtherParserBase {
     return value === 'match'
   }
 
-  parseNamespace(lang) {
+  isDeclare(value) {
+    return ['declare', 'declarer', 'déclarer'].includes(value)
+  }
+
+  parseDeclare(lang) {
     this.advance()
+    
+    const directives = []
+    
+    if (this.match(TokenType.LPAREN)) {
+      do {
+        const nameToken = this.current()
+        const name = nameToken ? this.safeStr(nameToken.value) : ''
+        this.advance()
+        
+        this.match(TokenType.EQUALS)
+        
+        const value = this.parseExpression(lang)
+        directives.push({ name, value })
+      } while (this.match(TokenType.COMMA))
+      
+      this.match(TokenType.RPAREN)
+    } else {
+      const nameToken = this.current()
+      const name = nameToken ? this.safeStr(nameToken.value) : ''
+      this.advance()
+      
+      this.match(TokenType.EQUALS)
+      
+      const value = this.parseExpression(lang)
+      directives.push({ name, value })
+    }
+    
+    return {
+      type: 'DeclareStatement',
+      directives: directives
+    }
+  }
+
+  parseNamespace(lang) {
+    const first = this.advance()
+    const firstVal = this.normalizeAccents(String(first.value).toLowerCase())
+    
+    if (firstVal === 'espace') {
+      this.advance()
+      this.advance()
+    }
+    
     const name = this.parseNamespacePath(lang)
     this.skipNewlines()