Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: proper generated struct name for state change #268

Merged
merged 2 commits into from Sep 24, 2022
Merged

fix: proper generated struct name for state change #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca0318c
fix: proper generated struct name for state change
klondikedragon Sep 24, 2022
538590b
avoid conflicts in generated lexer func names
klondikedragon Sep 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions cmd/participle/gen_lexer_cmd.go
View file
Open in desktop
Expand Up @@ -163,14 +163,14 @@ func (l *lexer{{.Name}}Impl) Next() (lexer.Token, error) {
{{- range $i, $rule := $state.Rules}}
{{- if $i}} else {{end -}}
{{- if .Pattern -}}
if match := match{{.Name}}(l.s, l.p); match[1] != 0 {
if match := match{{$.Name}}{{.Name}}(l.s, l.p); match[1] != 0 {
sym = {{index $.Def.Symbols .Name}}
groups = match[:]
{{- else if .|IsReturn -}}
if true {
{{- end}}
{{- if .|IsPush}}
l.states = append(l.states, lexer{{.Name}}State{name: "{{.|IsPush}}"{{if HaveBackrefs $.Def $state.Name}}, groups: l.sgroups(groups){{end}}})
l.states = append(l.states, lexer{{$.Name}}State{name: "{{.|IsPush}}"{{if HaveBackrefs $.Def $state.Name}}, groups: l.sgroups(groups){{end}}})
{{- else if (or (.|IsPop) (.|IsReturn))}}
l.states = l.states[:len(l.states)-1]
{{- if .|IsReturn}}
Expand Down Expand Up @@ -234,7 +234,7 @@ func generateLexer(w io.Writer, pkg string, def *lexer.StatefulDefinition, name
}
seen[rule.Name] = true
fmt.Fprintf(w, "\n")
err := generateRegexMatch(w, rule.Name, rule.Pattern)
err := generateRegexMatch(w, name, rule.Name, rule.Pattern)
if err != nil {
return err
}
Expand Down Expand Up @@ -262,7 +262,7 @@ func orderRules(rules lexer.Rules) []orderedRule {
return orderedRules
}

func generateRegexMatch(w io.Writer, name, pattern string) error {
func generateRegexMatch(w io.Writer, lexerName, name, pattern string) error {
re, err := syntax.Parse(pattern, syntax.Perl)
if err != nil {
return err
Expand All @@ -287,7 +287,7 @@ func generateRegexMatch(w io.Writer, name, pattern string) error {
}
re = re.Simplify()
fmt.Fprintf(w, "// %s\n", re)
fmt.Fprintf(w, "func match%s(s string, p int) (groups [%d]int) {\n", name, 2*re.MaxCap()+2)
fmt.Fprintf(w, "func match%s%s(s string, p int) (groups [%d]int) {\n", lexerName, name, 2*re.MaxCap()+2)
flattened := flatten(re)

// Fast-path a single literal.
Expand Down
28 changes: 14 additions & 14 deletions lexer/internal/basiclexer.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.