Homework 3

src/cd/util/debug/AstOneLine.java

@@ -160,7 +160,15 @@ public class AstOneLine {
 		@Override
 		public String var(Var ast, Void arg) {
 			{
-				return ast.name;
+				if (ast.sym != null) {
+					String symName = ast.sym.toString(); 
+					if (ast.name == null || ast.name.equals(symName))
+						return symName;
+					
+					// Return something strange to warn about the mismatch here: 
+					return String.format("(%s!=%s)", symName, ast.name);
+				} else
+					return ast.name;
 			}
 		}