starlight-cli 1.0.37 → 1.0.39

package/dist/index.js

@@ -1467,11 +1467,11 @@ async evaluate(node, env = this.global) {
     case 'Literal': return node.value;
     case 'Identifier': return env.get(node.name);
     case 'IfStatement': return await this.evalIf(node, env);
-    case 'ForInStatement':
-  return await this.evalForIn(node, env);
-
     case 'WhileStatement': return await this.evalWhile(node, env);
-    case 'ForStatement': return await this.evalFor(node, env);
+    case 'ForStatement':
+case 'ForInStatement':
+  return await this.evalFor(node, env);
+
     case 'BreakStatement': throw new BreakSignal();
     case 'ContinueStatement': throw new ContinueSignal();
     case 'ImportStatement': return await this.evalImport(node, env);
@@ -1487,12 +1487,14 @@ async evaluate(node, env = this.global) {
       return await Promise.all(node.elements.map(el => this.evaluate(el, env)));
     case 'IndexExpression': return await this.evalIndex(node, env);
     case 'ObjectExpression': {
-      const out = {};
-      for (const p of node.props) {
-        out[p.key] = await this.evaluate(p.value, env);
-      }
-      return out;
-    }
+  const out = {};
+  for (const p of node.props) {
+    const key = await this.evaluate(p.key, env);
+    out[key] = await this.evaluate(p.value, env);
+  }
+  return out;
+}
+
     case 'MemberExpression': return await this.evalMember(node, env);
     case 'UpdateExpression': return await this.evalUpdate(node, env);
     case 'AwaitExpression': {
@@ -1539,30 +1541,7 @@ async evalProgram(node, env) {
   }
   return result;
 }
-async evalForIn(node, env) {
-  const iterable = await this.evaluate(node.iterable, env);
-
-  if (!Array.isArray(iterable)) {
-    throw new Error("for-in expects an array");
-  }
-
-  for (const value of iterable) {
-    const local = new Environment(env);
-
-    // loop variable
-    local.define(node.id.name, value);
-
-    try {
-      await this.evaluate(node.body, local);
-    } catch (e) {
-      if (e instanceof BreakSignal) break;
-      if (e instanceof ContinueSignal) continue;
-      throw e;
-    }
-  }
 
-  return null;
-}
 
 async evalImport(node, env) {
   const spec = node.path;
@@ -1772,9 +1751,11 @@ async evalWhile(node, env) {
   }
   return null;
 }
-
 async evalFor(node, env) {
-  // --- Python-style for x in iterable ---
+
+  // -------------------------------
+  // Python-style: for x in iterable
+  // -------------------------------
   if (node.type === 'ForInStatement') {
     const iterable = await this.evaluate(node.iterable, env);
 
@@ -1782,11 +1763,13 @@ async evalFor(node, env) {
       throw new Error('Cannot iterate over non-iterable');
     }
 
-    // Handle arrays
+    const loopVar = node.variable; // STRING from parser
+
+    // Arrays
     if (Array.isArray(iterable)) {
-      for (let i = 0; i < iterable.length; i++) {
+      for (const value of iterable) {
         const loopEnv = new Environment(env);
-        loopEnv.define(node.variable, iterable[i]);
+        loopEnv.define(loopVar, value);
 
         try {
           await this.evaluate(node.body, loopEnv);
@@ -1796,11 +1779,12 @@ async evalFor(node, env) {
           throw e;
         }
       }
-    } else {
-      // Handle objects: iterate over keys
+    }
+    // Objects (keys)
+    else {
       for (const key of Object.keys(iterable)) {
         const loopEnv = new Environment(env);
-        loopEnv.define(node.variable, key);
+        loopEnv.define(loopVar, key);
 
         try {
           await this.evaluate(node.body, loopEnv);
@@ -1815,7 +1799,11 @@ async evalFor(node, env) {
     return null;
   }
 
+  // -------------------------------
+  // C-style for loop
+  // -------------------------------
   const local = new Environment(env);
+
   if (node.init) await this.evaluate(node.init, local);
 
   while (!node.test || await this.evaluate(node.test, local)) {

package/package.json

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

package/src/evaluator.js

@@ -124,11 +124,11 @@ async evaluate(node, env = this.global) {
     case 'Literal': return node.value;
     case 'Identifier': return env.get(node.name);
     case 'IfStatement': return await this.evalIf(node, env);
-    case 'ForInStatement':
-  return await this.evalForIn(node, env);
-
     case 'WhileStatement': return await this.evalWhile(node, env);
-    case 'ForStatement': return await this.evalFor(node, env);
+    case 'ForStatement':
+case 'ForInStatement':
+  return await this.evalFor(node, env);
+
     case 'BreakStatement': throw new BreakSignal();
     case 'ContinueStatement': throw new ContinueSignal();
     case 'ImportStatement': return await this.evalImport(node, env);
@@ -144,12 +144,14 @@ async evaluate(node, env = this.global) {
       return await Promise.all(node.elements.map(el => this.evaluate(el, env)));
     case 'IndexExpression': return await this.evalIndex(node, env);
     case 'ObjectExpression': {
-      const out = {};
-      for (const p of node.props) {
-        out[p.key] = await this.evaluate(p.value, env);
-      }
-      return out;
-    }
+  const out = {};
+  for (const p of node.props) {
+    const key = await this.evaluate(p.key, env);
+    out[key] = await this.evaluate(p.value, env);
+  }
+  return out;
+}
+
     case 'MemberExpression': return await this.evalMember(node, env);
     case 'UpdateExpression': return await this.evalUpdate(node, env);
     case 'AwaitExpression': {
@@ -196,30 +198,7 @@ async evalProgram(node, env) {
   }
   return result;
 }
-async evalForIn(node, env) {
-  const iterable = await this.evaluate(node.iterable, env);
-
-  if (!Array.isArray(iterable)) {
-    throw new Error("for-in expects an array");
-  }
-
-  for (const value of iterable) {
-    const local = new Environment(env);
 
-    // loop variable
-    local.define(node.id.name, value);
-
-    try {
-      await this.evaluate(node.body, local);
-    } catch (e) {
-      if (e instanceof BreakSignal) break;
-      if (e instanceof ContinueSignal) continue;
-      throw e;
-    }
-  }
-
-  return null;
-}
 
 async evalImport(node, env) {
   const spec = node.path;
@@ -429,9 +408,11 @@ async evalWhile(node, env) {
   }
   return null;
 }
-
 async evalFor(node, env) {
-  // --- Python-style for x in iterable ---
+
+  // -------------------------------
+  // Python-style: for x in iterable
+  // -------------------------------
   if (node.type === 'ForInStatement') {
     const iterable = await this.evaluate(node.iterable, env);
 
@@ -439,11 +420,13 @@ async evalFor(node, env) {
       throw new Error('Cannot iterate over non-iterable');
     }
 
-    // Handle arrays
+    const loopVar = node.variable; // STRING from parser
+
+    // Arrays
     if (Array.isArray(iterable)) {
-      for (let i = 0; i < iterable.length; i++) {
+      for (const value of iterable) {
         const loopEnv = new Environment(env);
-        loopEnv.define(node.variable, iterable[i]);
+        loopEnv.define(loopVar, value);
 
         try {
           await this.evaluate(node.body, loopEnv);
@@ -453,11 +436,12 @@ async evalFor(node, env) {
           throw e;
         }
       }
-    } else {
-      // Handle objects: iterate over keys
+    }
+    // Objects (keys)
+    else {
       for (const key of Object.keys(iterable)) {
         const loopEnv = new Environment(env);
-        loopEnv.define(node.variable, key);
+        loopEnv.define(loopVar, key);
 
         try {
           await this.evaluate(node.body, loopEnv);
@@ -472,7 +456,11 @@ async evalFor(node, env) {
     return null;
   }
 
+  // -------------------------------
+  // C-style for loop
+  // -------------------------------
   const local = new Environment(env);
+
   if (node.init) await this.evaluate(node.init, local);
 
   while (!node.test || await this.evaluate(node.test, local)) {