Allowed empty if/else blocks

dbaumgarten · Dec 23, 2020 · 9069d70 · 9069d70
1 parent 77914e9
commit 9069d70
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 36 deletions.
diff --git a/pkg/nolol/parser.go b/pkg/nolol/parser.go
@@ -511,41 +511,31 @@ func (p *Parser) ParseIf() ast.Statement {
 
 	ret.Condition = p.This.ParseExpression()
 	if ret.Condition == nil {
-		p.ErrorExpectedExpression("as inline-if-condition")
+		p.ErrorExpectedExpression("as if-condition")
 	}
 
 	p.Expect(ast.TypeKeyword, "then")
-
-	stmt := p.This.ParseStatement()
-	if stmt == nil {
-		p.ErrorExpectedStatement("inside if-block")
-	}
 	ret.IfBlock = make([]ast.Statement, 0, 1)
-	ret.IfBlock = append(ret.IfBlock, stmt)
 
 	for {
-		stmt2 := p.This.ParseStatement()
-		if stmt2 == nil {
+		stmt := p.This.ParseStatement()
+		if stmt == nil {
 			break
 		}
-		ret.IfBlock = append(ret.IfBlock, stmt2)
+		ret.IfBlock = append(ret.IfBlock, stmt)
 	}
 
 	if p.IsCurrent(ast.TypeKeyword, "else") {
 		p.Advance()
-		stmt := p.This.ParseStatement()
-		if stmt == nil {
-			p.ErrorExpectedStatement("inside else-block")
-		}
+
 		ret.ElseBlock = make([]ast.Statement, 0, 1)
-		ret.ElseBlock = append(ret.ElseBlock, stmt)
 
 		for {
-			stmt2 := p.This.ParseStatement()
-			if stmt2 == nil {
+			stmt := p.This.ParseStatement()
+			if stmt == nil {
 				break
 			}
-			ret.ElseBlock = append(ret.IfBlock, stmt2)
+			ret.ElseBlock = append(ret.ElseBlock, stmt)
 		}
 	}
 

diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go
@@ -403,37 +403,27 @@ func (p *Parser) ParseIf() ast.Statement {
 	}
 
 	p.Expect(ast.TypeKeyword, "then")
-
-	stmt := p.This.ParseStatement()
-	if stmt == nil {
-		p.ErrorExpectedStatement("inside if-block")
-	}
 	ret.IfBlock = make([]ast.Statement, 0, 1)
-	ret.IfBlock = append(ret.IfBlock, stmt)
 
 	for {
-		stmt2 := p.This.ParseStatement()
-		if stmt2 == nil {
+		stmt := p.This.ParseStatement()
+		if stmt == nil {
 			break
 		}
-		ret.IfBlock = append(ret.IfBlock, stmt2)
+		ret.IfBlock = append(ret.IfBlock, stmt)
 	}
 
 	if p.IsCurrent(ast.TypeKeyword, "else") {
 		p.Advance()
-		stmt := p.This.ParseStatement()
-		if stmt == nil {
-			p.ErrorExpectedStatement("inside else-block")
-		}
+
 		ret.ElseBlock = make([]ast.Statement, 0, 1)
-		ret.ElseBlock = append(ret.ElseBlock, stmt)
 
 		for {
-			stmt2 := p.This.ParseStatement()
-			if stmt2 == nil {
+			stmt := p.This.ParseStatement()
+			if stmt == nil {
 				break
 			}
-			ret.ElseBlock = append(ret.IfBlock, stmt2)
+			ret.ElseBlock = append(ret.ElseBlock, stmt)
 		}
 	}
 

diff --git a/vscode-yolol/src/test/diagnostics.test.ts b/vscode-yolol/src/test/diagnostics.test.ts
@@ -8,7 +8,7 @@ describe('Should get diagnostics', () => {
     it('Diagnoses errors in yolol', async () => {
       const docUri = getDocUri('has_errors.yolol')
       await testDiagnostics(docUri, [
-        { message: 'Expected statement inside if-block. Found Token: \'then\'(Keyword)', range: toRange(1, 27, 1, 27), severity: vscode.DiagnosticSeverity.Error, source: 'parser' },
+        { message: 'Expected token \'end\'(Keyword). Found Token: \'then\'(Keyword)', range: toRange(1, 27, 1, 27), severity: vscode.DiagnosticSeverity.Error, source: 'parser' },
         { message: 'Expected an assignment-operator. Found Token: \':number\'(ID)', range: toRange(4, 4, 4, 4), severity: vscode.DiagnosticSeverity.Error, source: 'parser' }
       ])
     })