From 291505b7573dac7e608d359a746127f16ba8c04f Mon Sep 17 00:00:00 2001 From: Bozhidar Date: Sun, 18 Aug 2024 17:48:38 +0300 Subject: [PATCH] update --- parser/parser.go | 6 ++++-- tests/all-syntax-variations.davi | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/parser/parser.go b/parser/parser.go index 5bb920d..96454db 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -68,7 +68,7 @@ func (p *parser) statements(end Token) Block { return statements } -// statement = if | while | for | return | func | assign | expression +// statement = if | while | for | return | function | assign | expression // assign = NAME ASSIGN expression | // // call subscript ASSIGN expression | @@ -378,6 +378,8 @@ func (p *parser) primary() Expression { pos := p.pos p.next() // TODO + //print("->") + //print(p.val) //p.expect(SEMI) return &Literal{pos, val} case TRUE: @@ -412,7 +414,7 @@ func (p *parser) primary() Expression { formatter := prettyjson.NewFormatter() output, _ := formatter.Marshal(p.val) fmt.Println(string(output)) - p.error("expected expression, not %s val %s", p.tok, p.val) + p.error("expected expression, ___%s___ ", p.tok) return nil } } diff --git a/tests/all-syntax-variations.davi b/tests/all-syntax-variations.davi index 74a0285..54d7484 100644 --- a/tests/all-syntax-variations.davi +++ b/tests/all-syntax-variations.davi @@ -2,6 +2,9 @@ // This is a comment +$test = "Test" + + echo("Time is:"); echo(time()); @@ -23,7 +26,7 @@ echo $calculationHandler(); echo time(); -// Foreach loop +// For loop $list = ["Bozhidar", "Veselinov", "Slaveykov", "Asenov"]; sort($list); echo($list);