gmp/nswrap
3
0
Fork 0
Code Issues 2 Pull Requests Wiki Activity

Simplify polymorphic implementation, bug fix to variadic functions.

Browse Source
This commit is contained in:
Greg 2019-05-28 13:20:44 -04:00
parent 154a2fac14
commit 86b27e6c42
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wrap/main.go
View File

@ -174,14 +174,12 @@ type Protocol struct {
type MethodCollection struct { type MethodCollection struct {
Class string Class string
Methods []*Method Methods []*Method
Polymorphic map[string]int
} }
func NewMethodCollection(class string) *MethodCollection { func NewMethodCollection(class string) *MethodCollection {
ret := &MethodCollection{ ret := &MethodCollection{
Class: class, Class: class,
Methods: []*Method{}, Methods: []*Method{},
Polymorphic: map[string]int{},
} }
return ret return ret
} }
@ -275,7 +273,7 @@ func (w Wrapper) objcparamlist(m *Method) string {
first = false first = false
} else { } else {
if p.Type.Variadic { if p.Type.Variadic {
str := []string{m.Name + ":arr[0]"} str := []string{p.Pname + ":arr[0]"}
for i := 1; i < w.Vaargs; i++ { for i := 1; i < w.Vaargs; i++ {
str = append(str,"arr["+strconv.Itoa(i)+"]") str = append(str,"arr["+strconv.Itoa(i)+"]")
} }
@ -402,8 +400,6 @@ func (w *Wrapper) AddProtocol(n *ast.ObjCProtocolDecl) {
//p.GoName = types.NewTypeFromString(n.Name,n.Name).GoType() //p.GoName = types.NewTypeFromString(n.Name,n.Name).GoType()
p.ClassMethods = NewMethodCollection(n.Name) p.ClassMethods = NewMethodCollection(n.Name)
p.InstanceMethods = NewMethodCollection(n.Name) p.InstanceMethods = NewMethodCollection(n.Name)
p.ClassMethods.Polymorphic = map[string]int{}
p.InstanceMethods.Polymorphic = map[string]int{}
} }
//fmt.Printf("Protocol %s\n",p.Name) //fmt.Printf("Protocol %s\n",p.Name)
for _,c := range n.Children() { for _,c := range n.Children() {
@ -435,7 +431,6 @@ func (w *Wrapper) AddMethod(p *MethodCollection, x *ast.ObjCMethodDecl) {
m.Parameters, avail = w.GetParms(x,p.Class) m.Parameters, avail = w.GetParms(x,p.Class)
if avail { if avail {
//fmt.Printf("%s: Adding %s (%d)\n",p.Class,m.Name,len(m.Parameters)) //fmt.Printf("%s: Adding %s (%d)\n",p.Class,m.Name,len(m.Parameters))
p.Polymorphic[m.Name] = p.Polymorphic[m.Name] + 1
//fmt.Printf("--Method name is %s\n",m.Name) //fmt.Printf("--Method name is %s\n",m.Name)
p.Methods = append(p.Methods,m) p.Methods = append(p.Methods,m)
} }