go/ferret
1
0
Fork 0
mirror of https://github.com/MontFerret/ferret.git synced 2025-08-15 20:02:56 +02:00
Code Issues Releases Activity

Tweaked parser for formatter (#723)

Browse Source
This commit is contained in:
Tim Voronov
2022-01-12 16:52:07 -05:00
committed by GitHub
parent b0377c1bcc
commit 64f086a4a6
9 changed files with 572 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -1,4 +1,5 @@
.PHONY: build install compile test e2e doc fmt lint vet release
export CGO_ENABLED=0
DIR_BIN = ./bin
DIR_PKG = ./pkg
@@ -12,14 +13,14 @@ install:
go get
compile:
go build -race -v -o ${DIR_BIN}/ferret \
go build -v -o ${DIR_BIN}/ferret \
${DIR_E2E}/cli.go
test:
go test -race ${DIR_PKG}/...
go test ${DIR_PKG}/...
cover:
go test -race -coverprofile=coverage.txt -covermode=atomic ${DIR_PKG}/... && \
go test -coverprofile=coverage.txt -covermode=atomic ${DIR_PKG}/... && \
curl -s https://codecov.io/bash | bash
e2e:

2
pkg/compiler/visitor.go
View File

@@ -1108,7 +1108,7 @@ func (v *visitor) visitPropertyName(c fql.IPropertyNameContext, scope *scope) (c
return literals.NewStringLiteral(rw.GetText()), nil
}
if rw := ctx.UnsafReservedWord(); rw != nil {
if rw := ctx.UnsafeReservedWord(); rw != nil {
return literals.NewStringLiteral(rw.GetText()), nil
}

9
pkg/parser/antlr/FqlParser.g4
View File

@@ -94,7 +94,7 @@ limitClause
;
limitClauseValue
: IntegerLiteral
: integerLiteral
| param
| variable
| functionCallExpression
@@ -171,6 +171,7 @@ timeoutClause
param
: Param Identifier
| Param safeReservedWord
;
variable
@@ -232,7 +233,7 @@ propertyName
| stringLiteral
| param
| safeReservedWord
| unsafReservedWord
| unsafeReservedWord
;
namespaceIdentifier
@@ -266,7 +267,7 @@ functionCall
functionName
: Identifier
| safeReservedWord
| unsafReservedWord
| unsafeReservedWord
;
argumentList
@@ -300,7 +301,7 @@ safeReservedWord
| Current
;
unsafReservedWord
unsafeReservedWord
: Return
| None
| Null

4
pkg/parser/fql/FqlParser.interp
View File

File diff suppressed because one or more lines are too long

1064
pkg/parser/fql/fql_parser.go
View File

File diff suppressed because it is too large Load Diff

8
pkg/parser/fql/fqlparser_base_listener.go
View File

@@ -350,11 +350,11 @@ func (s *BaseFqlParserListener) EnterSafeReservedWord(ctx *SafeReservedWordConte
// ExitSafeReservedWord is called when production safeReservedWord is exited.
func (s *BaseFqlParserListener) ExitSafeReservedWord(ctx *SafeReservedWordContext) {}
// EnterUnsafReservedWord is called when production unsafReservedWord is entered.
func (s *BaseFqlParserListener) EnterUnsafReservedWord(ctx *UnsafReservedWordContext) {}
// EnterUnsafeReservedWord is called when production unsafeReservedWord is entered.
func (s *BaseFqlParserListener) EnterUnsafeReservedWord(ctx *UnsafeReservedWordContext) {}
// ExitUnsafReservedWord is called when production unsafReservedWord is exited.
func (s *BaseFqlParserListener) ExitUnsafReservedWord(ctx *UnsafReservedWordContext) {}
// ExitUnsafeReservedWord is called when production unsafeReservedWord is exited.
func (s *BaseFqlParserListener) ExitUnsafeReservedWord(ctx *UnsafeReservedWordContext) {}
// EnterRangeOperator is called when production rangeOperator is entered.
func (s *BaseFqlParserListener) EnterRangeOperator(ctx *RangeOperatorContext) {}

2
pkg/parser/fql/fqlparser_base_visitor.go
View File

@@ -227,7 +227,7 @@ func (v *BaseFqlParserVisitor) VisitSafeReservedWord(ctx *SafeReservedWordContex
return v.VisitChildren(ctx)
}
func (v *BaseFqlParserVisitor) VisitUnsafReservedWord(ctx *UnsafReservedWordContext) interface{} {
func (v *BaseFqlParserVisitor) VisitUnsafeReservedWord(ctx *UnsafeReservedWordContext) interface{} {
return v.VisitChildren(ctx)
}

8
pkg/parser/fql/fqlparser_listener.go
View File

@@ -172,8 +172,8 @@ type FqlParserListener interface {
// EnterSafeReservedWord is called when entering the safeReservedWord production.
EnterSafeReservedWord(c *SafeReservedWordContext)
// EnterUnsafReservedWord is called when entering the unsafReservedWord production.
EnterUnsafReservedWord(c *UnsafReservedWordContext)
// EnterUnsafeReservedWord is called when entering the unsafeReservedWord production.
EnterUnsafeReservedWord(c *UnsafeReservedWordContext)
// EnterRangeOperator is called when entering the rangeOperator production.
EnterRangeOperator(c *RangeOperatorContext)
@@ -388,8 +388,8 @@ type FqlParserListener interface {
// ExitSafeReservedWord is called when exiting the safeReservedWord production.
ExitSafeReservedWord(c *SafeReservedWordContext)
// ExitUnsafReservedWord is called when exiting the unsafReservedWord production.
ExitUnsafReservedWord(c *UnsafReservedWordContext)
// ExitUnsafeReservedWord is called when exiting the unsafeReservedWord production.
ExitUnsafeReservedWord(c *UnsafeReservedWordContext)
// ExitRangeOperator is called when exiting the rangeOperator production.
ExitRangeOperator(c *RangeOperatorContext)

4
pkg/parser/fql/fqlparser_visitor.go
View File

@@ -172,8 +172,8 @@ type FqlParserVisitor interface {
// Visit a parse tree produced by FqlParser#safeReservedWord.
VisitSafeReservedWord(ctx *SafeReservedWordContext) interface{}
// Visit a parse tree produced by FqlParser#unsafReservedWord.
VisitUnsafReservedWord(ctx *UnsafReservedWordContext) interface{}
// Visit a parse tree produced by FqlParser#unsafeReservedWord.
VisitUnsafeReservedWord(ctx *UnsafeReservedWordContext) interface{}
// Visit a parse tree produced by FqlParser#rangeOperator.
VisitRangeOperator(ctx *RangeOperatorContext) interface{}