diff --git a/redo/GNUbase.mk b/redo/GNUbase.mk index 23dd5fd2..67efd094 100644 --- a/redo/GNUbase.mk +++ b/redo/GNUbase.mk @@ -14,7 +14,6 @@ xHFILES = \ OFILES = \ $(baseCFILES:%.c=$(OBJDIR)/%.o) \ - $(IDLFILES:%.idl=$(OBJDIR)/z%typefuncs.o) \ $(baseMFILES:%.m=$(OBJDIR)/%.o) xCFLAGS = \ @@ -59,11 +58,6 @@ $(OUTDIR)/%.h: %.idl tools/idl2h.go | $(OUTDIR)/.phony @echo ====== Generated `basename $@` .PRECIOUS: $(OUTDIR)/%.h -z%typefuncs.c: %.idl tools/idl2typefuncs.go - @go run tools/idl2typefuncs.go out/ui.h < $< > $@ - @echo ====== Generated $@ -.PRECIOUS: z%typefuncs.c - clean: rm -rf $(OUTDIR) $(OBJDIR) z* .PHONY: clean diff --git a/redo/tools/idl2typefuncs.go b/redo/tools/idl2typefuncs.go deleted file mode 100644 index 58a95b80..00000000 --- a/redo/tools/idl2typefuncs.go +++ /dev/null @@ -1,54 +0,0 @@ -// 17 may 2015 -package main - -import ( - "fmt" - "os" - "flag" - "github.com/andlabs/pgidl" -) - -func geniface(iface *pgidl.Interface, prefix string) { - v := fmt.Sprintf("type%s%s", prefix, iface.Name) - fmt.Printf("static uintmax_t %s = 0;\n", v) - fmt.Printf("uintmax_t %sType%s(void)\n", prefix, iface.Name) - fmt.Printf("{\n") - fmt.Printf("\tif (%s == 0)\n", v) - fmt.Printf("\t\t%s = %sRegisterType(%q, ", - v, - prefix, - prefix + iface.Name) - if iface.From != "" { - fmt.Printf("%sType%s()", prefix, iface.From) - } else { - fmt.Printf("0") - } - fmt.Printf(");\n") - fmt.Printf("\treturn %s;\n", v) - fmt.Printf("}\n") -} - -func genpkg(p *pgidl.Package) { - for _, o := range p.Order { - switch o.Which { - case pgidl.Interfaces: - geniface(p.Interfaces[o.Index], p.Name) - } - } -} - -func main() { - flag.Parse() - idl, errs := pgidl.Parse(os.Stdin, "") - if len(errs) != 0 { - for _, e := range errs { - fmt.Fprintf(os.Stderr, "%s\n", e) - } - os.Exit(1) - } - fmt.Printf("// generated by idl2h; do not edit\n") - fmt.Printf("#include %q\n", os.Args[1]) - for _, p := range idl { - genpkg(p) - } -}