mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-18 14:50:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

check if var/function is already defined in scope.

Browse Source
This commit is contained in:
dfsek
2020-12-22 02:20:46 -07:00
parent 0ecd275c56
commit 2ab4ed871c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/dfsek/terra/api/structures/parser/Parser.java
+8 -4
View File
@@ -255,9 +255,6 @@ public class Parser {
if(tokens.isEmpty()) break; if(tokens.isEmpty()) break;
ParserUtil.checkType(tokens.remove(0), Token.Type.STATEMENT_END, Token.Type.BLOCK_END); ParserUtil.checkType(tokens.remove(0), Token.Type.STATEMENT_END, Token.Type.BLOCK_END);
break; break;
case BLOCK_END:
tokens.remove(0); // Remove block end.
break main;
case NUMBER_VARIABLE: case NUMBER_VARIABLE:
case BOOLEAN_VARIABLE: case BOOLEAN_VARIABLE:
case STRING_VARIABLE: case STRING_VARIABLE:
@@ -269,11 +266,18 @@ public class Parser {
else temp = parseVariableDeclaration(tokens, Returnable.ReturnType.BOOLEAN); else temp = parseVariableDeclaration(tokens, Returnable.ReturnType.BOOLEAN);
Token name = tokens.get(1); Token name = tokens.get(1);
ParserUtil.checkType(name, Token.Type.IDENTIFIER); ParserUtil.checkType(name, Token.Type.IDENTIFIER); // Name must be an identifier.
if(functions.containsKey(name.getContent()) || parsedVariables.containsKey(name.getContent()))
throw new ParseException(name.getContent() + " is already defined in this scope: " + name.getPosition());
parsedVariables.put(name.getContent(), temp); parsedVariables.put(name.getContent(), temp);
parsedItems.add(parseAssignment(temp, tokens, parsedVariables)); parsedItems.add(parseAssignment(temp, tokens, parsedVariables));
ParserUtil.checkType(tokens.remove(0), Token.Type.STATEMENT_END); ParserUtil.checkType(tokens.remove(0), Token.Type.STATEMENT_END);
break;
case BLOCK_END:
tokens.remove(0); // Remove block end.
break main;
} }
} }
return new Block(parsedItems, first.getPosition()); return new Block(parsedItems, first.getPosition());