Skip to content

stop panic if using oneof #1

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

Open
millergarym wants to merge 4 commits into
base: master
Choose a base branch
from
Open

stop panic if using oneof #1

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f4bd72
stop panic if using oneof
gmwxio Aug 10, 2017
8f2ccaa
change retag parsing to a regexp. Handle fields without spaces around…
gmwxio Aug 14, 2017
95e57a3
fixed regexp
gmwxio Aug 14, 2017
c204959
ignore blank lines
gmwxio Aug 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 29 additions & 20 deletions protoc-gen-go/retag/retag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"bytes"
"fmt"
"os"
"regexp"
"strconv"
"strings"

Expand Down Expand Up @@ -52,6 +53,7 @@ func (r *retag) getStructTags(filename string) {

r.tags = make(map[string]string)
var begin bool
var oneof bool
var comment bool
var msgName string
reader := bufio.NewReader(file)
Expand All @@ -61,6 +63,10 @@ func (r *retag) getStructTags(filename string) {
break
}

if len(strings.TrimSpace(string(line))) == 0 {
continue
}

if strings.HasPrefix(strings.TrimSpace(string(line)), "/*") {
comment = true
}
Expand All @@ -74,12 +80,22 @@ func (r *retag) getStructTags(filename string) {
continue
}

if strings.HasPrefix(strings.TrimSpace(string(line)), "oneof") {
oneof = true
continue
}

if strings.HasPrefix(strings.TrimSpace(string(line)), "message") {
begin = true
msgName = strings.Fields(string(line))[1]
continue
}

if oneof == true && strings.TrimSpace(string(line))[0] == '}' {
oneof = false
continue
}

if begin == true && line[0] == '}' {
begin = false
continue
Expand Down Expand Up @@ -107,28 +123,21 @@ func (r *retag) getStructTags(filename string) {
}
}

var reFnT *regexp.Regexp = regexp.MustCompile(`^\s*(?:repeated)?\s*(map<[^>]+>|[^\s]+)\s*([^\s]+)\s*=\s*\d+\s*;\s*(//.*(json:"[^"]+").*)?`)

func getFieldTag(line string, msgName string) (field string, tag string) {
fts := strings.Split(line, "//")
tag = fts[1]
fs := strings.Fields(fts[0])
fsl := len(fs)
field = msgName + "."
for i := 0; i < fsl; i++ {
if i == fsl-1 {
field += fs[i]
break
} else {
if fs[i+1] == "=" {
field += fs[i]
break
}
}
m := reFnT.FindAllStringSubmatch(line, 4)
if len(m) < 1 {
fmt.Fprintf(os.Stderr, "******\n\n\n%s\n\n\n****\n", line)
}

tag = strings.TrimSpace(tag)
tag = strings.Trim(tag, "`")
tag = trimInside(tag)

field = msgName + "." + m[0][2]
if m[0][4] != "" {
tag = m[0][4]
} else {
// fmt.Fprintf(os.Stderr, "no match %v %v\n", m, line)
tag = fmt.Sprintf(`json:"%s"`, m[0][2])
}
// fmt.Fprintf(os.Stderr, "2. field %v tag %v\n", field, tag)
return
}

Expand Down