generate: Add CName to aid in translation to and from c

Author: tmc

generate/codegen/gen_function.go

@@ -55,7 +55,8 @@ func (f *Function) CArgs(currentModule *modules.Module) string {
 	// log.Println("rendering function", f.Name)
 	var args []string
 	for _, p := range f.Parameters {
-		args = append(args, fmt.Sprintf("%s %s", p.Type.ObjcName(), p.Name))
+		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, ", ")
 }
@@ -110,59 +111,40 @@ func (f *Function) WriteGoCallCode(currentModule *modules.Module, cw *CodeWriter
 	cw.WriteLine("func " + funcDeclare + " {")
 	cw.Indent()
 
-	var returnTypeStr string
-	rt := typing.UnwrapAlias(f.ReturnType)
-	switch rt.(type) {
-	case *typing.VoidType:
-		returnTypeStr = "objc.Void"
-	default:
-		returnTypeStr = f.ReturnType.GoName(currentModule, true)
-	}
-	callCode := fmt.Sprintf("objc.Call[%s](%s, objc.Sel(\"%s\")", returnTypeStr, f.Selector())
+	returnTypeStr := f.GoReturn(currentModule)
+
+	callCode := fmt.Sprintf("C.%s(", f.GoName)
 	var sb strings.Builder
 	for idx, p := range f.Parameters {
-		sb.WriteString(", ")
+		// cast to C type
 		switch tt := p.Type.(type) {
-		case *typing.ClassType:
-			sb.WriteString("objc.Ptr(" + p.GoName() + ")")
-		case *typing.ProtocolType:
-			pvar := fmt.Sprintf("po%d", idx)
-			cw.WriteLineF("%s := objc.WrapAsProtocol(\"%s\", %s)", pvar, tt.Name, p.GoName())
-			sb.WriteString(pvar)
-		case *typing.PointerType:
-			switch tt.Type.(type) {
-			case *typing.ClassType: //object pointer convert to unsafe.Pointer, avoiding ffi treat it as PointerHolder
-				sb.WriteString(fmt.Sprintf("unsafe.Pointer(%s)", p.GoName()))
-			default:
-				sb.WriteString(p.GoName())
-			}
+		case *typing.AliasType:
+			sb.WriteString(fmt.Sprintf("C.%s(%s)", tt.CName(), p.GoName()))
 		default:
 			sb.WriteString(p.GoName())
 		}
+		if idx < len(f.Parameters)-1 {
+			sb.WriteString(", ")
+		}
 	}
 	callCode += sb.String() + ")"
 
-	switch rt.(type) {
-	case *typing.VoidType:
+	if returnTypeStr == "" {
 		cw.WriteLine(callCode)
-	default:
+	} else {
 		var resultName = "rv"
 		cw.WriteLine(resultName + " := " + callCode)
-		cw.WriteLine("return " + resultName)
+		cw.WriteLineF("return %s(%s)", returnTypeStr, resultName)
 	}
 	cw.UnIndent()
 	cw.WriteLine("}")
 }
 
 func (f *Function) WriteCSignature(currentModule *modules.Module, cw *CodeWriter) {
 	var returnTypeStr string
-	rt := typing.UnwrapAlias(f.ReturnType)
-	switch rt.(type) {
-	case *typing.VoidType:
-		returnTypeStr = "void *"
-	default:
-		returnTypeStr = f.ReturnType.ObjcName()
-	}
+	rt := f.Type.ReturnType
+	log.Printf("rt: %T", rt)
+	returnTypeStr = rt.CName()
 	cw.WriteLineF("// %v %v(%v); ", returnTypeStr, f.GoName, f.CArgs(currentModule))
 }
 

generate/codegen/modulewriter.go

@@ -155,11 +155,11 @@ func (m *ModuleWriter) WriteFunctions() {
 	cw.WriteLine(AutoGeneratedMark)
 	cw.WriteLine("package " + m.Module.Package)
 
+	//TODO: determine imports from functions
 	cw.WriteLine(`// #import <stdlib.h>
-// #import <stdint.h>
-// #import <stdbool.h>
-// #import <CoreGraphics/CGGeometry.h>
-`)
+	// #import <stdint.h>
+	// #import <stdbool.h>
+	// #import <CoreGraphics/CGGeometry.h>`)
 	for _, f := range m.Functions {
 		f.WriteCSignature(&m.Module, cw)
 	}

generate/generator.go

@@ -149,8 +149,6 @@ func (db *Generator) Generate(platform string, version int, rootDir string, fram
 				continue
 			}
 			mw.Structs = append(mw.Structs, fn)
-		default:
-			log.Printf("skipping '%s', unhandled kind: %s", s.Name, s.Kind)
 		}
 	}
 	mw.WriteCode()

generate/types.go

@@ -95,6 +95,11 @@ func (db *Generator) TypeFromSymbol(sym Symbol) typing.Type {
 			Type:   typ,
 		}
 	case "Struct":
+		if strings.HasSuffix(sym.Name, "Ref") {
+			return &typing.RefType{
+				Name: sym.Name,
+			}
+		}
 		return &typing.StructType{
 			Name:   sym.Name,
 			GName:  modules.TrimPrefix(sym.Name),

generate/typing/alias_type.go

@@ -36,6 +36,10 @@ func (a *AliasType) ObjcName() string {
 	return a.Name
 }
 
+func (a *AliasType) CName() string {
+	return a.Type.CName()
+}
+
 func (a *AliasType) DeclareModule() *modules.Module {
 	return a.Module
 }

generate/typing/array_type.go

@@ -26,6 +26,10 @@ func (a *ArrayType) ObjcName() string {
 	return "NSArray*"
 }
 
+func (a *ArrayType) CName() string {
+	return "NSArray*"
+}
+
 func (a *ArrayType) DeclareModule() *modules.Module {
 	return a.Type.DeclareModule()
 }

generate/typing/block_type.go

@@ -75,6 +75,10 @@ func (a *BlockType) ObjcName() string {
 	return sb.String()
 }
 
+func (a *BlockType) CName() string {
+	return a.ObjcName()
+}
+
 func (a *BlockType) DeclareModule() *modules.Module {
 	return nil
 }

generate/typing/class_type.go

@@ -43,6 +43,10 @@ func (c *ClassType) ObjcName() string {
 	return c.Name + "*"
 }
 
+func (c *ClassType) CName() string {
+	return c.Name + "*"
+}
+
 func (c *ClassType) DeclareModule() *modules.Module {
 	return c.Module
 }

generate/typing/data_type.go

@@ -23,6 +23,10 @@ func (d *DataType) ObjcName() string {
 	return "NSData*"
 }
 
+func (d *DataType) CName() string {
+	return "NSData*"
+}
+
 func (d *DataType) DeclareModule() *modules.Module {
 	return nil
 }

generate/typing/dict_type.go

@@ -38,6 +38,10 @@ func (d *DictType) ObjcName() string {
 	return "NSDictionary*"
 }
 
+func (d *DictType) CName() string {
+	return "NSDictionary*"
+}
+
 func (d *DictType) DeclareModule() *modules.Module {
 	return d.ValueType.DeclareModule()
 }