simplify generated output
This commit is contained in:
parent
68ce88cc6f
commit
eb8250c311
@ -89,21 +89,30 @@ func (p *charParser) generate(w io.Writer, done map[string]bool) error {
|
||||
}
|
||||
|
||||
fprintf("var p%d = charParser{", p.id)
|
||||
fprintf("id: %d, not: %t,", p.id, p.not)
|
||||
fprintf("id: %d,", p.id)
|
||||
if p.not {
|
||||
fprintf("not: true,")
|
||||
}
|
||||
|
||||
if len(p.chars) > 0 {
|
||||
fprintf("chars: []rune{")
|
||||
for i := range p.chars {
|
||||
fprintf("%d,", p.chars[i])
|
||||
}
|
||||
|
||||
fprintf("},")
|
||||
}
|
||||
|
||||
if len(p.ranges) > 0 {
|
||||
fprintf("ranges: [][]rune{")
|
||||
for i := range p.ranges {
|
||||
fprintf("{%d, %d},", p.ranges[i][0], p.ranges[i][1])
|
||||
}
|
||||
|
||||
fprintf("}};")
|
||||
fprintf("},")
|
||||
}
|
||||
|
||||
fprintf("};")
|
||||
return err
|
||||
}
|
||||
|
||||
|
@ -157,17 +157,23 @@ func (p *choiceParser) generate(w io.Writer, done map[string]bool) error {
|
||||
|
||||
fprintf("var p%d = choiceParser{", p.id)
|
||||
fprintf("id: %d, commit: %d,", p.id, p.commit)
|
||||
|
||||
if p.commitType()&userDefined != 0 {
|
||||
fprintf("name: \"%s\",", p.name)
|
||||
}
|
||||
|
||||
if len(p.generalizations) > 0 {
|
||||
fprintf("generalizations: []int{")
|
||||
for i := range p.generalizations {
|
||||
fprintf("%d,", p.generalizations[i])
|
||||
}
|
||||
|
||||
fprintf("}};")
|
||||
fprintf("},")
|
||||
}
|
||||
|
||||
fprintf("};")
|
||||
|
||||
if len(p.options) > 0 {
|
||||
for i := range p.options {
|
||||
if err := p.options[i].(generator).generate(w, done); err != nil {
|
||||
return err
|
||||
@ -180,6 +186,8 @@ func (p *choiceParser) generate(w io.Writer, done map[string]bool) error {
|
||||
}
|
||||
|
||||
fprintf("};")
|
||||
}
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
@ -201,12 +209,14 @@ func (b *choiceBuilder) generate(w io.Writer, done map[string]bool) error {
|
||||
|
||||
fprintf("var b%d = choiceBuilder{", b.id)
|
||||
fprintf("id: %d, commit: %d,", b.id, b.commit)
|
||||
|
||||
if b.commit&Alias == 0 {
|
||||
fprintf("name: \"%s\",", b.name)
|
||||
}
|
||||
|
||||
fprintf("};")
|
||||
|
||||
if len(b.options) > 0 {
|
||||
for i := range b.options {
|
||||
if err := b.options[i].(generator).generate(w, done); err != nil {
|
||||
return err
|
||||
@ -219,5 +229,7 @@ func (b *choiceBuilder) generate(w io.Writer, done map[string]bool) error {
|
||||
}
|
||||
|
||||
fprintf("};")
|
||||
}
|
||||
|
||||
return err
|
||||
}
|
||||
|
@ -4,7 +4,7 @@ package treerack
|
||||
// only to the source code generated with treerack.
|
||||
const gendoc = `
|
||||
/*
|
||||
This file was generated by treerack (https://github.com/aryszka/treerack).
|
||||
This file was generated with treerack (https://github.com/aryszka/treerack).
|
||||
|
||||
The contents of this file fall under different licenses.
|
||||
|
||||
|
1176
self/self.go
1176
self/self.go
File diff suppressed because it is too large
Load Diff
@ -296,25 +296,37 @@ func (p *sequenceParser) generate(w io.Writer, done map[string]bool) error {
|
||||
}
|
||||
|
||||
fprintf("var p%d = sequenceParser{", p.id)
|
||||
fprintf("id: %d, commit: %d, allChars: %t,", p.id, p.commit, p.allChars)
|
||||
fprintf("id: %d, commit: %d,", p.id, p.commit)
|
||||
|
||||
if p.commit&userDefined != 0 {
|
||||
fprintf("name: \"%s\",", p.name)
|
||||
}
|
||||
|
||||
if p.allChars {
|
||||
fprintf("allChars: true,")
|
||||
}
|
||||
|
||||
if len(p.ranges) > 0 {
|
||||
fprintf("ranges: [][]int{")
|
||||
for i := range p.ranges {
|
||||
fprintf("{%d, %d},", p.ranges[i][0], p.ranges[i][1])
|
||||
}
|
||||
|
||||
fprintf("},")
|
||||
}
|
||||
|
||||
if len(p.generalizations) > 0 {
|
||||
fprintf("generalizations: []int{")
|
||||
for i := range p.generalizations {
|
||||
fprintf("%d,", p.generalizations[i])
|
||||
}
|
||||
|
||||
fprintf("}};")
|
||||
fprintf("},")
|
||||
}
|
||||
|
||||
fprintf("};")
|
||||
|
||||
if len(p.items) > 0 {
|
||||
for i := range p.items {
|
||||
if err := p.items[i].(generator).generate(w, done); err != nil {
|
||||
return err
|
||||
@ -327,6 +339,8 @@ func (p *sequenceParser) generate(w io.Writer, done map[string]bool) error {
|
||||
}
|
||||
|
||||
fprintf("};")
|
||||
}
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
@ -347,18 +361,28 @@ func (b *sequenceBuilder) generate(w io.Writer, done map[string]bool) error {
|
||||
}
|
||||
|
||||
fprintf("var b%d = sequenceBuilder{", b.id)
|
||||
fprintf("id: %d, commit: %d, allChars: %t,", b.id, b.commit, b.allChars)
|
||||
fprintf("id: %d, commit: %d,", b.id, b.commit)
|
||||
|
||||
if b.commit&Alias == 0 {
|
||||
fprintf("name: \"%s\",", b.name)
|
||||
}
|
||||
|
||||
if b.allChars {
|
||||
fprintf("allChars: true,")
|
||||
}
|
||||
|
||||
if len(b.ranges) > 0 {
|
||||
fprintf("ranges: [][]int{")
|
||||
for i := range b.ranges {
|
||||
fprintf("{%d, %d},", b.ranges[i][0], b.ranges[i][1])
|
||||
}
|
||||
|
||||
fprintf("}};")
|
||||
fprintf("},")
|
||||
}
|
||||
|
||||
fprintf("};")
|
||||
|
||||
if len(b.items) > 0 {
|
||||
for i := range b.items {
|
||||
if err := b.items[i].(generator).generate(w, done); err != nil {
|
||||
return err
|
||||
@ -371,5 +395,7 @@ func (b *sequenceBuilder) generate(w io.Writer, done map[string]bool) error {
|
||||
}
|
||||
|
||||
fprintf("};")
|
||||
}
|
||||
|
||||
return err
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user