Fix `for` loop for 1+ params

3 files changed, 25 insertions, 8 deletions

diff --git a/src/ast/nodes/ExprListNode.java b/src/ast/nodes/ExprListNode.java
index c1a2ebc..acdf679 100644
--- a/src/ast/nodes/ExprListNode.java
+++ b/src/ast/nodes/ExprListNode.java
@@ -12,16 +12,16 @@ public class ExprListNode implements Node {
 
     private final ArrayList<Node> exprs;
 
-    public ExprListNode(ArrayList<Node> _exprs) {
-        this.exprs = _exprs;
+    public ExprListNode(ArrayList<Node> exprs) {
+        this.exprs = exprs;
     }
 
     @Override
     public ArrayList<SemanticError> checkSemantics(SymbolTable ST, int _nesting) {
         ArrayList<SemanticError> errors = new ArrayList();
 
-        for (var param : exprs) {
-            errors.addAll(param.checkSemantics(ST, _nesting));
+        for (var expr : exprs) {
+            errors.addAll(expr.checkSemantics(ST, _nesting));
         }
 
         return errors;
diff --git a/src/ast/nodes/ExprNode.java b/src/ast/nodes/ExprNode.java
index 62b3a94..781cc76 100644
--- a/src/ast/nodes/ExprNode.java
+++ b/src/ast/nodes/ExprNode.java
@@ -26,6 +26,14 @@ public class ExprNode implements Node {
         this.trailers = trailers;
     }
 
+    public Node getExpr(int i) {
+        if (i >= this.exprs.size()) {
+            return null;
+        }
+
+        return this.exprs.get(i);
+    }
+
     public String getId() {
         if (atom != null) {
             return ((AtomNode) this.atom).getId();
@@ -67,7 +75,8 @@ public class ExprNode implements Node {
                         int argNumber = trailer.getArgumentNumber();
 
                         if (paramNumber != argNumber) {
-                            errors.add(new SemanticError(funName + "() takes " + String.valueOf(paramNumber) + " positional arguments but " + String.valueOf(argNumber) + " were given."));
+                            errors.add(new SemanticError(funName + "() takes " + String.valueOf(paramNumber)
+                                    + " positional arguments but " + String.valueOf(argNumber) + " were given."));
                         }
                     }
                 }
diff --git a/src/ast/nodes/ForStmtNode.java b/src/ast/nodes/ForStmtNode.java
index 610d0a0..c5301ee 100644
--- a/src/ast/nodes/ForStmtNode.java
+++ b/src/ast/nodes/ForStmtNode.java
@@ -10,11 +10,11 @@ import semanticanalysis.SymbolTable;
  */
 public class ForStmtNode implements Node {
 
-    private ExprListNode exprList;
+    private Node exprList;
     private Node block;
 
     public ForStmtNode(Node exprList, Node block) {
-        this.exprList = (ExprListNode) exprList;
+        this.exprList = exprList;
         this.block = block;
     }
 
@@ -22,7 +22,15 @@ public class ForStmtNode implements Node {
     public ArrayList<SemanticError> checkSemantics(SymbolTable ST, int _nesting) {
         ArrayList<SemanticError> errors = new ArrayList<SemanticError>();
 
-        // ST.insert(expr.getId(), expr.typeCheck(s), _nesting, "");
+        var l = (ExprListNode) exprList;
+        for (int i = 0; i < l.getSize() - 1; ++i) {
+            var e = (ExprNode) l.getElem(i);
+            ST.insert(e.getId(), e.typeCheck(), _nesting, "");
+        }
+
+        var left = (ExprNode) l.getElem(l.getSize() - 1);
+        var atomLeft = (ExprNode) left.getExpr(0);
+        ST.insert(atomLeft.getId(), atomLeft.typeCheck(), _nesting, "");
 
         errors.addAll(exprList.checkSemantics(ST, _nesting));
         errors.addAll(block.checkSemantics(ST, _nesting));