Merged in pa2 and updated test scripts

src/main/java/chocopy/common/astnodes/BooleanLiteral.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** Literals True or False. */
 public final class BooleanLiteral extends Literal {
 

src/main/java/chocopy/common/astnodes/CallExpr.java

@@ -5,6 +5,7 @@ import java_cup.runtime.ComplexSymbolFactory.Location;
 
 import java.util.List;
 
+
 /** A function call. */
 public class CallExpr extends Expr {
 

src/main/java/chocopy/common/astnodes/ClassDef.java

@@ -5,6 +5,7 @@ import java_cup.runtime.ComplexSymbolFactory.Location;
 
 import java.util.List;
 
+
 /** A class definition. */
 public class ClassDef extends Declaration {
 

src/main/java/chocopy/common/astnodes/ClassType.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** A simple class type name. */
 public final class ClassType extends TypeAnnotation {
 

src/main/java/chocopy/common/astnodes/CompilerError.java

@@ -7,6 +7,7 @@ import java_cup.runtime.ComplexSymbolFactory.Location;
 import java.util.Arrays;
 import java.util.Objects;
 
+
 /** Represents a single error. Does not correspond to any Python source construct. */
 public class CompilerError extends Node {
 

src/main/java/chocopy/common/astnodes/Declaration.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** Base of all AST nodes representing definitions or declarations. */
 public abstract class Declaration extends Node {
 
@@ -11,6 +12,7 @@ public abstract class Declaration extends Node {
         super(left, right);
     }
 
+
     /** Return the identifier defined by this Declaration. */
     @JsonIgnore
     public abstract Identifier getIdentifier();

src/main/java/chocopy/common/astnodes/Errors.java

@@ -7,6 +7,7 @@ import java_cup.runtime.ComplexSymbolFactory.Location;
 
 import java.util.List;
 
+
 /** Collects the error messages in a Program. There is exactly one per Program node. */
 public class Errors extends Node {
 
@@ -26,11 +27,13 @@ public class Errors extends Node {
         allowMultipleErrors = true;
     }
 
+
     /** Return true iff there are any errors. */
     public boolean hasErrors() {
         return !this.errors.isEmpty();
     }
 
+
     /** Prevent multiple semantic errors on the same node. */
     public void suppressMultipleErrors() {
         allowMultipleErrors = false;

src/main/java/chocopy/common/astnodes/Expr.java

@@ -1,5 +1,6 @@
 package chocopy.common.astnodes;
 
+
 import chocopy.common.analysis.types.Type;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import java_cup.runtime.ComplexSymbolFactory.Location;

src/main/java/chocopy/common/astnodes/ExprStmt.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** Statements consisting of expressions. */
 public final class ExprStmt extends Stmt {
 

src/main/java/chocopy/common/astnodes/ForStmt.java

@@ -5,6 +5,7 @@ import java_cup.runtime.ComplexSymbolFactory.Location;
 
 import java.util.List;
 
+
 /** For statements. */
 public class ForStmt extends Stmt {
     /** Control variable. */

src/main/java/chocopy/common/astnodes/FuncDef.java

@@ -5,6 +5,7 @@ import java_cup.runtime.ComplexSymbolFactory.Location;
 
 import java.util.List;
 
+
 /** Def statements. */
 public class FuncDef extends Declaration {
 

src/main/java/chocopy/common/astnodes/GlobalDecl.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** Declaration of global variable. */
 public class GlobalDecl extends Declaration {
 

src/main/java/chocopy/common/astnodes/Identifier.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** A simple identifier. */
 public class Identifier extends Expr {
 

src/main/java/chocopy/common/astnodes/IfExpr.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** Conditional expressions. */
 public class IfExpr extends Expr {
     /** Boolean condition. */

src/main/java/chocopy/common/astnodes/IfStmt.java

@@ -5,6 +5,7 @@ import java_cup.runtime.ComplexSymbolFactory.Location;
 
 import java.util.List;
 
+
 /** Conditional statement. */
 public class IfStmt extends Stmt {
     /** Test condition. */

src/main/java/chocopy/common/astnodes/IndexExpr.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** List-indexing expression. */
 public class IndexExpr extends Expr {
 

src/main/java/chocopy/common/astnodes/IntegerLiteral.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** Integer numerals. */
 public final class IntegerLiteral extends Literal {
 

src/main/java/chocopy/common/astnodes/ListExpr.java

@@ -5,6 +5,7 @@ import java_cup.runtime.ComplexSymbolFactory.Location;
 
 import java.util.List;
 
+
 /** List displays. */
 public final class ListExpr extends Expr {
 

src/main/java/chocopy/common/astnodes/ListType.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** Type denotation for a list type. */
 public final class ListType extends TypeAnnotation {
 

src/main/java/chocopy/common/astnodes/MemberExpr.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** Attribute accessor. */
 public class MemberExpr extends Expr {
 

src/main/java/chocopy/common/astnodes/MethodCallExpr.java

@@ -5,6 +5,7 @@ import java_cup.runtime.ComplexSymbolFactory.Location;
 
 import java.util.List;
 
+
 /** Method calls. */
 public class MethodCallExpr extends Expr {
 

src/main/java/chocopy/common/astnodes/Node.java

@@ -78,6 +78,7 @@ public abstract class Node {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private String errorMsg;
 
+
     /** A Node corresponding to source text between LEFT and RIGHT. */
     public Node(Location left, Location right) {
         if (left != null) {
@@ -100,6 +101,7 @@ public abstract class Node {
         return location;
     }
 
+
     /** Copy LOCATION as getLocation(). */
     public void setLocation(final int[] location) {
         System.arraycopy(location, 0, this.location, 0, 4);
@@ -113,6 +115,7 @@ public abstract class Node {
         this.errorMsg = msg;
     }
 
+
     /** Return true iff I have been marked with an error message. */
     @JsonIgnore
     public boolean hasError() {
@@ -135,11 +138,13 @@ public abstract class Node {
         }
     }
 
+
     /** Return a serialization of this node in JSON format. */
     public String toJSON() throws JsonProcessingException {
         return mapper.writeValueAsString(this);
     }
 
+
     /** Mapper to-and-from serialized JSON. */
     private static final ObjectMapper mapper = new ObjectMapper();
 
@@ -148,6 +153,7 @@ public abstract class Node {
         mapper.registerModule(new ParameterNamesModule());
     }
 
+
     /** Returns a T from JSON, a JSON-serialized T value with class CLAS. */
     public static <T> T fromJSON(String json, Class<T> clas) throws IOException {
         return mapper.readValue(json, clas);

src/main/java/chocopy/common/astnodes/NonLocalDecl.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** Nonlocal declaration. */
 public class NonLocalDecl extends Declaration {
 

src/main/java/chocopy/common/astnodes/NoneLiteral.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** The expression 'None'. */
 public final class NoneLiteral extends Literal {
 

src/main/java/chocopy/common/astnodes/Program.java

@@ -7,7 +7,7 @@ import java_cup.runtime.ComplexSymbolFactory.Location;
 import java.util.ArrayList;
 import java.util.List;
 
-/** An entire ChocoPy program. */
+
 public class Program extends Node {
 
     /** Initial variable, class, and function declarations. */
@@ -42,12 +42,14 @@ public class Program extends Node {
         return analyzer.analyze(this);
     }
 
+
     /** Returns true iff there is at least one error in the program. */
     @JsonIgnore
     public boolean hasErrors() {
         return errors.hasErrors();
     }
 
+
     /** A convenience method returning the list of all CompilerErrors for this program. */
     @JsonIgnore
     public List<CompilerError> getErrorList() {

src/main/java/chocopy/common/astnodes/ReturnStmt.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** Return from function. */
 public class ReturnStmt extends Stmt {
 

src/main/java/chocopy/common/astnodes/StringLiteral.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** String constants. */
 public final class StringLiteral extends Literal {
 

src/main/java/chocopy/common/astnodes/TypeAnnotation.java

@@ -2,6 +2,7 @@ package chocopy.common.astnodes;
 
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** Base of all AST nodes representing type annotations (list or class types. */
 public abstract class TypeAnnotation extends Node {
     /** An annotation spanning source locations [LEFT..RIGHT]. */

src/main/java/chocopy/common/astnodes/TypedVar.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** An identifier with attached type annotation. */
 public class TypedVar extends Node {
 

src/main/java/chocopy/common/astnodes/UnaryExpr.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** An expression applying a unary operator. */
 public class UnaryExpr extends Expr {
 

src/main/java/chocopy/common/astnodes/VarDef.java

@@ -3,6 +3,7 @@ package chocopy.common.astnodes;
 import chocopy.common.analysis.NodeAnalyzer;
 import java_cup.runtime.ComplexSymbolFactory.Location;
 
+
 /** A declaration of a variable (i.e., with type annotation). */
 public class VarDef extends Declaration {
     /** The variable and its assigned type. */

src/main/java/chocopy/common/astnodes/WhileStmt.java

@@ -5,6 +5,7 @@ import java_cup.runtime.ComplexSymbolFactory.Location;
 
 import java.util.List;
 
+
 /** Indefinite repetition construct. */
 public class WhileStmt extends Stmt {
     /** Test for whether to continue. */
@@ -19,6 +20,7 @@ public class WhileStmt extends Stmt {
         this.body = body;
     }
 
+
     public <T> T dispatch(NodeAnalyzer<T> analyzer) {
         return analyzer.analyze(this);
     }