Tweaked parser for formatter

Makefile

@@ -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:

pkg/compiler/visitor.go

@@ -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
 	}
 

pkg/parser/antlr/FqlParser.g4

@@ -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