Merge branch 'master' of home:cse440p1

andrewrk · Sep 17, 2010 · f519cbb · f519cbb
2 parents af21012 + 2bf3af3
commit f519cbb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/pascal.y b/pascal.y
@@ -336,6 +336,10 @@ if_statement : KEYWORD_IF expression KEYWORD_THEN statement KEYWORD_ELSE stateme
 	{
 
 	}
+ | KEYWORD_IF expression KEYWORD_THEN statement 
+ {
+
+ }
  ;
 
 assignment_statement : variable_access KEYWORD_COLON_EQUAL expression

diff --git a/test.py b/test.py
@@ -37,7 +37,8 @@ def main():
             tests[test_name] = {}
 
         if ext == '.p.expected':
-            tests[test_name]['expected'] = open(absolute(f), 'r').read()
+            expected_output = open(absolute(f), 'r').read()
+            tests[test_name]['expected'] = expected_output.replace('Errors detected. Exiting.\n', '')
         else:
             tests[test_name]['source'] = open(absolute(f), 'r').read()
 

diff --git a/tests/formal/test_invalid_class_definition_underscores.p.expected b/tests/formal/test_invalid_class_definition_underscores.p.expected
@@ -1,3 +1 @@
 '_' (0137): illegal character at line 8
-8: syntax error at 'Switch'
-Errors detected. Exiting.