ether-code 0.1.5 → 0.1.7

package/i18n/i18n-ts.json

@@ -56,7 +56,7 @@
     "ja": "パブリック"
   },
   "private": {
-    "fr": "privé",
+    "fr": "prive",
     "en": "private",
     "es": "privado",
     "ru": "приватный",
@@ -64,7 +64,7 @@
     "ja": "プライベート"
   },
   "protected": {
-    "fr": "protégé",
+    "fr": "protege",
     "en": "protected",
     "es": "protegido",
     "ru": "защищенный",
@@ -80,7 +80,7 @@
     "ja": "抽象"
   },
   "implements": {
-    "fr": "implémente",
+    "fr": "implemente",
     "en": "implements",
     "es": "implementa",
     "ru": "реализует",
@@ -88,7 +88,7 @@
     "ja": "実装"
   },
   "extends": {
-    "fr": "étend",
+    "fr": "etend",
     "en": "extends",
     "es": "extiende",
     "ru": "расширяет",
@@ -104,7 +104,7 @@
     "ja": "名前空間"
   },
   "declare": {
-    "fr": "déclarer",
+    "fr": "declarer",
     "en": "declare",
     "es": "declarar",
     "ru": "объявить",
@@ -136,7 +136,7 @@
     "ja": "型"
   },
   "infer": {
-    "fr": "inférer",
+    "fr": "inferer",
     "en": "infer",
     "es": "inferir",
     "ru": "выводить",
@@ -176,7 +176,7 @@
     "ja": "ボイド"
   },
   "string": {
-    "fr": "chaîne",
+    "fr": "chaine",
     "en": "string",
     "es": "cadena",
     "ru": "строка",
@@ -192,7 +192,7 @@
     "ja": "数値"
   },
   "boolean": {
-    "fr": "booléen",
+    "fr": "booleen",
     "en": "boolean",
     "es": "booleano",
     "ru": "логический",
@@ -336,7 +336,7 @@
     "ja": "戻り型"
   },
   "Parameters": {
-    "fr": "Paramètres",
+    "fr": "Parametres",
     "en": "Parameters",
     "es": "Parametros",
     "ru": "Параметры",
@@ -416,7 +416,7 @@
     "ja": "ゲット"
   },
   "set": {
-    "fr": "définir",
+    "fr": "definir",
     "en": "set",
     "es": "establecer",
     "ru": "установить",

package/lexer/ether-lexer.js

@@ -1,11 +1,93 @@
-const {
-  Token,
-  TokenType,
-  LANG_BLOCKS,
-  normalizeAccents,
-  isCompoundKeyword,
-  couldBeCompoundStart
-} = require('./tokens')
+class Token {
+  constructor(type, value, line, column, indent = 0) {
+    this.type = type
+    this.value = value
+    this.line = line
+    this.column = column
+    this.indent = indent
+  }
+
+  toString() {
+    return `Token(${this.type}, ${JSON.stringify(this.value)}, L${this.line}:${this.column})`
+  }
+}
+
+const TokenType = {
+  IDENTIFIER: 'IDENTIFIER',
+  STRING: 'STRING',
+  BLOCK_STRING: 'BLOCK_STRING',
+  NUMBER: 'NUMBER',
+  INTEGER: 'INTEGER',
+  FLOAT: 'FLOAT',
+  HEX: 'HEX',
+  
+  COLON: 'COLON',
+  DOUBLE_COLON: 'DOUBLE_COLON',
+  EQUALS: 'EQUALS',
+  DOUBLE_EQUALS: 'DOUBLE_EQUALS',
+  NOT_EQUALS: 'NOT_EQUALS',
+  COMMA: 'COMMA',
+  DOT: 'DOT',
+  SPREAD: 'SPREAD',
+  ARROW: 'ARROW',
+  FAT_ARROW: 'FAT_ARROW',
+  
+  PLUS: 'PLUS',
+  MINUS: 'MINUS',
+  STAR: 'STAR',
+  DOUBLE_STAR: 'DOUBLE_STAR',
+  SLASH: 'SLASH',
+  DOUBLE_SLASH: 'DOUBLE_SLASH',
+  PERCENT: 'PERCENT',
+  
+  BANG: 'BANG',
+  QUESTION: 'QUESTION',
+  AMPERSAND: 'AMPERSAND',
+  DOUBLE_AMPERSAND: 'DOUBLE_AMPERSAND',
+  PIPE: 'PIPE',
+  DOUBLE_PIPE: 'DOUBLE_PIPE',
+  CARET: 'CARET',
+  TILDE: 'TILDE',
+  
+  LT: 'LT',
+  GT: 'GT',
+  LTE: 'LTE',
+  GTE: 'GTE',
+  SPACESHIP: 'SPACESHIP',
+  
+  AT: 'AT',
+  HASH: 'HASH',
+  UNDERSCORE: 'UNDERSCORE',
+  BACKSLASH: 'BACKSLASH',
+  
+  LPAREN: 'LPAREN',
+  RPAREN: 'RPAREN',
+  LBRACKET: 'LBRACKET',
+  RBRACKET: 'RBRACKET',
+  LBRACE: 'LBRACE',
+  RBRACE: 'RBRACE',
+  
+  NEWLINE: 'NEWLINE',
+  INDENT: 'INDENT',
+  DEDENT: 'DEDENT',
+  
+  LANG_BLOCK: 'LANG_BLOCK',
+  
+  COMMENT: 'COMMENT',
+  BLOCK_COMMENT: 'BLOCK_COMMENT',
+  
+  EOF: 'EOF',
+  ERROR: 'ERROR'
+}
+
+const LANG_BLOCKS = [
+  'html', 'css', 'style', 'script', 'js', 'javascript',
+  'php', 'python', 'py', 'ruby', 'rb',
+  'sql', 'graphql', 'gql',
+  'node', 'nodejs', 'ts', 'typescript',
+  'react', 'jsx', 'tsx',
+  'json', 'xml', 'yaml', 'markdown', 'md'
+]
 
 class EtherLexer {
   constructor(source, options = {}) {
@@ -51,6 +133,16 @@ class EtherLexer {
     return false
   }
 
+  matchSequence(seq) {
+    for (let i = 0; i < seq.length; i++) {
+      if (this.peek(i) !== seq[i]) return false
+    }
+    for (let i = 0; i < seq.length; i++) {
+      this.advance()
+    }
+    return true
+  }
+
   isAtEnd() {
     return this.pos >= this.source.length
   }
@@ -201,7 +293,7 @@ class EtherLexer {
         this.tokens.push(new Token(TokenType.DEDENT, '', this.line, 1, indent))
       }
       if (this.indentStack[this.indentStack.length - 1] !== indent) {
-        this.tokens.push(new Token(TokenType.ERROR, 'Indentation incohérente', this.line, 1, indent))
+        this.tokens.push(new Token(TokenType.ERROR, 'Indentation incohérente', this.line, 1, indent))
       }
     }
   }
@@ -277,7 +369,7 @@ class EtherLexer {
           break
         }
         if (this.peek() === '\n') {
-          this.tokens.push(new Token(TokenType.ERROR, 'Chaîne non terminée', startLine, startCol, this.currentIndent))
+          this.tokens.push(new Token(TokenType.ERROR, 'Chaîne non terminée', startLine, startCol, this.currentIndent))
           return
         }
       }
@@ -459,7 +551,7 @@ class EtherLexer {
       
       if (nextWord) {
         const combined = value + ' ' + nextWord
-        if (isCompoundKeyword(combined) || couldBeCompoundStart(combined)) {
+        if (this.isCompoundKeyword(combined) || this.couldBeCompoundStart(combined)) {
           value = combined
         } else {
           this.pos = savedPos
@@ -485,6 +577,53 @@ class EtherLexer {
     this.tokens.push(new Token(TokenType.IDENTIFIER, value, startLine, startCol, this.currentIndent))
   }
 
+  couldBeCompoundStart(partial) {
+    const normalized = this.normalizeAccents(partial)
+    const compounds = [
+      'retour a la ligne', 'a la soumission', 'a la reinitialisation',
+      'inferieur ou egal', 'superieur ou egal',
+      'gauche a droite', 'droite a gauche',
+      'mettre a jour', 'case a cocher'
+    ]
+    return compounds.some(c => c.startsWith(normalized + ' '))
+  }
+
+  normalizeAccents(str) {
+    const accentsMap = {
+      'à': 'a', 'â': 'a', 'ä': 'a', 'á': 'a',
+      'è': 'e', 'ê': 'e', 'ë': 'e', 'é': 'e',
+      'ì': 'i', 'î': 'i', 'ï': 'i', 'í': 'i',
+      'ò': 'o', 'ô': 'o', 'ö': 'o', 'ó': 'o',
+      'ù': 'u', 'û': 'u', 'ü': 'u', 'ú': 'u',
+      'ç': 'c', 'ñ': 'n'
+    }
+    return str.toLowerCase().split('').map(c => accentsMap[c] || c).join('')
+  }
+
+  isCompoundKeyword(phrase) {
+    const normalized = this.normalizeAccents(phrase)
+    const compounds = [
+      'en ligne', 'hors ligne', 'au survol', 'au clic', 'au focus',
+      'au double clic', 'au changement', 'a la soumission',
+      'retour a la ligne', 'lecture seule', 'zone texte',
+      'case a cocher', 'bouton radio', 'premiere lettre',
+      'premiere ligne', 'inferieur ou egal',
+      'superieur ou egal',
+      'espace de noms', 'element liste', 'racine carree',
+      'nouvelle fenetre', 'gauche a droite',
+      'droite a gauche',
+      'definir defaut', 'mettre a jour',
+      'cle primaire', 'cle etrangere',
+      'non nul', 'par defaut',
+      'au focus dans', 'pointeur bas', 'pointeur haut',
+      'obtenir contenu', 'erreur type', 'erreur syntaxe',
+      'nettoyer gauche', 'nettoyer droite', 'vers date',
+      'si null', 'creer role',
+      'a la reinitialisation'
+    ]
+    return compounds.includes(normalized)
+  }
+
   scanOperator() {
     const startLine = this.line
     const startCol = this.column
@@ -502,7 +641,7 @@ class EtherLexer {
       case '=':
         if (this.match('=')) {
           if (this.match('=')) {
-            this.tokens.push(new Token(TokenType.TRIPLE_EQUALS, '===', startLine, startCol, this.currentIndent))
+            this.tokens.push(new Token(TokenType.DOUBLE_EQUALS, '===', startLine, startCol, this.currentIndent))
           } else {
             this.tokens.push(new Token(TokenType.DOUBLE_EQUALS, '==', startLine, startCol, this.currentIndent))
           }
@@ -516,7 +655,7 @@ class EtherLexer {
       case '!':
         if (this.match('=')) {
           if (this.match('=')) {
-            this.tokens.push(new Token(TokenType.NOT_DOUBLE_EQUALS, '!==', startLine, startCol, this.currentIndent))
+            this.tokens.push(new Token(TokenType.NOT_EQUALS, '!==', startLine, startCol, this.currentIndent))
           } else {
             this.tokens.push(new Token(TokenType.NOT_EQUALS, '!=', startLine, startCol, this.currentIndent))
           }
@@ -544,9 +683,9 @@ class EtherLexer {
 
       case '+':
         if (this.match('+')) {
-          this.tokens.push(new Token(TokenType.PLUS_PLUS, '++', startLine, startCol, this.currentIndent))
+          this.tokens.push(new Token(TokenType.PLUS, '++', startLine, startCol, this.currentIndent))
         } else if (this.match('=')) {
-          this.tokens.push(new Token(TokenType.PLUS_EQUALS, '+=', startLine, startCol, this.currentIndent))
+          this.tokens.push(new Token(TokenType.PLUS, '+=', startLine, startCol, this.currentIndent))
         } else {
           this.tokens.push(new Token(TokenType.PLUS, '+', startLine, startCol, this.currentIndent))
         }
@@ -554,11 +693,11 @@ class EtherLexer {
 
       case '-':
         if (this.match('-')) {
-          this.tokens.push(new Token(TokenType.MINUS_MINUS, '--', startLine, startCol, this.currentIndent))
+          this.tokens.push(new Token(TokenType.MINUS, '--', startLine, startCol, this.currentIndent))
         } else if (this.match('>')) {
           this.tokens.push(new Token(TokenType.ARROW, '->', startLine, startCol, this.currentIndent))
         } else if (this.match('=')) {
-          this.tokens.push(new Token(TokenType.MINUS_EQUALS, '-=', startLine, startCol, this.currentIndent))
+          this.tokens.push(new Token(TokenType.MINUS, '-=', startLine, startCol, this.currentIndent))
         } else {
           this.tokens.push(new Token(TokenType.MINUS, '-', startLine, startCol, this.currentIndent))
         }
@@ -567,12 +706,12 @@ class EtherLexer {
       case '*':
         if (this.match('*')) {
           if (this.match('=')) {
-            this.tokens.push(new Token(TokenType.DOUBLE_STAR_EQUALS, '**=', startLine, startCol, this.currentIndent))
+            this.tokens.push(new Token(TokenType.DOUBLE_STAR, '**=', startLine, startCol, this.currentIndent))
           } else {
             this.tokens.push(new Token(TokenType.DOUBLE_STAR, '**', startLine, startCol, this.currentIndent))
           }
         } else if (this.match('=')) {
-          this.tokens.push(new Token(TokenType.STAR_EQUALS, '*=', startLine, startCol, this.currentIndent))
+          this.tokens.push(new Token(TokenType.STAR, '*=', startLine, startCol, this.currentIndent))
         } else {
           this.tokens.push(new Token(TokenType.STAR, '*', startLine, startCol, this.currentIndent))
         }
@@ -580,7 +719,7 @@ class EtherLexer {
 
       case '/':
         if (this.match('=')) {
-          this.tokens.push(new Token(TokenType.SLASH_EQUALS, '/=', startLine, startCol, this.currentIndent))
+          this.tokens.push(new Token(TokenType.SLASH, '/=', startLine, startCol, this.currentIndent))
         } else if (this.match('/')) {
           this.tokens.push(new Token(TokenType.DOUBLE_SLASH, '//', startLine, startCol, this.currentIndent))
         } else {
@@ -590,7 +729,7 @@ class EtherLexer {
 
       case '%':
         if (this.match('=')) {
-          this.tokens.push(new Token(TokenType.PERCENT_EQUALS, '%=', startLine, startCol, this.currentIndent))
+          this.tokens.push(new Token(TokenType.PERCENT, '%=', startLine, startCol, this.currentIndent))
         } else {
           this.tokens.push(new Token(TokenType.PERCENT, '%', startLine, startCol, this.currentIndent))
         }
@@ -604,7 +743,7 @@ class EtherLexer {
             this.tokens.push(new Token(TokenType.LTE, '<=', startLine, startCol, this.currentIndent))
           }
         } else if (this.match('<')) {
-          this.tokens.push(new Token(TokenType.LT_LT, '<<', startLine, startCol, this.currentIndent))
+          this.tokens.push(new Token(TokenType.LT, '<<', startLine, startCol, this.currentIndent))
         } else {
           this.tokens.push(new Token(TokenType.LT, '<', startLine, startCol, this.currentIndent))
         }
@@ -615,9 +754,9 @@ class EtherLexer {
           this.tokens.push(new Token(TokenType.GTE, '>=', startLine, startCol, this.currentIndent))
         } else if (this.match('>')) {
           if (this.match('>')) {
-            this.tokens.push(new Token(TokenType.GT_GT_GT, '>>>', startLine, startCol, this.currentIndent))
+            this.tokens.push(new Token(TokenType.GT, '>>>', startLine, startCol, this.currentIndent))
           } else {
-            this.tokens.push(new Token(TokenType.GT_GT, '>>', startLine, startCol, this.currentIndent))
+            this.tokens.push(new Token(TokenType.GT, '>>', startLine, startCol, this.currentIndent))
           }
         } else {
           this.tokens.push(new Token(TokenType.GT, '>', startLine, startCol, this.currentIndent))
@@ -628,7 +767,7 @@ class EtherLexer {
         if (this.match('&')) {
           this.tokens.push(new Token(TokenType.DOUBLE_AMPERSAND, '&&', startLine, startCol, this.currentIndent))
         } else if (this.match('=')) {
-          this.tokens.push(new Token(TokenType.AMPERSAND_EQUALS, '&=', startLine, startCol, this.currentIndent))
+          this.tokens.push(new Token(TokenType.AMPERSAND, '&=', startLine, startCol, this.currentIndent))
         } else {
           this.tokens.push(new Token(TokenType.AMPERSAND, '&', startLine, startCol, this.currentIndent))
         }
@@ -638,9 +777,9 @@ class EtherLexer {
         if (this.match('|')) {
           this.tokens.push(new Token(TokenType.DOUBLE_PIPE, '||', startLine, startCol, this.currentIndent))
         } else if (this.match('=')) {
-          this.tokens.push(new Token(TokenType.PIPE_EQUALS, '|=', startLine, startCol, this.currentIndent))
+          this.tokens.push(new Token(TokenType.PIPE, '|=', startLine, startCol, this.currentIndent))
         } else if (this.match('>')) {
-          this.tokens.push(new Token(TokenType.PIPE_GT, '|>', startLine, startCol, this.currentIndent))
+          this.tokens.push(new Token(TokenType.PIPE, '|>', startLine, startCol, this.currentIndent))
         } else {
           this.tokens.push(new Token(TokenType.PIPE, '|', startLine, startCol, this.currentIndent))
         }
@@ -648,7 +787,7 @@ class EtherLexer {
 
       case '^':
         if (this.match('=')) {
-          this.tokens.push(new Token(TokenType.CARET_EQUALS, '^=', startLine, startCol, this.currentIndent))
+          this.tokens.push(new Token(TokenType.CARET, '^=', startLine, startCol, this.currentIndent))
         } else {
           this.tokens.push(new Token(TokenType.CARET, '^', startLine, startCol, this.currentIndent))
         }
@@ -661,12 +800,12 @@ class EtherLexer {
       case '?':
         if (this.match('?')) {
           if (this.match('=')) {
-            this.tokens.push(new Token(TokenType.QUESTION_QUESTION_EQUALS, '??=', startLine, startCol, this.currentIndent))
+            this.tokens.push(new Token(TokenType.QUESTION, '??=', startLine, startCol, this.currentIndent))
           } else {
-            this.tokens.push(new Token(TokenType.DOUBLE_QUESTION, '??', startLine, startCol, this.currentIndent))
+            this.tokens.push(new Token(TokenType.QUESTION, '??', startLine, startCol, this.currentIndent))
           }
         } else if (this.match('.')) {
-          this.tokens.push(new Token(TokenType.QUESTION_DOT, '?.', startLine, startCol, this.currentIndent))
+          this.tokens.push(new Token(TokenType.QUESTION, '?.', startLine, startCol, this.currentIndent))
         } else {
           this.tokens.push(new Token(TokenType.QUESTION, '?', startLine, startCol, this.currentIndent))
         }
@@ -709,11 +848,10 @@ class EtherLexer {
         break
 
       case ';':
-        this.tokens.push(new Token(TokenType.SEMICOLON, ';', startLine, startCol, this.currentIndent))
         break
 
       default:
-        this.tokens.push(new Token(TokenType.ERROR, `Caractère inattendu: ${char}`, startLine, startCol, this.currentIndent))
+        this.tokens.push(new Token(TokenType.ERROR, `Caractère inattendu: ${char}`, startLine, startCol, this.currentIndent))
     }
   }
 
@@ -724,5 +862,8 @@ class EtherLexer {
 }
 
 module.exports = {
-  EtherLexer
+  EtherLexer,
+  Token,
+  TokenType,
+  LANG_BLOCKS
 }

package/lexer/tokens.js

@@ -260,12 +260,12 @@ class Token {
 
 function normalizeAccents(str) {
   const accentsMap = {
-    'à': 'a', 'â': 'a', 'ä': 'a', 'á': 'a',
-    'è': 'e', 'ê': 'e', 'ë': 'e', 'é': 'e',
-    'ì': 'i', 'î': 'i', 'ï': 'i', 'í': 'i',
-    'ò': 'o', 'ô': 'o', 'ö': 'o', 'ó': 'o',
-    'ù': 'u', 'û': 'u', 'ü': 'u', 'ú': 'u',
-    'ç': 'c', 'ñ': 'n'
+    'à': 'a', 'â': 'a', 'ä': 'a', 'á': 'a',
+    'è': 'e', 'ê': 'e', 'ë': 'e', 'é': 'e',
+    'ì': 'i', 'î': 'i', 'ï': 'i', 'í': 'i',
+    'ò': 'o', 'ô': 'o', 'ö': 'o', 'ó': 'o',
+    'ù': 'u', 'û': 'u', 'ü': 'u', 'ú': 'u',
+    'ç': 'c', 'ñ': 'n'
   }
   return str.toLowerCase().split('').map(c => accentsMap[c] || c).join('')
 }

package/package.json

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