Better handling of multiple classes and input files. Handle

Objective C type parameter declarations. Check Typedefs when
determining if a Type is a pointer or a function.
This commit is contained in:
gmp
2019-04-26 22:44:30 -04:00
parent 6135381cc7
commit 977a09e77e
17 changed files with 466 additions and 42 deletions
+103
View File
@@ -0,0 +1,103 @@
package ClassOne
/*
#cgo CFLAGS: -x objective-c
#cgo LDFLAGS: -framework Foundation
#import "simple.h"
ClassOne*
NewClassOne() {
return [ClassOne alloc];
}
int
ClassOne_geti1(void* obj) {
return [(id)obj geti1];
}
int*
ClassOne_getp1(void* obj) {
return [(id)obj getp1];
}
int
ClassOne_hi1(void* obj, struct stru in) {
return [(id)obj hi1:in];
}
int
ClassOne_hi2(void* obj, void* in) {
return [(id)obj hi2:in];
}
struct stru
ClassOne_nstru1(void* obj) {
return [(id)obj nstru1];
}
struct stru*
ClassOne_nstru2(void* obj) {
return [(id)obj nstru2];
}
ClassOne*
ClassOne_init(void* obj) {
return [(id)obj init];
}
*/
import "C"
import (
"unsafe"
)
//ClassOne*
type ClassOne struct { NSObject }
//NSObject*
type NSObject struct { ptr unsafe.Pointer }
//int
type Int C.int
//struct stru
type Stru C.struct_stru
func NewClassOne() *ClassOne {
ret := &ClassOne{}
ret.ptr = unsafe.Pointer(C.NewClassOne())
//ret = ret.Init()
return ret
}
func (o *ClassOne) Geti1() Int {
return (Int)(C.ClassOne_geti1(o.ptr))
}
func (o *ClassOne) Getp1() *Int {
return (*Int)(unsafe.Pointer(C.ClassOne_getp1(o.ptr)))
}
func (o *ClassOne) Hi1(in Stru) Int {
return (Int)(C.ClassOne_hi1(o.ptr, (C.struct_stru)(in)))
}
func (o *ClassOne) Hi2(in *Stru) Int {
return (Int)(C.ClassOne_hi2(o.ptr, unsafe.Pointer(in)))
}
func (o *ClassOne) Nstru1() Stru {
return (Stru)(C.ClassOne_nstru1(o.ptr))
}
func (o *ClassOne) Nstru2() *Stru {
return (*Stru)(unsafe.Pointer(C.ClassOne_nstru2(o.ptr)))
}
func (o *ClassOne) Init() *ClassOne {
ret := &ClassOne{}
ret.ptr = unsafe.Pointer(C.ClassOne_init(o.ptr))
return ret
}
+22
View File
@@ -0,0 +1,22 @@
#import <Foundation/Foundation.h>
struct stru {int a,b;};
@interface ClassOne : NSObject
{
int i1;
int *p1;
int a1[2];
int (*f)();
}
- (ClassOne*) init;
- (int) geti1;
- (int *) getp1;
- (int (*)()) getf1;
- (int) hi1:(struct stru)in;
- (int) hi2:(struct stru*)in;
- (struct stru) nstru1;
- (struct stru*) nstru2;
@end
+59
View File
@@ -0,0 +1,59 @@
#import "simple.h"
@implementation ClassOne
- (ClassOne*) init
{
ClassOne *ret;
ret = [ClassOne alloc];
ret->i1 = 12;
ret->p1 = malloc(sizeof(int));
*ret->p1 = 16;
ret->a1[0] = 4;
ret ->a1[1] = 5;
return ret;
}
- (int) geti1
{
return i1;
}
- (int *) getp1
{
return p1;
}
- (int (*)()) getf1
{
return f;
}
- (int) hi1:(struct stru)in
{
return in.a;
}
- (int) hi2:(struct stru*)in
{
return in->a;
}
- (struct stru) nstru1
{
struct stru ret;
ret.a = 7;
ret.b = 8;
return ret;
}
- (struct stru*) nstru2
{
struct stru* ret;
ret = malloc(sizeof(struct stru));
ret->a = 9;
ret->b = 10;
return ret;
}
@end
+21
View File
@@ -0,0 +1,21 @@
package main
import (
"fmt"
"gitlab.wow.st/gmp/nswrap/examples/simple/ClassOne"
)
func main() {
o := ClassOne.NewClassOne().Init()
fmt.Println("i1 = ",o.Geti1())
fmt.Println("p1 = ",o.Getp1())
p1 := o.Getp1()
fmt.Println("*p1 = ", *p1)
*p1 = 17
fmt.Println("*p1 = ", *o.Getp1())
ns := o.Nstru1()
np := o.Nstru2()
fmt.Println(o.Hi1(ns))
fmt.Println(o.Hi2(np))
}
+4
View File
@@ -0,0 +1,4 @@
Package = "ClassOne"
InputFiles = [ "ClassOne/simple.h" ]
Classes = [ "ClassOne" ]
Imports = [ "simple.h" ]