Refactor puffs-gen-c to use a contextual struct.

This commit is contained in:
Nigel Tao committed 2017-06-01 12:57:46 +10:00
1 parent 47da01233b
commit 30165e06df
2 files changed
+211 -204

No files matched your search

+209 -200
View File
@@ -25,7 +25,25 @@ import (
)
func main() {
generate.Main(gen{})
generate.Main(func(pkgName string, idMap *t.IDMap, files []*a.File) ([]byte, error) {
g := &gen{
pkgName: pkgName,
idMap: idMap,
files: files,
}
if err := g.generate(); err != nil {
return nil, err
}
stdout := &bytes.Buffer{}
cmd := exec.Command("clang-format", "-style=Chromium")
cmd.Stdin = &g.buffer
cmd.Stdout = stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
return nil, err
}
return stdout.Bytes(), nil
})
}
type visibility uint32
@@ -37,104 +55,108 @@ const (
)
type gen struct {
buffer bytes.Buffer
pkgName string
idMap *t.IDMap
files []*a.File
}
func (gen) Generate(pkgName string, m *t.IDMap, files []*a.File) ([]byte, error) {
b := &bytes.Buffer{}
func (g *gen) printf(format string, args ...interface{}) { fmt.Fprintf(&g.buffer, format, args...) }
func (g *gen) writeb(b byte) { g.buffer.WriteByte(b) }
func (g *gen) writes(s string) { g.buffer.WriteString(s) }
includeGuard := "PUFFS_" + strings.ToUpper(pkgName) + "_H"
fmt.Fprintf(b, "#ifndef %s\n#define %s\n\n", includeGuard, includeGuard)
func (g *gen) generate() error {
includeGuard := "PUFFS_" + strings.ToUpper(g.pkgName) + "_H"
g.printf("#ifndef %s\n#define %s\n\n", includeGuard, includeGuard)
fmt.Fprintf(b, "// Code generated by puffs-gen-c. DO NOT EDIT.\n\n")
b.WriteString(baseHeader)
b.WriteString("\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n")
g.printf("// Code generated by puffs-gen-c. DO NOT EDIT.\n\n")
g.writes(baseHeader)
g.writes("\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n")
b.WriteString("// ---------------- Status Codes\n\n")
b.WriteString("// Status codes are non-positive integers.\n")
b.WriteString("//\n")
b.WriteString("// The least significant bit indicates a non-recoverable status code: an error.\n")
b.WriteString("typedef enum {\n")
fmt.Fprintf(b, "puffs_%s_status_ok = 0,\n", pkgName)
fmt.Fprintf(b, "puffs_%s_error_bad_version = -2 + 1,\n", pkgName)
fmt.Fprintf(b, "puffs_%s_error_null_receiver = -4 + 1,\n", pkgName)
fmt.Fprintf(b, "puffs_%s_error_constructor_not_called= -6 + 1,\n", pkgName)
fmt.Fprintf(b, "puffs_%s_status_short_dst = -8,\n", pkgName)
fmt.Fprintf(b, "puffs_%s_status_short_src = -10,\n", pkgName)
fmt.Fprintf(b, "} puffs_%s_status;\n\n", pkgName)
g.writes("// ---------------- Status Codes\n\n")
g.writes("// Status codes are non-positive integers.\n")
g.writes("//\n")
g.writes("// The least significant bit indicates a non-recoverable status code: an error.\n")
g.writes("typedef enum {\n")
g.printf("puffs_%s_status_ok = 0,\n", g.pkgName)
g.printf("puffs_%s_error_bad_version = -2 + 1,\n", g.pkgName)
g.printf("puffs_%s_error_null_receiver = -4 + 1,\n", g.pkgName)
g.printf("puffs_%s_error_constructor_not_called= -6 + 1,\n", g.pkgName)
g.printf("puffs_%s_status_short_dst = -8,\n", g.pkgName)
g.printf("puffs_%s_status_short_src = -10,\n", g.pkgName)
g.printf("} puffs_%s_status;\n\n", g.pkgName)
b.WriteString("// ---------------- Public Structs\n\n")
if err := forEachStruct(b, pkgName, m, files, pubOnly, writeStruct); err != nil {
return nil, err
g.writes("// ---------------- Public Structs\n\n")
if err := g.forEachStruct(pubOnly, (*gen).writeStruct); err != nil {
return err
}
b.WriteString("// ---------------- Public Constructor and Destructor Prototypes\n\n")
if err := forEachStruct(b, pkgName, m, files, pubOnly, writeCtorPrototypesPub); err != nil {
return nil, err
g.writes("// ---------------- Public Constructor and Destructor Prototypes\n\n")
if err := g.forEachStruct(pubOnly, (*gen).writeCtorPrototypesPub); err != nil {
return err
}
b.WriteString("// ---------------- Public Function Prototypes\n\n")
if err := forEachFunc(b, pkgName, m, files, pubOnly, writeFuncPrototype); err != nil {
return nil, err
g.writes("// ---------------- Public Function Prototypes\n\n")
if err := g.forEachFunc(pubOnly, (*gen).writeFuncPrototype); err != nil {
return err
}
// Finish up the header, which is also the first part of the .c file.
b.WriteString("\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n\n")
fmt.Fprintf(b, "#endif // %s\n\n", includeGuard)
b.WriteString("// C HEADER ENDS HERE.\n\n")
b.WriteString(baseImpl)
b.WriteString("\n")
g.writes("\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n\n")
g.printf("#endif // %s\n\n", includeGuard)
g.writes("// C HEADER ENDS HERE.\n\n")
g.writes(baseImpl)
g.writes("\n")
b.WriteString("// ---------------- Private Structs\n\n")
if err := forEachStruct(b, pkgName, m, files, priOnly, writeStruct); err != nil {
return nil, err
g.writes("// ---------------- Private Structs\n\n")
if err := g.forEachStruct(priOnly, (*gen).writeStruct); err != nil {
return err
}
b.WriteString("// ---------------- Private Constructor and Destructor Prototypes\n\n")
if err := forEachStruct(b, pkgName, m, files, priOnly, writeCtorPrototypesPri); err != nil {
return nil, err
g.writes("// ---------------- Private Constructor and Destructor Prototypes\n\n")
if err := g.forEachStruct(priOnly, (*gen).writeCtorPrototypesPri); err != nil {
return err
}
b.WriteString("// ---------------- Private Function Prototypes\n\n")
if err := forEachFunc(b, pkgName, m, files, priOnly, writeFuncPrototype); err != nil {
return nil, err
g.writes("// ---------------- Private Function Prototypes\n\n")
if err := g.forEachFunc(priOnly, (*gen).writeFuncPrototype); err != nil {
return err
}
b.WriteString("// ---------------- Constructor and Destructor Implementations\n\n")
b.WriteString("// PUFFS_MAGIC is a magic number to check that constructors are called. It's\n")
b.WriteString("// not foolproof, given C doesn't automatically zero memory before use, but it\n")
b.WriteString("// should catch 99.99% of cases.\n")
b.WriteString("//\n")
b.WriteString("// Its (non-zero) value is arbitrary, based on md5sum(\"puffs\").\n")
b.WriteString("#define PUFFS_MAGIC (0xCB3699CCU)\n\n")
b.WriteString("// PUFFS_ALREADY_ZEROED is passed from a container struct's constructor to a\n")
b.WriteString("// containee struct's constructor when the container has already zeroed the\n")
b.WriteString("// containee's memory.\n")
b.WriteString("//\n")
b.WriteString("// Its (non-zero) value is arbitrary, based on md5sum(\"zeroed\").\n")
b.WriteString("#define PUFFS_ALREADY_ZEROED (0x68602EF1U)\n\n")
if err := forEachStruct(b, pkgName, m, files, bothPubPri, writeCtorImpls); err != nil {
return nil, err
g.writes("// ---------------- Constructor and Destructor Implementations\n\n")
g.writes("// PUFFS_MAGIC is a magic number to check that constructors are called. It's\n")
g.writes("// not foolproof, given C doesn't automatically zero memory before use, but it\n")
g.writes("// should catch 99.99% of cases.\n")
g.writes("//\n")
g.writes("// Its (non-zero) value is arbitrary, based on md5sum(\"puffs\").\n")
g.writes("#define PUFFS_MAGIC (0xCB3699CCU)\n\n")
g.writes("// PUFFS_ALREADY_ZEROED is passed from a container struct's constructor to a\n")
g.writes("// containee struct's constructor when the container has already zeroed the\n")
g.writes("// containee's memory.\n")
g.writes("//\n")
g.writes("// Its (non-zero) value is arbitrary, based on md5sum(\"zeroed\").\n")
g.writes("#define PUFFS_ALREADY_ZEROED (0x68602EF1U)\n\n")
if err := g.forEachStruct(bothPubPri, (*gen).writeCtorImpls); err != nil {
return err
}
b.WriteString("// ---------------- Function Implementations\n\n")
if err := forEachFunc(b, pkgName, m, files, bothPubPri, writeFuncImpl); err != nil {
return nil, err
g.writes("// ---------------- Function Implementations\n\n")
if err := g.forEachFunc(bothPubPri, (*gen).writeFuncImpl); err != nil {
return err
}
return format(b)
return nil
}
func forEachFunc(b *bytes.Buffer, pkgName string, m *t.IDMap, files []*a.File, v visibility,
f func(*bytes.Buffer, string, *t.IDMap, *a.Func) error) error {
for _, file := range files {
func (g *gen) forEachFunc(v visibility, f func(*gen, *a.Func) error) error {
for _, file := range g.files {
for _, n := range file.TopLevelDecls() {
if n.Kind() != a.KFunc ||
(v == pubOnly && n.Raw().Flags()&a.FlagsPublic == 0) ||
(v == priOnly && n.Raw().Flags()&a.FlagsPublic != 0) {
continue
}
if err := f(b, pkgName, m, n.Func()); err != nil {
if err := f(g, n.Func()); err != nil {
return err
}
}
@@ -142,17 +164,15 @@ func forEachFunc(b *bytes.Buffer, pkgName string, m *t.IDMap, files []*a.File, v
return nil
}
func forEachStruct(b *bytes.Buffer, pkgName string, m *t.IDMap, files []*a.File, v visibility,
f func(*bytes.Buffer, string, *t.IDMap, *a.Struct) error) error {
for _, file := range files {
func (g *gen) forEachStruct(v visibility, f func(*gen, *a.Struct) error) error {
for _, file := range g.files {
for _, n := range file.TopLevelDecls() {
if n.Kind() != a.KStruct ||
(v == pubOnly && n.Raw().Flags()&a.FlagsPublic == 0) ||
(v == priOnly && n.Raw().Flags()&a.FlagsPublic != 0) {
continue
}
if err := f(b, pkgName, m, n.Struct()); err != nil {
if err := f(g, n.Struct()); err != nil {
return err
}
}
@@ -160,180 +180,181 @@ func forEachStruct(b *bytes.Buffer, pkgName string, m *t.IDMap, files []*a.File,
return nil
}
func writeStruct(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Struct) error {
structName := n.Name().String(m)
fmt.Fprintf(b, "typedef struct {\n")
func (g *gen) writeStruct(n *a.Struct) error {
structName := n.Name().String(g.idMap)
g.printf("typedef struct {\n")
if n.Suspendible() {
fmt.Fprintf(b, "puffs_%s_status status;\n", pkgName)
fmt.Fprintf(b, "uint32_t magic;\n")
g.printf("puffs_%s_status status;\n", g.pkgName)
g.printf("uint32_t magic;\n")
}
for _, f := range n.Fields() {
if err := writeField(b, m, f.Field()); err != nil {
if err := g.writeField(f.Field()); err != nil {
return err
}
}
fmt.Fprintf(b, "} puffs_%s_%s;\n\n", pkgName, structName)
g.printf("} puffs_%s_%s;\n\n", g.pkgName, structName)
return nil
}
func writeCtorSignature(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Struct, public bool, ctor bool) {
structName := n.Name().String(m)
func (g *gen) writeCtorSignature(n *a.Struct, public bool, ctor bool) {
structName := n.Name().String(g.idMap)
ctorName := "destructor"
if ctor {
ctorName = "constructor"
if public {
fmt.Fprintf(b, "// puffs_%s_%s_%s is a constructor function.\n", pkgName, structName, ctorName)
fmt.Fprintf(b, "//\n")
fmt.Fprintf(b, "// It should be called before any other puffs_%s_%s_* function.\n",
pkgName, structName)
fmt.Fprintf(b, "//\n")
fmt.Fprintf(b, "// Pass PUFFS_VERSION and 0 for puffs_version and for_internal_use_only.\n")
g.printf("// puffs_%s_%s_%s is a constructor function.\n", g.pkgName, structName, ctorName)
g.printf("//\n")
g.printf("// It should be called before any other puffs_%s_%s_* function.\n",
g.pkgName, structName)
g.printf("//\n")
g.printf("// Pass PUFFS_VERSION and 0 for puffs_version and for_internal_use_only.\n")
}
}
fmt.Fprintf(b, "void puffs_%s_%s_%s(puffs_%s_%s *self", pkgName, structName, ctorName, pkgName, structName)
g.printf("void puffs_%s_%s_%s(puffs_%s_%s *self", g.pkgName, structName, ctorName, g.pkgName, structName)
if ctor {
fmt.Fprintf(b, ", uint32_t puffs_version, uint32_t for_internal_use_only")
g.printf(", uint32_t puffs_version, uint32_t for_internal_use_only")
}
fmt.Fprintf(b, ")")
g.printf(")")
}
func writeCtorPrototypesPub(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Struct) error {
return writeCtorPrototypes(b, pkgName, m, n, true)
func (g *gen) writeCtorPrototypesPub(n *a.Struct) error {
return g.writeCtorPrototypes(n, true)
}
func writeCtorPrototypesPri(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Struct) error {
return writeCtorPrototypes(b, pkgName, m, n, false)
func (g *gen) writeCtorPrototypesPri(n *a.Struct) error {
return g.writeCtorPrototypes(n, false)
}
func writeCtorPrototypes(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Struct, public bool) error {
func (g *gen) writeCtorPrototypes(n *a.Struct, public bool) error {
if !n.Suspendible() {
return nil
}
for _, ctor := range []bool{true, false} {
writeCtorSignature(b, pkgName, m, n, public, ctor)
b.WriteString(";\n\n")
g.writeCtorSignature(n, public, ctor)
g.writes(";\n\n")
}
return nil
}
func writeCtorImpls(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Struct) error {
func (g *gen) writeCtorImpls(n *a.Struct) error {
if !n.Suspendible() {
return nil
}
for _, ctor := range []bool{true, false} {
writeCtorSignature(b, pkgName, m, n, false, ctor)
fmt.Fprintf(b, "{\n")
fmt.Fprintf(b, "if (!self) { return; }\n")
g.writeCtorSignature(n, false, ctor)
g.printf("{\n")
g.printf("if (!self) { return; }\n")
if ctor {
fmt.Fprintf(b, "if (puffs_version != PUFFS_VERSION) {\n")
fmt.Fprintf(b, "self->status = puffs_%s_error_bad_version;\n", pkgName)
fmt.Fprintf(b, "return;\n")
fmt.Fprintf(b, "}\n")
g.printf("if (puffs_version != PUFFS_VERSION) {\n")
g.printf("self->status = puffs_%s_error_bad_version;\n", g.pkgName)
g.printf("return;\n")
g.printf("}\n")
b.WriteString("if (for_internal_use_only != PUFFS_ALREADY_ZEROED) {" +
g.writes("if (for_internal_use_only != PUFFS_ALREADY_ZEROED) {" +
"memset(self, 0, sizeof(*self)); }\n")
b.WriteString("self->magic = PUFFS_MAGIC;\n")
g.writes("self->magic = PUFFS_MAGIC;\n")
for _, f := range n.Fields() {
f := f.Field()
if dv := f.DefaultValue(); dv != nil {
// TODO: set default values for array types.
fmt.Fprintf(b, "self->f_%s = %d;\n", f.Name().String(m), dv.ConstValue())
g.printf("self->f_%s = %d;\n", f.Name().String(g.idMap), dv.ConstValue())
}
}
}
// TODO: call any ctor/dtors on sub-structures.
b.WriteString("}\n\n")
g.writes("}\n\n")
}
return nil
}
func writeFuncSignature(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Func) {
func (g *gen) writeFuncSignature(n *a.Func) {
if n.Suspendible() {
fmt.Fprintf(b, "puffs_%s_status", pkgName)
g.printf("puffs_%s_status", g.pkgName)
} else {
fmt.Fprintf(b, "void")
g.printf("void")
}
fmt.Fprintf(b, " puffs_%s", pkgName)
g.printf(" puffs_%s", g.pkgName)
if r := n.Receiver(); r != 0 {
fmt.Fprintf(b, "_%s", r.String(m))
g.printf("_%s", r.String(g.idMap))
}
fmt.Fprintf(b, "_%s(", n.Name().String(m))
g.printf("_%s(", n.Name().String(g.idMap))
if r := n.Receiver(); r != 0 {
fmt.Fprintf(b, "puffs_%s_%s *self", pkgName, r.String(m))
g.printf("puffs_%s_%s *self", g.pkgName, r.String(g.idMap))
}
// TODO: write n's args.
fmt.Fprintf(b, ")")
g.printf(")")
}
func writeFuncPrototype(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Func) error {
writeFuncSignature(b, pkgName, m, n)
b.WriteString(";\n\n")
func (g *gen) writeFuncPrototype(n *a.Func) error {
g.writeFuncSignature(n)
g.writes(";\n\n")
return nil
}
func writeFuncImpl(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Func) error {
writeFuncSignature(b, pkgName, m, n)
b.WriteString("{\n")
func (g *gen) writeFuncImpl(n *a.Func) error {
g.writeFuncSignature(n)
g.writes("{\n")
cleanup0 := false
// Check the previous status and the args.
if n.Public() {
if n.Receiver() != 0 {
fmt.Fprintf(b, "if (!self) { return puffs_%s_error_null_receiver; }\n", pkgName)
g.printf("if (!self) { return puffs_%s_error_null_receiver; }\n", g.pkgName)
}
}
if n.Suspendible() {
fmt.Fprintf(b, "puffs_%s_status status = ", pkgName)
g.printf("puffs_%s_status status = ", g.pkgName)
if n.Receiver() != 0 {
fmt.Fprintf(b, "self->status;\n")
g.printf("self->status;\n")
if n.Public() {
fmt.Fprintf(b, "if (status & 1) { return status; }")
g.printf("if (status & 1) { return status; }")
}
} else {
fmt.Fprintf(b, "puffs_%s_status_ok;\n", pkgName)
g.printf("puffs_%s_status_ok;\n", g.pkgName)
}
if n.Public() {
fmt.Fprintf(b, "if (self->magic != PUFFS_MAGIC) {"+
"status = puffs_%s_error_constructor_not_called; goto cleanup0; }\n", pkgName)
g.printf("if (self->magic != PUFFS_MAGIC) {"+
"status = puffs_%s_error_constructor_not_called; goto cleanup0; }\n", g.pkgName)
cleanup0 = true
}
} else if r := n.Receiver(); r != 0 {
// TODO: fix this.
return fmt.Errorf(`cannot convert Puffs function "%s.%s" to C`, r.String(m), n.Name().String(m))
return fmt.Errorf(`cannot convert Puffs function "%s.%s" to C`,
r.String(g.idMap), n.Name().String(g.idMap))
}
// TODO: check the args.
b.WriteString("\n")
g.writes("\n")
// Generate the local variables.
if err := writeVars(b, pkgName, m, n.Node(), 0); err != nil {
if err := g.writeVars(n.Node(), 0); err != nil {
return err
}
b.WriteString("\n")
g.writes("\n")
// Generate the function body.
for _, o := range n.Body() {
if err := writeStatement(b, pkgName, m, o, 0); err != nil {
if err := g.writeStatement(o, 0); err != nil {
return err
}
}
b.WriteString("\n")
g.writes("\n")
if cleanup0 {
fmt.Fprintf(b, "cleanup0: self->status = status;\n")
g.printf("cleanup0: self->status = status;\n")
}
if n.Suspendible() {
fmt.Fprintf(b, "return status;\n")
g.printf("return status;\n")
}
b.WriteString("}\n\n")
g.writes("}\n\n")
return nil
}
func writeField(b *bytes.Buffer, m *t.IDMap, n *a.Field) error {
func (g *gen) writeField(n *a.Field) error {
convertible := true
for x := n.XType(); x != nil; x = x.Inner() {
if p := x.PackageOrDecorator(); p != 0 && p != t.IDOpenBracket {
@@ -345,8 +366,8 @@ func writeField(b *bytes.Buffer, m *t.IDMap, n *a.Field) error {
}
if k := x.Name().Key(); k < t.Key(len(cTypeNames)) {
if s := cTypeNames[k]; s != "" {
b.WriteString(s)
b.WriteByte(' ')
g.writes(s)
g.writeb(' ')
continue
}
}
@@ -355,25 +376,25 @@ func writeField(b *bytes.Buffer, m *t.IDMap, n *a.Field) error {
}
if !convertible {
// TODO: fix this.
return fmt.Errorf("cannot convert Puffs type %q to C", n.XType().String(m))
return fmt.Errorf("cannot convert Puffs type %q to C", n.XType().String(g.idMap))
}
b.WriteString("f_")
b.WriteString(n.Name().String(m))
g.writes("f_")
g.writes(n.Name().String(g.idMap))
for x := n.XType(); x != nil; x = x.Inner() {
if x.PackageOrDecorator() == t.IDOpenBracket {
b.WriteByte('[')
b.WriteString(x.ArrayLength().ConstValue().String())
b.WriteByte(']')
g.writeb('[')
g.writes(x.ArrayLength().ConstValue().String())
g.writeb(']')
}
}
b.WriteString(";\n")
g.writes(";\n")
return nil
}
func writeVars(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Node, depth uint32) error {
func (g *gen) writeVars(n *a.Node, depth uint32) error {
if depth > a.MaxBodyDepth {
return fmt.Errorf("body recursion depth too large")
}
@@ -383,17 +404,17 @@ func writeVars(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Node, depth uin
x := n.Var().XType()
if k := x.Name().Key(); k < t.Key(len(cTypeNames)) {
if s := cTypeNames[k]; s != "" {
fmt.Fprintf(b, "%s v_%s;\n", s, n.Var().Name().String(m))
g.printf("%s v_%s;\n", s, n.Var().Name().String(g.idMap))
return nil
}
}
// TODO: fix this.
return fmt.Errorf("cannot convert Puffs type %q to C", x.String(m))
return fmt.Errorf("cannot convert Puffs type %q to C", x.String(g.idMap))
}
for _, l := range n.Raw().SubLists() {
for _, o := range l {
if err := writeVars(b, pkgName, m, o, depth); err != nil {
if err := g.writeVars(o, depth); err != nil {
return err
}
}
@@ -401,7 +422,7 @@ func writeVars(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Node, depth uin
return nil
}
func writeStatement(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Node, depth uint32) error {
func (g *gen) writeStatement(n *a.Node, depth uint32) error {
if depth > a.MaxBodyDepth {
return fmt.Errorf("body recursion depth too large")
}
@@ -414,15 +435,15 @@ func writeStatement(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Node, dept
case a.KAssign:
n := n.Assign()
if err := writeExpr(b, pkgName, m, n.LHS(), depth); err != nil {
if err := g.writeExpr(n.LHS(), depth); err != nil {
return err
}
// TODO: does KeyAmpHatEq need special consideration?
b.WriteString(cOpNames[0xFF&n.Operator().Key()])
if err := writeExpr(b, pkgName, m, n.RHS(), depth); err != nil {
g.writes(cOpNames[0xFF&n.Operator().Key()])
if err := g.writeExpr(n.RHS(), depth); err != nil {
return err
}
b.WriteString(";\n")
g.writes(";\n")
return nil
case a.KIf:
@@ -436,30 +457,30 @@ func writeStatement(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Node, dept
case a.KVar:
n := n.Var()
fmt.Fprintf(b, "v_%s = ", n.Name().String(m))
g.printf("v_%s = ", n.Name().String(g.idMap))
if v := n.Value(); v != nil {
if err := writeExpr(b, pkgName, m, v, 0); err != nil {
if err := g.writeExpr(v, 0); err != nil {
return err
}
} else {
b.WriteByte('0')
g.writeb('0')
}
b.WriteString(";\n")
g.writes(";\n")
return nil
case a.KWhile:
n := n.While()
b.WriteString("while (")
if err := writeExpr(b, pkgName, m, n.Condition(), 0); err != nil {
g.writes("while (")
if err := g.writeExpr(n.Condition(), 0); err != nil {
return err
}
b.WriteString(") {\n")
g.writes(") {\n")
for _, o := range n.Body() {
if err := writeStatement(b, pkgName, m, o, depth); err != nil {
if err := g.writeStatement(o, depth); err != nil {
return err
}
}
b.WriteString("}\n")
g.writes("}\n")
return nil
// TODO.
@@ -467,7 +488,7 @@ func writeStatement(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Node, dept
return fmt.Errorf("unrecognized ast.Kind (%s) for writeStatement", n.Kind())
}
func writeExpr(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Expr, depth uint32) error {
func (g *gen) writeExpr(n *a.Expr, depth uint32) error {
if depth > a.MaxExprDepth {
return fmt.Errorf("expression recursion depth too large")
}
@@ -475,25 +496,25 @@ func writeExpr(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Expr, depth uin
if cv := n.ConstValue(); cv != nil {
// TODO: write false/true instead of 0/1 if n.MType() is bool?
b.WriteString(cv.String())
g.writes(cv.String())
return nil
}
switch n.ID0().Flags() & (t.FlagsUnaryOp | t.FlagsBinaryOp | t.FlagsAssociativeOp) {
case 0:
if err := writeExprOther(b, pkgName, m, n, depth); err != nil {
if err := g.writeExprOther(n, depth); err != nil {
return err
}
case t.FlagsUnaryOp:
if err := writeExprUnaryOp(b, pkgName, m, n, depth); err != nil {
if err := g.writeExprUnaryOp(n, depth); err != nil {
return err
}
case t.FlagsBinaryOp:
if err := writeExprBinaryOp(b, pkgName, m, n, depth); err != nil {
if err := g.writeExprBinaryOp(n, depth); err != nil {
return err
}
case t.FlagsAssociativeOp:
if err := writeExprAssociativeOp(b, pkgName, m, n, depth); err != nil {
if err := g.writeExprAssociativeOp(n, depth); err != nil {
return err
}
default:
@@ -503,15 +524,15 @@ func writeExpr(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Expr, depth uin
return nil
}
func writeExprOther(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Expr, depth uint32) error {
func (g *gen) writeExprOther(n *a.Expr, depth uint32) error {
switch n.ID0().Key() {
case 0:
if id1 := n.ID1(); id1.Key() == t.KeyThis {
b.WriteString("self")
g.writes("self")
} else {
// TODO: don't assume that the v_ prefix is necessary.
b.WriteString("v_")
b.WriteString(id1.String(m))
g.writes("v_")
g.writes(id1.String(g.idMap))
}
return nil
@@ -528,60 +549,48 @@ func writeExprOther(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Expr, dept
// TODO.
case t.KeyDot:
if err := writeExpr(b, pkgName, m, n.LHS().Expr(), depth); err != nil {
if err := g.writeExpr(n.LHS().Expr(), depth); err != nil {
return err
}
// TODO: choose between . vs -> operators.
//
// TODO: don't assume that the f_ prefix is necessary.
b.WriteString("->f_")
b.WriteString(n.ID1().String(m))
g.writes("->f_")
g.writes(n.ID1().String(g.idMap))
return nil
}
return fmt.Errorf("unrecognized token.Key (0x%X) for writeExprOther", n.ID0().Key())
}
func writeExprUnaryOp(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Expr, depth uint32) error {
func (g *gen) writeExprUnaryOp(n *a.Expr, depth uint32) error {
// TODO.
return nil
}
func writeExprBinaryOp(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Expr, depth uint32) error {
func (g *gen) writeExprBinaryOp(n *a.Expr, depth uint32) error {
op := n.ID0()
if op.Key() == t.KeyXBinaryAs {
// TODO.
return nil
}
b.WriteByte('(')
if err := writeExpr(b, pkgName, m, n.LHS().Expr(), depth); err != nil {
g.writeb('(')
if err := g.writeExpr(n.LHS().Expr(), depth); err != nil {
return err
}
// TODO: does KeyXBinaryAmpHat need special consideration?
b.WriteString(cOpNames[0xFF&op.Key()])
if err := writeExpr(b, pkgName, m, n.RHS().Expr(), depth); err != nil {
g.writes(cOpNames[0xFF&op.Key()])
if err := g.writeExpr(n.RHS().Expr(), depth); err != nil {
return err
}
b.WriteByte(')')
g.writeb(')')
return nil
}
func writeExprAssociativeOp(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Expr, depth uint32) error {
func (g *gen) writeExprAssociativeOp(n *a.Expr, depth uint32) error {
// TODO.
return nil
}
func format(rawSource *bytes.Buffer) ([]byte, error) {
stdout := &bytes.Buffer{}
cmd := exec.Command("clang-format", "-style=Chromium")
cmd.Stdin = rawSource
cmd.Stdout = stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
return nil, err
}
return stdout.Bytes(), nil
}
var cTypeNames = [...]string{
t.KeyI8: "int8_t",
t.KeyI16: "int16_t",
+2 -4
View File
@@ -22,9 +22,7 @@ var (
packageName = flag.String("package_name", "", "the package name of the Puffs input code")
)
type Generator interface {
Generate(packageName string, m *token.IDMap, files []*ast.File) ([]byte, error)
}
type Generator func(packageName string, m *token.IDMap, files []*ast.File) ([]byte, error)
func Main(g Generator) {
if err := main1(g); err != nil {
@@ -53,7 +51,7 @@ func main1(g Generator) error {
return err
}
out, err := g.Generate(*packageName, idMap, files)
out, err := g(*packageName, idMap, files)
if err != nil {
return err
}