generate: Progress on functions

Author: tmc

generate/codegen/gen_function.go

@@ -27,15 +27,32 @@ type Function struct {
 	identifier string
 }
 
+var reservedWords = map[string]bool{
+	"func":  true,
+	"map":   true,
+	"new":   true,
+	"var":   true,
+	"len":   true,
+	"copy":  true,
+	"range": true,
+	"type":  true,
+}
+
 // GoArgs return go function args
 func (f *Function) GoArgs(currentModule *modules.Module) string {
-	// log.Println("rendering function", f.Name)
+	log.Println("rendering function", f.Name)
 	var args []string
+	var blankArgCounter = 0
 	for _, p := range f.Parameters {
 		log.Println("rendering function", f.Name, p.Name, p.Type)
 		log.Printf("rendering function ptype: %T", p.Type)
-		if pt, ok := p.Type.(*typing.PointerType); ok {
-			log.Printf("ptr type: %T", pt.Type)
+		// if is reserved word, add _ suffix
+		if _, ok := reservedWords[p.Name]; ok {
+			p.Name = p.Name + "_"
+		}
+		if p.Name == "" {
+			p.Name = fmt.Sprintf("arg%d", blankArgCounter)
+			blankArgCounter++
 		}
 		args = append(args, fmt.Sprintf("%s %s", p.Name, p.Type.GoName(currentModule, true)))
 	}
@@ -47,7 +64,7 @@ func (f *Function) GoReturn(currentModule *modules.Module) string {
 	if f.ReturnType == nil {
 		return ""
 	}
-	log.Printf("rendering GoReturn function return: %s %T", f.ReturnType, f.ReturnType)
+	// log.Printf("rendering GoReturn function return: %s %T", f.ReturnType, f.ReturnType)
 	return f.ReturnType.GoName(currentModule, true)
 }
 
@@ -56,7 +73,7 @@ func (f *Function) CArgs(currentModule *modules.Module) string {
 	// log.Println("rendering function", f.Name)
 	var args []string
 	for _, p := range f.Parameters {
-		log.Printf("rendering cfunction arg: %s %s %T", p.Name, p.Type, p.Type)
+		// log.Printf("rendering cfunction arg: %s %s %T", p.Name, p.Type, p.Type)
 		args = append(args, fmt.Sprintf("%s %s", p.Type.CName(), p.Name))
 	}
 	return strings.Join(args, ", ")
@@ -86,6 +103,11 @@ func (f *Function) String() string {
 func (f *Function) WriteGoCallCode(currentModule *modules.Module, cw *CodeWriter) {
 	funcDeclare := f.GoFuncDeclare(currentModule)
 
+	if hasBlockParam(f.Parameters) {
+		cw.WriteLineF("// // TODO: %v not implemented (missing block param support)", f.Name)
+		return
+	}
+
 	if f.Deprecated {
 		return
 		cw.WriteLine("// deprecated")
@@ -128,7 +150,26 @@ func (f *Function) WriteGoCallCode(currentModule *modules.Module, cw *CodeWriter
 	cw.WriteLine("}")
 }
 
+func hasBlockParam(params []*Param) bool {
+	for _, p := range params {
+		if _, ok := p.Type.(*typing.BlockType); ok {
+			return true
+		}
+		if pt, ok := p.Type.(*typing.AliasType); ok {
+			t := typing.UnwrapAlias(pt.Type)
+			if _, ok := t.(*typing.BlockType); ok {
+				return true
+			}
+		}
+	}
+	return false
+}
+
 func (f *Function) WriteObjcWrapper(currentModule *modules.Module, cw *CodeWriter) {
+	if hasBlockParam(f.Parameters) {
+		cw.WriteLineF("// // TODO: %v not implemented (missing block param support)", f.Name)
+		return
+	}
 	if f.Deprecated {
 		return
 		cw.WriteLine("// deprecated")
@@ -149,6 +190,17 @@ func (f *Function) WriteCSignature(currentModule *modules.Module, cw *CodeWriter
 	var returnTypeStr string
 	rt := f.Type.ReturnType
 	returnTypeStr = rt.CName()
+	if v, ok := map[string]string{
+		"NSInteger":  "int",
+		"NSUInteger": "uint",
+		"BOOL":       "bool",
+	}[returnTypeStr]; ok {
+		returnTypeStr = v
+	}
+	if hasBlockParam(f.Parameters) {
+		cw.WriteLineF("// // TODO: %v not implemented (missing block param support)", f.Name)
+		return
+	}
 	cw.WriteLineF("// %v %v(%v); ", returnTypeStr, f.GoName, f.CArgs(currentModule))
 }
 

generate/codegen/modulewriter.go

@@ -139,6 +139,21 @@ func (m *ModuleWriter) WriteStructs() {
 	}
 }
 
+func shouldSkipFunction(f *Function) bool {
+	if f.Deprecated {
+		return true
+	}
+	if hasBlockParam(f.Parameters) {
+		return true
+	}
+	if _, ok := map[string]bool{
+		"CGDirectDisplayCopyCurrentMetalDevice": true,
+	}[f.Name]; ok {
+		return true
+	}
+	return false
+}
+
 // WriteFunctions writes the go code to call exposed functions.
 func (m *ModuleWriter) WriteFunctions() {
 	if len(m.Functions) == 0 {
@@ -163,6 +178,9 @@ func (m *ModuleWriter) WriteFunctions() {
 // #import <stdbool.h>
 // #import "%s"`, m.Module.Header)
 	for _, f := range m.Functions {
+		if shouldSkipFunction(f) {
+			continue
+		}
 		f.WriteCSignature(&m.Module, cw)
 	}
 	cw.WriteLine(`import "C"`)
@@ -175,6 +193,10 @@ func (m *ModuleWriter) WriteFunctions() {
 	}
 	cw.Indent()
 	imports.ForEach(func(value string) {
+		if value == "github.com/progrium/macdriver/macos/"+m.Module.Package {
+			return
+		}
+		// avoid cycles:
 		if value != "github.com/progrium/macdriver/macos/objc" {
 			cw.WriteLine("\"" + value + "\"")
 		}
@@ -183,6 +205,9 @@ func (m *ModuleWriter) WriteFunctions() {
 	cw.WriteLine(")")
 
 	for _, f := range m.Functions {
+		if shouldSkipFunction(f) {
+			continue
+		}
 		f.WriteGoCallCode(&m.Module, cw)
 	}
 }

generate/types.go

@@ -111,10 +111,6 @@ func (db *Generator) TypeFromSymbol(sym Symbol) typing.Type {
 			Module: modules.Get(module),
 		}
 	case "Function":
-		if sym.Name != "CGDisplayCreateImage" &&
-			sym.Name != "CGMainDisplayID" {
-			return nil
-		}
 		typ, err := sym.Parse()
 		if err != nil {
 			fmt.Printf("TypeFromSymbol: failed to parse %s: %s\n", sym.Declaration, err)

generate/typing/block_type.go

@@ -76,7 +76,7 @@ func (a *BlockType) ObjcName() string {
 }
 
 func (a *BlockType) CName() string {
-	return a.ObjcName()
+	return "implement me"
 }
 
 func (a *BlockType) DeclareModule() *modules.Module {