Adds helper methods to Lua for registering

Author: ornj

analyze_test.go

@@ -2110,7 +2110,7 @@ func TestAnalyze_lua(t *testing.T) {
 			err := analyze("nginx.conf", tc.stmt, ";", tc.ctx, &ParseOptions{
 				MatchFuncs: []MatchFunc{MatchLua},
 				LexOptions: LexOptions{
-					Lexers: []RegisterLexer{LexWithLexer(lua, lua.DirectiveNames()...)},
+					Lexers: []RegisterLexer{lua.RegisterLexer()},
 				},
 			})
 

build_test.go

@@ -260,7 +260,7 @@ var buildFixtures = []buildFixture{
 	},
 	{
 		name:    "lua block",
-		options: BuildOptions{Builders: []RegisterBuilder{BuildWithBuilder(lua, lua.DirectiveNames()...)}},
+		options: BuildOptions{Builders: []RegisterBuilder{lua.RegisterBuilder()}},
 		parsed: Directives{
 			{
 				Directive: "content_by_lua_block",
@@ -273,7 +273,7 @@ var buildFixtures = []buildFixture{
 	},
 	{
 		name:    "set_by_lua_block",
-		options: BuildOptions{Builders: []RegisterBuilder{BuildWithBuilder(lua, lua.DirectiveNames()...)}},
+		options: BuildOptions{Builders: []RegisterBuilder{lua.RegisterBuilder()}},
 		parsed: Directives{
 			{
 				Directive: "set_by_lua_block",

lex_test.go

@@ -432,7 +432,7 @@ func TestLex(t *testing.T) {
 
 			lua := &Lua{}
 			options := LexOptions{
-				Lexers: []RegisterLexer{LexWithLexer(lua, lua.DirectiveNames()...)},
+				Lexers: []RegisterLexer{lua.RegisterLexer()},
 			}
 			i := 0
 

lua.go

@@ -7,7 +7,7 @@ import (
 
 type Lua struct{}
 
-func (l *Lua) DirectiveNames() []string {
+func (l *Lua) directiveNames() []string {
 	return []string{
 		"init_by_lua_block",
 		"init_worker_by_lua_block",
@@ -28,6 +28,10 @@ func (l *Lua) DirectiveNames() []string {
 	}
 }
 
+func (l *Lua) RegisterLexer() RegisterLexer {
+	return LexWithLexer(l, l.directiveNames()...)
+}
+
 //nolint:funlen,gocognit,gocyclo,nosec
 func (l *Lua) Lex(s *SubScanner, matchedToken string) <-chan NgxToken {
 	tokenCh := make(chan NgxToken)
@@ -146,8 +150,8 @@ func (l *Lua) Lex(s *SubScanner, matchedToken string) <-chan NgxToken {
 	return tokenCh
 }
 
-func (l *Lua) RegisterBuilder() []string {
-	return l.DirectiveNames()
+func (l *Lua) RegisterBuilder() RegisterBuilder {
+	return BuildWithBuilder(l, l.directiveNames()...)
 }
 
 func (l *Lua) Build(stmt *Directive) string {

parse_test.go

@@ -1709,7 +1709,7 @@ var parseFixtures = []parseFixture{
 		ErrorOnUnknownDirectives: true,
 		MatchFuncs:               []MatchFunc{MatchLua},
 		LexOptions: LexOptions{
-			Lexers: []RegisterLexer{LexWithLexer(lua, lua.DirectiveNames()...)},
+			Lexers: []RegisterLexer{lua.RegisterLexer()},
 		},
 	}, Payload{
 		Status: "ok",
@@ -1838,7 +1838,7 @@ var parseFixtures = []parseFixture{
 		ErrorOnUnknownDirectives: true,
 		MatchFuncs:               []MatchFunc{MatchLua},
 		LexOptions: LexOptions{
-			Lexers: []RegisterLexer{LexWithLexer(lua, lua.DirectiveNames()...)},
+			Lexers: []RegisterLexer{lua.RegisterLexer()},
 		},
 	}, Payload{
 		Status: "ok",
@@ -1930,7 +1930,7 @@ var parseFixtures = []parseFixture{
 		ParseComments:            true,
 		MatchFuncs:               []MatchFunc{MatchLua},
 		LexOptions: LexOptions{
-			Lexers: []RegisterLexer{LexWithLexer(lua, lua.DirectiveNames()...)},
+			Lexers: []RegisterLexer{lua.RegisterLexer()},
 		},
 	}, Payload{
 		Status: "ok",