Refactor instruction parsing.

aleury · Jan 20, 2024 · 38319aa · 38319aa
1 parent 1d33e0a
commit 38319aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/ast/ast.go b/ast/ast.go
@@ -99,10 +99,3 @@ type StringLiteral struct {
 
 func (sl StringLiteral) expressionNode()      {}
 func (sl StringLiteral) TokenLiteral() string { return sl.Token.Literal }
-
-type Any struct {
-	Token token.Token
-}
-
-func (e Any) expressionNode()      {}
-func (e Any) TokenLiteral() string { return e.Token.Literal }
diff --git a/parser/parser.go b/parser/parser.go
@@ -148,7 +148,7 @@ func (p *Parser) expectOneOf(tokTypes ...token.TokenType) ast.Expression {
 	case token.IDENT:
 		return ast.Identifier{Token: p.curToken}
 	default:
-		return ast.Any{Token: p.curToken}
+		return nil
 	}
 }
 
@@ -157,15 +157,13 @@ func (p *Parser) parseInstructionStatement() ast.Statement {
 
 	if stmt.TokenLiteral() == "MOVE" {
 		stmt.Operand1 = p.expectOneOf(token.REGISTER, token.IDENT)
-
 		p.expectOneOf(token.ARROW)
-
 		stmt.Operand2 = p.expectOneOf(token.REGISTER, token.IDENT)
-	} else {
-		if exprParser, ok := p.exprParsers[p.peekToken.Type]; ok {
-			p.nextToken()
-			stmt.Operand1 = exprParser()
-		}
+	}
+
+	if exprParser, ok := p.exprParsers[p.peekToken.Type]; ok {
+		p.nextToken()
+		stmt.Operand1 = exprParser()
 	}
 
 	return stmt