Merge pull request #7 from ermites-io/fix_antlr4

Update antlr4
ermites-io · Oct 13, 2024 · 3c7e387 · 3c7e387
2 parents 9e6b548 + c206939
commit 3c7e387
Show file tree

Hide file tree

Showing 10 changed files with 750 additions and 412 deletions.
diff --git a/config/.gitignore b/config/.gitignore
@@ -0,0 +1,3 @@
+pksc.interp
+pksc.tokens
+pkscLexer.*
diff --git a/config/config.go b/config/config.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/antlr/antlr4/runtime/Go/antlr"
+	"github.com/antlr4-go/antlr/v4"
 )
 
 // [name]:Options

diff --git a/config/parser.go b/config/parser.go
@@ -5,9 +5,9 @@ package config
 
 import (
 	"fmt"
-	"github.com/antlr/antlr4/runtime/Go/antlr"
 
 	"ermites.io/pkisauce/policy"
+	"github.com/antlr4-go/antlr/v4"
 )
 
 type Parser struct {
@@ -22,7 +22,7 @@ func (pr *Parser) Config() Config {
 	return pr.config
 }
 
-//func NewParser(key []byte) *Parser {
+// func NewParser(key []byte) *Parser {
 func NewParser() *Parser {
 	// random key for the hmac'ing of rules.
 	return &Parser{
@@ -106,7 +106,7 @@ func parseNameBlock(nbr IName_blockContext) (names []string, err error) {
 	return
 }
 
-//func parsePassBlock(pbr IPass_blockContext) (rules []*Rule, err error) {
+// func parsePassBlock(pbr IPass_blockContext) (rules []*Rule, err error) {
 func (pr *Parser) parsePassBlock(pbr IPass_blockContext) (p *policy.Policy, debug bool, err error) {
 	//var rules []*Rule
 

diff --git a/config/parser_handlers.go b/config/parser_handlers.go
@@ -6,7 +6,7 @@ package config
 import (
 	"fmt"
 
-	"github.com/antlr/antlr4/runtime/Go/antlr"
+	"github.com/antlr4-go/antlr/v4"
 )
 
 func (pr *Parser) VisitErrorNode(node antlr.ErrorNode) {

diff --git a/config/pksc_base_listener.go b/config/pksc_base_listener.go
diff --git a/config/pksc_lexer.go b/config/pksc_lexer.go
diff --git a/config/pksc_listener.go b/config/pksc_listener.go