starlight-cli 1.0.34 → 1.0.35

package/dist/index.js

@@ -1747,11 +1747,54 @@ async evalWhile(node, env) {
 }
 
 async evalFor(node, env) {
+  // --- Python-style for x in iterable ---
+  if (node.type === 'ForInStatement') {
+    const iterable = await this.evaluate(node.iterable, env);
+
+    if (iterable == null || typeof iterable !== 'object') {
+      throw new Error('Cannot iterate over non-iterable');
+    }
+
+    // Handle arrays
+    if (Array.isArray(iterable)) {
+      for (let i = 0; i < iterable.length; i++) {
+        const loopEnv = new Environment(env);
+        loopEnv.define(node.variable, iterable[i]);
+
+        try {
+          await this.evaluate(node.body, loopEnv);
+        } catch (e) {
+          if (e instanceof BreakSignal) break;
+          if (e instanceof ContinueSignal) continue;
+          throw e;
+        }
+      }
+    } else {
+      // Handle objects: iterate over keys
+      for (const key of Object.keys(iterable)) {
+        const loopEnv = new Environment(env);
+        loopEnv.define(node.variable, key);
+
+        try {
+          await this.evaluate(node.body, loopEnv);
+        } catch (e) {
+          if (e instanceof BreakSignal) break;
+          if (e instanceof ContinueSignal) continue;
+          throw e;
+        }
+      }
+    }
+
+    return null;
+  }
+
   const local = new Environment(env);
   if (node.init) await this.evaluate(node.init, local);
+
   while (!node.test || await this.evaluate(node.test, local)) {
-    try { await this.evaluate(node.body, local); }
-    catch (e) {
+    try {
+      await this.evaluate(node.body, local);
+    } catch (e) {
       if (e instanceof BreakSignal) break;
       if (e instanceof ContinueSignal) {
         if (node.update) await this.evaluate(node.update, local);
@@ -1759,8 +1802,10 @@ async evalFor(node, env) {
       }
       throw e;
     }
+
     if (node.update) await this.evaluate(node.update, local);
   }
+
   return null;
 }
 
@@ -2266,10 +2311,22 @@ importStatement() {
 
   return { type: 'ImportStatement', path: pathToken.value, specifiers };
 }
-
 forStatement() {
   this.eat('FOR');
 
+  // --- Python-style: for variable in iterable ---
+  if (this.current.type === 'IDENTIFIER' && this.peekType() === 'IN') {
+    const variable = this.current.value; // loop variable
+    this.eat('IDENTIFIER');
+
+    this.eat('IN');
+    const iterable = this.expression(); // the array/object to loop over
+
+    const body = this.block();
+    return { type: 'ForInStatement', variable, iterable, body };
+  }
+
+  // --- C-style: for(init; test; update) ---
   let init = null;
   let test = null;
   let update = null;
@@ -2277,16 +2334,23 @@ forStatement() {
   if (this.current.type === 'LPAREN') {
     this.eat('LPAREN');
 
-    if (this.current.type !== 'SEMICOLON') init = this.current.type === 'LET' ? this.varDeclaration() : this.expressionStatement();
-    else this.eat('SEMICOLON');
+    // init
+    if (this.current.type !== 'SEMICOLON') {
+      init = this.current.type === 'LET' ? this.varDeclaration() : this.expressionStatement();
+    } else {
+      this.eat('SEMICOLON');
+    }
 
+    // test
     if (this.current.type !== 'SEMICOLON') test = this.expression();
     this.eat('SEMICOLON');
 
+    // update
     if (this.current.type !== 'RPAREN') update = this.expression();
     this.eat('RPAREN');
   } else {
-    init = this.expression(); 
+    // fallback: single expression (could be used for Python-style with "in", already handled above)
+    init = this.expression();
     if (this.current.type === 'IN') {
       this.eat('IN');
       test = this.expression(); // iterable
@@ -2299,15 +2363,15 @@ forStatement() {
 
 breakStatement() {
   this.eat('BREAK');
-  if (this.current.type === 'SEMICOLON') this.eat('SEMICOLON');
+  // Python-style: no semicolon needed, ignore if present
+  if (this.current.type === 'SEMICOLON') this.advance();
   return { type: 'BreakStatement' };
 }
 
-
-  continueStatement() {
+continueStatement() {
   this.eat('CONTINUE');
-  // semicolon optional
-  if (this.current.type === 'SEMICOLON') this.eat('SEMICOLON');
+  // Python-style: no semicolon needed, ignore if present
+  if (this.current.type === 'SEMICOLON') this.advance();
   return { type: 'ContinueStatement' };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starlight-cli",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "description": "Starlight Programming Language CLI",
   "bin": {
     "starlight": "index.js"

package/src/evaluator.js

@@ -404,11 +404,54 @@ async evalWhile(node, env) {
 }
 
 async evalFor(node, env) {
+  // --- Python-style for x in iterable ---
+  if (node.type === 'ForInStatement') {
+    const iterable = await this.evaluate(node.iterable, env);
+
+    if (iterable == null || typeof iterable !== 'object') {
+      throw new Error('Cannot iterate over non-iterable');
+    }
+
+    // Handle arrays
+    if (Array.isArray(iterable)) {
+      for (let i = 0; i < iterable.length; i++) {
+        const loopEnv = new Environment(env);
+        loopEnv.define(node.variable, iterable[i]);
+
+        try {
+          await this.evaluate(node.body, loopEnv);
+        } catch (e) {
+          if (e instanceof BreakSignal) break;
+          if (e instanceof ContinueSignal) continue;
+          throw e;
+        }
+      }
+    } else {
+      // Handle objects: iterate over keys
+      for (const key of Object.keys(iterable)) {
+        const loopEnv = new Environment(env);
+        loopEnv.define(node.variable, key);
+
+        try {
+          await this.evaluate(node.body, loopEnv);
+        } catch (e) {
+          if (e instanceof BreakSignal) break;
+          if (e instanceof ContinueSignal) continue;
+          throw e;
+        }
+      }
+    }
+
+    return null;
+  }
+
   const local = new Environment(env);
   if (node.init) await this.evaluate(node.init, local);
+
   while (!node.test || await this.evaluate(node.test, local)) {
-    try { await this.evaluate(node.body, local); }
-    catch (e) {
+    try {
+      await this.evaluate(node.body, local);
+    } catch (e) {
       if (e instanceof BreakSignal) break;
       if (e instanceof ContinueSignal) {
         if (node.update) await this.evaluate(node.update, local);
@@ -416,8 +459,10 @@ async evalFor(node, env) {
       }
       throw e;
     }
+
     if (node.update) await this.evaluate(node.update, local);
   }
+
   return null;
 }
 

package/src/parser.js

@@ -208,10 +208,22 @@ importStatement() {
 
   return { type: 'ImportStatement', path: pathToken.value, specifiers };
 }
-
 forStatement() {
   this.eat('FOR');
 
+  // --- Python-style: for variable in iterable ---
+  if (this.current.type === 'IDENTIFIER' && this.peekType() === 'IN') {
+    const variable = this.current.value; // loop variable
+    this.eat('IDENTIFIER');
+
+    this.eat('IN');
+    const iterable = this.expression(); // the array/object to loop over
+
+    const body = this.block();
+    return { type: 'ForInStatement', variable, iterable, body };
+  }
+
+  // --- C-style: for(init; test; update) ---
   let init = null;
   let test = null;
   let update = null;
@@ -219,16 +231,23 @@ forStatement() {
   if (this.current.type === 'LPAREN') {
     this.eat('LPAREN');
 
-    if (this.current.type !== 'SEMICOLON') init = this.current.type === 'LET' ? this.varDeclaration() : this.expressionStatement();
-    else this.eat('SEMICOLON');
+    // init
+    if (this.current.type !== 'SEMICOLON') {
+      init = this.current.type === 'LET' ? this.varDeclaration() : this.expressionStatement();
+    } else {
+      this.eat('SEMICOLON');
+    }
 
+    // test
     if (this.current.type !== 'SEMICOLON') test = this.expression();
     this.eat('SEMICOLON');
 
+    // update
     if (this.current.type !== 'RPAREN') update = this.expression();
     this.eat('RPAREN');
   } else {
-    init = this.expression(); 
+    // fallback: single expression (could be used for Python-style with "in", already handled above)
+    init = this.expression();
     if (this.current.type === 'IN') {
       this.eat('IN');
       test = this.expression(); // iterable
@@ -241,15 +260,15 @@ forStatement() {
 
 breakStatement() {
   this.eat('BREAK');
-  if (this.current.type === 'SEMICOLON') this.eat('SEMICOLON');
+  // Python-style: no semicolon needed, ignore if present
+  if (this.current.type === 'SEMICOLON') this.advance();
   return { type: 'BreakStatement' };
 }
 
-
-  continueStatement() {
+continueStatement() {
   this.eat('CONTINUE');
-  // semicolon optional
-  if (this.current.type === 'SEMICOLON') this.eat('SEMICOLON');
+  // Python-style: no semicolon needed, ignore if present
+  if (this.current.type === 'SEMICOLON') this.advance();
   return { type: 'ContinueStatement' };
 }