Fix syntax error messages

DATP4G6 · Apr 26, 2024 · 124afc6 · 124afc6
1 parent a6c75d3
commit 124afc6
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 20 deletions.
diff --git a/SocietalConstructionTool/SctRunner.cs b/SocietalConstructionTool/SctRunner.cs
@@ -37,7 +37,9 @@ private static SctParser GetSctParser(string input)
             ICharStream stream = CharStreams.fromString(input);
             ITokenSource lexer = new SctLexer(stream);
             ITokenStream tokens = new CommonTokenStream(lexer);
-            return new SctParser(tokens);
+            SctParser parser = new(tokens);
+            parser.RemoveErrorListeners();
+            return parser;
         }
 
         /**
@@ -136,12 +138,12 @@ public static List<CompilerError> RunStaticChecks(string[] filenames)
                 startNodes[file] = parser.start();
                 var startNode = startNodes[file];
 
-                //adds syntax errors
-                errors.AddRange(errorListener.Errors.ToList());
-
                 // Run checks
                 var fileErrors = RunFirstPassChecks(startNode, cTableBuilder);
 
+                //adds syntax errors
+                fileErrors.AddRange(errorListener.Errors.ToList());
+
                 // Annotate each error with the filename.
                 foreach (var error in fileErrors)
                 {

diff --git a/SocietalConstructionToolTests/Snapshots/StaticCheckTests/WrongExpressionIf.verified.txt b/SocietalConstructionToolTests/Snapshots/StaticCheckTests/WrongExpressionIf.verified.txt
@@ -2,12 +2,14 @@
   {
     Message: mismatched input 'void' expecting {'-', '!', '(', ID, INT, FLOAT},
     Line: 4,
-    Column: 8
+    Column: 8,
+    Filename: {CurrentDirectory}TestFiles/StaticCheckTests/WrongExpressionIf.sct
   },
   {
     Message: mismatched input 'void' expecting {'-', '!', '(', ID, INT, FLOAT},
     Line: 5,
-    Column: 13
+    Column: 13,
+    Filename: {CurrentDirectory}TestFiles/StaticCheckTests/WrongExpressionIf.sct
   },
   {
     Message: Boolean expression must be numeric.,

diff --git a/SocietalConstructionToolTests/Snapshots/StaticCheckTests/WrongExpressionWhile.verified.txt b/SocietalConstructionToolTests/Snapshots/StaticCheckTests/WrongExpressionWhile.verified.txt
@@ -2,7 +2,8 @@
   {
     Message: mismatched input 'void' expecting {'-', '!', '(', ID, INT, FLOAT},
     Line: 4,
-    Column: 11
+    Column: 11,
+    Filename: {CurrentDirectory}TestFiles/StaticCheckTests/WrongExpressionWhile.sct
   },
   {
     Message: Boolean expression must be numeric.,

diff --git a/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorArray.verified.txt b/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorArray.verified.txt
@@ -2,16 +2,19 @@
   {
     Message: mismatched input '[' expecting ID,
     Line: 2,
-    Column: 7
+    Column: 7,
+    Filename: null
   },
   {
     Message: extraneous input '[' expecting {'-', '!', '(', ID, INT, FLOAT},
     Line: 2,
-    Column: 19
+    Column: 19,
+    Filename: null
   },
   {
     Message: mismatched input ',' expecting ';',
     Line: 2,
-    Column: 21
+    Column: 21,
+    Filename: null
   }
 ]
diff --git a/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorBrackets.verified.txt b/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorBrackets.verified.txt
@@ -2,6 +2,7 @@
   {
     Message: missing ')' at ';',
     Line: 2,
-    Column: 23
+    Column: 23,
+    Filename: null
   }
 ]
diff --git a/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorMissingCurlyBracket.verified.txt b/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorMissingCurlyBracket.verified.txt
@@ -2,6 +2,7 @@
   {
     Message: missing '{' at 'create',
     Line: 3,
-    Column: 8
+    Column: 8,
+    Filename: null
   }
 ]
diff --git a/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorMissingSemicolon.verified.txt b/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorMissingSemicolon.verified.txt
@@ -2,6 +2,7 @@
   {
     Message: missing ';' at '}',
     Line: 3,
-    Column: 0
+    Column: 0,
+    Filename: null
   }
 ]
diff --git a/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorMissspelledState.verified.txt b/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorMissspelledState.verified.txt
@@ -2,6 +2,7 @@
   {
     Message: mismatched input 'sttate' expecting '}',
     Line: 2,
-    Column: 4
+    Column: 4,
+    Filename: null
   }
 ]
diff --git a/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorPredicate.verified.txt b/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorPredicate.verified.txt
@@ -2,11 +2,13 @@
   {
     Message: mismatched input ':' expecting '::',
     Line: 3,
-    Column: 22
+    Column: 22,
+    Filename: null
   },
   {
     Message: mismatched input ':' expecting ')',
     Line: 3,
-    Column: 31
+    Column: 31,
+    Filename: null
   }
 ]
diff --git a/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorStateInState.verified.txt b/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorStateInState.verified.txt
@@ -2,11 +2,13 @@
   {
     Message: missing '}' at 'state',
     Line: 3,
-    Column: 8
+    Column: 8,
+    Filename: null
   },
   {
     Message: extraneous input '}' expecting {<EOF>, 'function', 'class'},
     Line: 7,
-    Column: 0
+    Column: 0,
+    Filename: null
   }
 ]
diff --git a/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorWrongBrackets.verified.txt b/SocietalConstructionToolTests/Snapshots/SyntaxTests/ErrorWrongBrackets.verified.txt
@@ -2,11 +2,13 @@
   {
     Message: extraneous input '{' expecting {'-', '!', '(', ID, INT, FLOAT},
     Line: 2,
-    Column: 17
+    Column: 17,
+    Filename: null
   },
   {
     Message: extraneous input '}' expecting ';',
     Line: 2,
-    Column: 23
+    Column: 23,
+    Filename: null
   }
 ]