summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Vertes <mvertes@free.fr>2026-01-06 19:17:01 +0100
committerMarc Vertes <mvertes@free.fr>2026-01-06 19:17:01 +0100
commit9b84e1867445466645502b9323f6887c860ac076 (patch)
treecc749d6829d514fe764d5193fad472ce5457b4c7
parentbffc031ea83c7176aac3d3828de0060c6630140c (diff)
parent3cf8207c708f23d1bd8400de5483b6b8eadb01ca (diff)
Merge branch 'main' of git.vertes.org:git/parscan
-rw-r--r--interp/interpreter_test.go2
-rw-r--r--parser/expr.go2
2 files changed, 3 insertions, 1 deletions
diff --git a/interp/interpreter_test.go b/interp/interpreter_test.go
index 28a80d4..e1e7107 100644
--- a/interp/interpreter_test.go
+++ b/interp/interpreter_test.go
@@ -88,6 +88,8 @@ func TestLogical(t *testing.T) {
{src: "2 > 3 || 2 == 1+1 && 3>4 || 1<2", res: "true"}, // #07
{src: "a := 1+1 < 3 && 4 == 2+2; a", res: "true"}, // #08
{src: "a := 1+1 < 3 || 3 == 2+2; a", res: "true"}, // #09
+ {src: "a := 1+1 < 3 && 4 == 2+2; a", res: "true"}, // #10
+ {src: "a := 1+1 < 3 || 3 == 2+2; a", res: "true"}, // #11
})
}
diff --git a/parser/expr.go b/parser/expr.go
index 5267aa1..3327ec5 100644
--- a/parser/expr.go
+++ b/parser/expr.go
@@ -12,7 +12,7 @@ import (
// parseExpr transform an infix expression into a postfix notation.
func (p *Parser) parseExpr(in Tokens, typeStr string) (out Tokens, err error) {
- log.Println("parseExpr2 in:", in)
+ log.Println("parseExpr in:", in)
var ops Tokens
popop := func() (t scanner.Token) {