WIP

goby-lang · Jun 17, 2018 · f54f051 · f54f051
1 parent 122e25b
commit f54f051
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/compiler/bytecode/statement_generation.go b/compiler/bytecode/statement_generation.go
@@ -35,6 +35,10 @@ func (g *Generator) compileStatement(is *InstructionSet, statement ast.Statement
 	scope.line++
 	switch stmt := statement.(type) {
 	case *ast.ExpressionStatement:
+		if stmt.Expression == nil {
+			return
+		}
+
 		if !g.REPL && stmt.Expression.IsStmt() {
 			g.compileExpression(is, stmt.Expression, scope, table)
 			is.define(Pop, statement.Line())

diff --git a/compiler/parser/expression_parsing.go b/compiler/parser/expression_parsing.go
@@ -163,6 +163,10 @@ func (p *Parser) parseExpression(precedence int) ast.Expression {
 
 	leftExp := parseFn()
 
+	if leftExp == nil {
+		return nil
+	}
+
 	/*
 		Precedence example:
 
@@ -194,10 +198,6 @@ func (p *Parser) parseExpression(precedence int) ast.Expression {
 		leftExp = infixFn(leftExp)
 	}
 
-	if p.peekTokenIs(token.Semicolon) {
-		p.nextToken()
-	}
-
 	return leftExp
 }
 

diff --git a/compiler/parser/parser.go b/compiler/parser/parser.go
@@ -118,7 +118,7 @@ func (p *Parser) ParseProgram() (program *ast.Program, err *errors.Error) {
 		if recover() != nil {
 			err = p.error
 			if err == nil {
-				msg := fmt.Sprintf("Some panic happen token: %s. Line: %d", p.curToken.Literal, p.curToken.Line)
+				msg := fmt.Sprintf("Some panic happen token: %s Line: %d", p.curToken.Literal, p.curToken.Line)
 				err = errors.InitError(msg, errors.SyntaxError)
 			}
 		}

diff --git a/vm/evaluation_test.go b/vm/evaluation_test.go
@@ -2865,7 +2865,7 @@ func TestMultiplePrefixMethodVariableWithSigns(t *testing.T) {
 			-1,
 		},
 		{
-			"a=1;(+a+1)", // TODO: needs fix: Some panic happen token: (. Line: 0
+			"a=1;+a+1", // TODO: needs fix: Some panic happen token: (. Line: 0
 			2,
 		},
 	}