Merge pull request PaesslerAG#67 from lafriks-fork/fix/compact_operat…

…ors_test

Fix to accept operator and extension without space between

gval_noparameter_test.go

@@ -134,6 +134,11 @@ func TestNoParameter(t *testing.T) {
  expression: "2 > 1",
  want: true,
  },
+ {
+ name: "Equal test minus numbers and no spaces",
+ expression: "-1==-1",
+ want: true,
+ },
  {
 
  name: "Compound boolean",

gval_parsingFailure_test.go

@@ -16,18 +16,18 @@ func TestParsingFailure(t *testing.T) {
  {
  name: "Invalid equality comparator",
  expression: "1 === 1",
- wantErr: unknownOp("==="),
+ wantErr: unexpected(`"="`, "extension"),
  },
  {
  name: "Too many characters for logical operator",
  expression: "true &&& false",
- wantErr: unknownOp("&&&"),
+ wantErr: unexpected(`"&"`, "extension"),
  },
  {
 
  name: "Too many characters for logical operator",
  expression: "true ||| false",
- wantErr: unknownOp("|||"),
+ wantErr: unexpected(`"|"`, "extension"),
  },
  {
 

operator.go

@@ -5,6 +5,7 @@ import (
  "fmt"
  "reflect"
  "strconv"
+ "strings"
 )
 
 type stage struct {
@@ -53,6 +54,15 @@ func (l Language) isSymbolOperation(r rune) bool {
  return in
 }
 
+func (l Language) isOperatorPrefix(op string) bool {
+ for k := range l.operators {
+ if strings.HasPrefix(k, op) {
+ return true
+ }
+ }
+ return false
+}
+
 func (op *infix) initiate(name string) {
  f := func(a, b interface{}) (interface{}, error) {
  return nil, fmt.Errorf("invalid operation (%T) %s (%T)", a, name, b)

parse.go

@@ -110,7 +110,7 @@ func (p *Parser) parseOperator(c context.Context, stack *stageStack, eval Evalua
  mustOp := false
  if p.isSymbolOperation(scan) {
  scan = p.Peek()
- for p.isSymbolOperation(scan) {
+ for p.isSymbolOperation(scan) && p.isOperatorPrefix(op+string(scan)) {
  mustOp = true
  op += string(scan)
  p.Next()