Add pkg to ast Const and Status nodes

This commit is contained in:
Nigel Tao committed 2017-12-28 15:14:55 +11:00
1 parent 33efa88e54
commit 10e4936f08
5 files changed
+73 -46

No files matched your search

+3 -3
View File
@@ -470,7 +470,7 @@ func (g *gen) sizeof(typ *a.TypeExpr) (uint32, error) {
}
func (g *gen) gatherStatuses(b *buffer, n *a.Status) error {
raw := n.Message().Str(g.tm)
raw := n.QID()[1].Str(g.tm)
msg, ok := t.Unescape(raw)
if !ok {
return fmt.Errorf("bad status message %q", raw)
@@ -485,7 +485,7 @@ func (g *gen) gatherStatuses(b *buffer, n *a.Status) error {
keyword: n.Keyword(),
}
g.statusList = append(g.statusList, s)
g.statusMap[n.Message()] = s
g.statusMap[n.QID()[1]] = s
return nil
}
@@ -494,7 +494,7 @@ func (g *gen) writeConst(b *buffer, n *a.Const) error {
b.writes("static ")
}
b.writes("const ")
if err := g.writeCTypeName(b, n.XType(), g.pkgPrefix, n.Name().Str(g.tm)); err != nil {
if err := g.writeCTypeName(b, n.XType(), g.pkgPrefix, n.QID()[1].Str(g.tm)); err != nil {
return err
}
b.writes(" = ")
+8 -1
View File
@@ -249,6 +249,13 @@ func (h *genHelper) genWuffs(dirname string, qualifiedFilenames []string) error
for _, f := range files {
for _, n := range f.TopLevelDecls() {
switch n.Kind() {
case a.KConst:
n := n.Const()
if !n.Public() {
continue
}
return fmt.Errorf("TODO: genWuffs for consts")
case a.KFunc:
n := n.Func()
if !n.Public() {
@@ -286,7 +293,7 @@ func (h *genHelper) genWuffs(dirname string, qualifiedFilenames []string) error
if !n.Public() {
continue
}
fmt.Fprintf(out, "pub %s %s\n", n.Keyword().Str(&h.tm), n.Message().Str(&h.tm))
fmt.Fprintf(out, "pub %s %s\n", n.Keyword().Str(&h.tm), n.QID().Str(&h.tm))
case a.KStruct:
n := n.Struct()