Kinda proper fix for #42 related issue.

xlab · Jan 5, 2018 · f5ababa · f5ababa
1 parent de96262
commit f5ababa
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/generator/gen_bindings.go b/generator/gen_bindings.go
@@ -990,7 +990,7 @@ func (gen *Generator) writeFunctionBody(wr io.Writer, decl *tl.CDecl) {
 			ptrTip = tl.TipPtrRef
 		}
 		goSpec := gen.tr.TranslateSpec((*spec).Return, ptrTip, typeTip)
-		cgoSpec := gen.tr.CGoSpec((*spec).Return, true) // asArg?
+		cgoSpec := gen.tr.CGoSpec((*spec).Return, false)
 
 		retProxy, nillable := gen.proxyRetToGo(memTipRx.Self(), "__v", "__ret", goSpec, cgoSpec)
 		if nillable {

diff --git a/generator/gen_callbacks.go b/generator/gen_callbacks.go
@@ -159,7 +159,7 @@ func (gen *Generator) writeCallbackProxyFunc(wr io.Writer, decl *tl.CDecl) {
 	var returnRef string
 	funcSpec := decl.Spec.(*tl.CFunctionSpec)
 	if funcSpec.Return != nil {
-		cgoSpec := gen.tr.CGoSpec(funcSpec.Return, true) // asArg?
+		cgoSpec := gen.tr.CGoSpec(funcSpec.Return, false)
 		returnRef = cgoSpec.String()
 	}
 	fmt.Fprintf(wr, "func %s", decl.Name)

diff --git a/translator/ast_walker.go b/translator/ast_walker.go
@@ -276,7 +276,13 @@ func (t *Translator) typeSpec(typ cc.Type, deep int, isRet bool) CType {
 			spec.AddOuterArr(uint64(size))
 		}
 	}
+	var isVoidPtr bool
 	for typ.Kind() == cc.Ptr {
+		if next := typ.Element(); next.Kind() == cc.Void {
+			isVoidPtr = true
+			spec.Base = "void*"
+			break
+		}
 		typ = typ.Element()
 		spec.Pointers++
 	}
@@ -287,6 +293,9 @@ func (t *Translator) typeSpec(typ cc.Type, deep int, isRet bool) CType {
 			spec.AddInnerArr(uint64(size))
 		}
 	}
+	if isVoidPtr {
+		return spec
+	}
 
 	switch typ.Kind() {
 	case cc.Void:

diff --git a/translator/translator.go b/translator/translator.go
@@ -855,13 +855,12 @@ func (t *Translator) CGoSpec(spec CType, asArg bool) CGoSpec {
 		cgo.Pointers = spec.GetPointers() - decl.Spec.GetPointers()
 	}
 	if typ, ok := spec.(*CTypeSpec); ok {
-		if typ.Base == "void" {
-			if cgo.Pointers > 0 {
-				cgo.Pointers--
-			}
+		if typ.Base == "void*" {
 			if len(typ.Raw) == 0 {
 				cgo.Base = "unsafe.Pointer"
 				return cgo
+			} else if !asArg {
+				cgo.Pointers++
 			}
 		}
 	}

diff --git a/translator/type_mapping.go b/translator/type_mapping.go
@@ -87,6 +87,8 @@ var builtinCTypeMap = CTypeMap{
 	// long complex double -> complex128
 	CTypeSpec{Base: "double", Long: true, Complex: true}: Complex128Spec,
 	// void* -> unsafe.Pointer
+	CTypeSpec{Base: "void*"}: UnsafePointerSpec,
+	// void* -> unsafe.Pointer
 	CTypeSpec{Base: "void", Pointers: 1}: UnsafePointerSpec,
 	// void -> [0]byte
 	CTypeSpec{Base: "void"}: VoidSpec,