fix disambiguation bug in enums from other packages.
add .protodevel as a recognized extension.
R=dsymonds1
http://codereview.appspot.com/1692054
diff --git a/compiler/generator/generator.go b/compiler/generator/generator.go
index 176c94f..c2c6297 100644
--- a/compiler/generator/generator.go
+++ b/compiler/generator/generator.go
@@ -41,6 +41,7 @@
"fmt"
"log"
"os"
+ "path"
"strings"
"goprotobuf.googlecode.com/hg/proto"
@@ -975,7 +976,7 @@
log.Stderr("don't know how to generate constant for", fieldname)
continue
}
- def = enum.prefix() + def
+ def = g.DefaultPackageName(enum) + enum.prefix() + def
}
g.P(kind, fieldname, " ", typename, " = ", def)
}
@@ -1107,8 +1108,9 @@
// Given a .proto file name, return the output name for the generated Go program.
func goFileName(name string) string {
- if strings.HasSuffix(name, ".proto") {
- name = name[0 : len(name)-6]
+ ext := path.Ext(name)
+ if ext == ".proto" || ext == ".protodevel" {
+ name = name[0 : len(name)-len(ext)]
}
return name + ".pb.go"
}