Skip to content

refactored some code in SimpleParser #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactored some code in SimpleParser #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions lab/craft/SimpleParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,11 @@ private SimpleASTNode intDeclare(TokenReader tokens) throws Exception {
throw new Exception("variable name expected");
}

if (node != null) {
token = tokens.peek();
if (token != null && token.getType() == TokenType.SemiColon) {
tokens.read();
} else {
throw new Exception("invalid statement, expecting semicolon");
}
token = tokens.peek();
if (token != null && token.getType() == TokenType.SemiColon) {
tokens.read();
} else {
throw new Exception("invalid statement, expecting semicolon");
}
}
return node;
Expand Down Expand Up @@ -237,7 +235,9 @@ private SimpleASTNode additive(TokenReader tokens) throws Exception {
private SimpleASTNode multiplicative(TokenReader tokens) throws Exception {
SimpleASTNode child1 = primary(tokens);
SimpleASTNode node = child1;

if node == null {
return node
}
while (true) {
Token token = tokens.peek();
if (token != null && (token.getType() == TokenType.Star || token.getType() == TokenType.Slash)) {
Expand All @@ -248,7 +248,7 @@ private SimpleASTNode multiplicative(TokenReader tokens) throws Exception {
node.addChild(child1);
node.addChild(child2);
child1 = node;
}else{
} else {
throw new Exception("invalid multiplicative expression, expecting the right part.");
}
} else {
Expand Down