inetmock/inetmock
1
0
Fork 0
Code Issues 10 Pull requests 13 Projects 1 Releases Packages 1 Wiki Activity Actions

Fix grammar for floats and arrows

Browse source
This commit is contained in:
Peter 2021-04-29 19:56:12 +02:00
parent 7c7ae50c16
commit c366e7ba50
Signed by: prskr
GPG key ID: C1DB5D2E8DB512F9
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/endpoint/handler/http/mock/handler_test.go
View file

@ -134,7 +134,7 @@ func Test_httpHandler_Start(t *testing.T) {
args: args{ args: args{
opts: map[string]interface{}{ opts: map[string]interface{}{
"rules": []string{ "rules": []string{
`> File("default.html")`, `= > File("default.html")`,
}, },
}, },
}, },

19
internal/rules/grammar.go
View file

@ -5,6 +5,8 @@ import (
"fmt" "fmt"
"github.com/alecthomas/participle/v2" "github.com/alecthomas/participle/v2"
"github.com/alecthomas/participle/v2/lexer"
"github.com/alecthomas/participle/v2/lexer/stateful"
) )
var ( var (
@ -13,8 +15,19 @@ var (
) )
func init() { func init() {
sqlLexer := lexer.Must(stateful.NewSimple([]stateful.Rule{
{Name: `Ident`, Pattern: `[a-zA-Z_][a-zA-Z0-9_]*`, Action: nil},
{Name: `Float`, Pattern: `\d+.\d+`, Action: nil},
{Name: `Int`, Pattern: `[-]?\d+`, Action: nil},
{Name: `String`, Pattern: `'[^']*'|"[^"]*"`, Action: nil},
{Name: `Arrows`, Pattern: `(->|=>)`, Action: nil},
{Name: "whitespace", Pattern: `\s+`, Action: nil},
{Name: "Punct", Pattern: `[-[!@#$%^&*()+_={}\|:;\."'<,>?/]|]`, Action: nil},
}))
parser = participle.MustBuild( parser = participle.MustBuild(
new(Routing), new(Routing),
participle.Lexer(sqlLexer),
participle.Unquote("String"), participle.Unquote("String"),
) )
} }
@ -29,11 +42,11 @@ func Parse(rule string) (*Routing, error) {
type Routing struct { type Routing struct {
Filters *Filters `parser:"@@*"` Filters *Filters `parser:"@@*"`
Terminator *Method `parser:"'=''>' @@"` Terminator *Method `parser:"'=>' @@"`
} }
type Filters struct { type Filters struct {
Chain []Method `parser:"@@ ('-''>' @@)*"` Chain []Method `parser:"@@ ('->' @@)*"`
} }
type Method struct { type Method struct {
@ -42,7 +55,7 @@ type Method struct {
} }
type Param struct { type Param struct {
String *string `parser:"@String|RawString"` String *string `parser:"@String"`
Int *int `parser:"| @Int"` Int *int `parser:"| @Int"`
Float *float64 `parser:"| @Float"` Float *float64 `parser:"| @Float"`
} }