danog/liquid
1
0
Fork 0
mirror of https://github.com/danog/liquid.git synced 2024-11-27 04:35:14 +01:00
Code Issues Projects Releases Wiki Activity

Yacc, ragel source match package moves

Browse Source
This commit is contained in:
Oliver Steele 2017-07-07 08:09:16 -04:00
parent d435cf5211
commit a7a1ee5416
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
expression/expressions.y
View File

@ -1,8 +1,8 @@
%{
package expressions
package expression
import (
"fmt"
"github.com/osteele/liquid/generics"
"github.com/osteele/liquid/evaluator"
)
func init() {
@ -105,42 +105,42 @@ rel:
fa, fb := $1, $3
$$ = func(ctx Context) interface{} {
a, b := fa(ctx), fb(ctx)
return generics.Equal(a, b)
return evaluator.Equal(a, b)
}
}
| expr NEQ expr {
fa, fb := $1, $3
$$ = func(ctx Context) interface{} {
a, b := fa(ctx), fb(ctx)
return !generics.Equal(a, b)
return !evaluator.Equal(a, b)
}
}
| expr '>' expr {
fa, fb := $1, $3
$$ = func(ctx Context) interface{} {
a, b := fa(ctx), fb(ctx)
return generics.Less(b, a)
return evaluator.Less(b, a)
}
}
| expr '<' expr {
fa, fb := $1, $3
$$ = func(ctx Context) interface{} {
a, b := fa(ctx), fb(ctx)
return generics.Less(a, b)
return evaluator.Less(a, b)
}
}
| expr GE expr {
fa, fb := $1, $3
$$ = func(ctx Context) interface{} {
a, b := fa(ctx), fb(ctx)
return generics.Less(b, a) || generics.Equal(a, b)
return evaluator.Less(b, a) || evaluator.Equal(a, b)
}
}
| expr LE expr {
fa, fb := $1, $3
$$ = func(ctx Context) interface{} {
a, b := fa(ctx), fb(ctx)
return generics.Less(a, b) || generics.Equal(a, b)
return evaluator.Less(a, b) || evaluator.Equal(a, b)
}
}
| expr CONTAINS expr { $$ = makeContainsExpr($1, $3) }
@ -151,13 +151,13 @@ cond:
| cond AND rel {
fa, fb := $1, $3
$$ = func(ctx Context) interface{} {
return generics.IsTrue(fa(ctx)) && generics.IsTrue(fb(ctx))
return evaluator.IsTrue(fa(ctx)) && evaluator.IsTrue(fb(ctx))
}
}
| cond OR rel {
fa, fb := $1, $3
$$ = func(ctx Context) interface{} {
return generics.IsTrue(fa(ctx)) || generics.IsTrue(fb(ctx))
return evaluator.IsTrue(fa(ctx)) || evaluator.IsTrue(fb(ctx))
}
}
;

2
expression/scanner.rl
View File

@ -1,4 +1,4 @@
package expressions
package expression
import "strconv"