Add redefinition error handling

mads256h · Apr 22, 2022 · 2882dea · 2882dea
1 parent 81bb463
commit 2882dea
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/src/main/java/org/flowsoft/flowg/RedeclarationException.java b/src/main/java/org/flowsoft/flowg/RedeclarationException.java
@@ -11,4 +11,12 @@ public RedeclarationException(Location left, Location right) {
         _left = left;
         _right = right;
     }
+
+    public Location GetLeft() {
+        return _left;
+    }
+
+    public Location GetRight() {
+        return _right;
+    }
 }
diff --git a/src/main/java/org/flowsoft/flowg/main.java b/src/main/java/org/flowsoft/flowg/main.java
@@ -119,6 +119,10 @@ public static void main(String[] args) {
             System.err.format("%s:%d:%d: error: type mismatch between %s and %s\n", args[0], e.GetLeft().getLine(), e.GetLeft().getColumn(), TypeHelper.TypeToString(e.GetLeftType()), TypeHelper.TypeToString(e.GetRightType()));
             System.err.println(GetLine(file, e.GetLeft(), e.GetRight()));
         }
+        catch (RedeclarationException e) {
+            System.err.format("%s:%d:%d: error: symbol redefinition\n", args[0], e.GetLeft().getLine(), e.GetLeft().getColumn());
+            System.err.println(GetLine(file, e.GetLeft(), e.GetRight()));
+        }
         catch (Exception e) {
             System.out.println("Could not parse");
             e.printStackTrace();

diff --git a/src/main/java/org/flowsoft/flowg/symboltables/SymbolTable.java b/src/main/java/org/flowsoft/flowg/symboltables/SymbolTable.java
@@ -12,9 +12,6 @@
 import java.util.Map;
 
 public class SymbolTable implements Cloneable<SymbolTable> {
-    //TODO: remove this
-    private static final Location N = new Location("fixme", 0, 0, 0);
-
     private final SymbolTable _parent;
 
     private final Map<String, VariableEntry> _variableEntries;
@@ -33,21 +30,21 @@ private SymbolTable(SymbolTable parent, Map<String, VariableEntry> variableEntri
         _functionEntries = functionEntries;
     }
 
-    public void Enter(String identifier, Type type) throws TypeException {
+    public void Enter(String identifier, Type type, Location left, Location right) throws TypeException {
         if (!_variableEntries.containsKey(identifier)) {
             _variableEntries.put(identifier, new VariableEntry(identifier, type));
         }
         else {
-            throw new RedeclarationException(N, N);
+            throw new RedeclarationException(left, right);
         }
     }
 
-    public void Enter(Type returnType, String identifier, ArrayList<FormalParameterNode> formalParameters, StatementListNode functionBody, SymbolTable parent) throws TypeException {
+    public void Enter(Type returnType, String identifier, ArrayList<FormalParameterNode> formalParameters, StatementListNode functionBody, SymbolTable parent, Location left, Location right) throws TypeException {
         if (!_functionEntries.containsKey(identifier)) {
             _functionEntries.put(identifier, new FunctionEntry(returnType, identifier, formalParameters, functionBody, parent));
         }
         else {
-            throw new RedeclarationException(N, N);
+            throw new RedeclarationException(left, right);
         }
     }
 

diff --git a/src/main/java/org/flowsoft/flowg/visitors/TypeCheckingVisitor.java b/src/main/java/org/flowsoft/flowg/visitors/TypeCheckingVisitor.java
@@ -180,7 +180,7 @@ public Type Visit(DeclarationNode declarationNode) throws TypeException {
         var typeNodeType = typeNode.Accept(this);
         var expressionNodeType = expressionNode.Accept(this);
         if (typeNodeType == expressionNodeType) {
-            _symbolTable.Enter(identifierNode.GetValue(), typeNodeType);
+            _symbolTable.Enter(identifierNode.GetValue(), typeNodeType, declarationNode.GetLeft(), declarationNode.GetRight());
             return typeNodeType;
         }
         else {
@@ -191,18 +191,19 @@ public Type Visit(DeclarationNode declarationNode) throws TypeException {
     @Override
     public Type Visit(FunctionDefinitionNode functionDefinitionNode) throws TypeException {
         var returnType = functionDefinitionNode.GetTypeNode().Accept(this);
-        var identifier = functionDefinitionNode.GetIdentifierNode().GetValue();
+        var identifierNode = functionDefinitionNode.GetIdentifierNode();
+        var identifier = identifierNode.GetValue();
         var formalParams = functionDefinitionNode.GetFormalParameterListNode();
         var statementList = functionDefinitionNode.GetStatementListNode();
 
         var parentSymbolTable = _symbolTable.Clone();
         var bodySymbolTable = new SymbolTable(parentSymbolTable);
         for (var param : formalParams.GetChildren()) {
-            bodySymbolTable.Enter(param.GetRightChild().GetValue(), param.GetLeftChild().GetValue());
+            bodySymbolTable.Enter(param.GetRightChild().GetValue(), param.GetLeftChild().GetValue(), param.GetLeft(), param.GetRight());
         }
 
-        parentSymbolTable.Enter(returnType, identifier, (ArrayList<FormalParameterNode>) formalParams.GetChildren(), functionDefinitionNode.GetStatementListNode(), bodySymbolTable);
-        _symbolTable.Enter(returnType, identifier, (ArrayList<FormalParameterNode>) formalParams.GetChildren(), functionDefinitionNode.GetStatementListNode(), bodySymbolTable);
+        parentSymbolTable.Enter(returnType, identifier, (ArrayList<FormalParameterNode>) formalParams.GetChildren(), functionDefinitionNode.GetStatementListNode(), bodySymbolTable, identifierNode.GetLeft(), identifierNode.GetRight());
+        _symbolTable.Enter(returnType, identifier, (ArrayList<FormalParameterNode>) formalParams.GetChildren(), functionDefinitionNode.GetStatementListNode(), bodySymbolTable, identifierNode.GetLeft(), identifierNode.GetRight());
 
         var oldFunctionReturnType = _functionReturnType;
         var oldSymbolTable = _symbolTable;