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

Bug fix: delete exports.go if it is not needed.

Browse Source 
Clean up some warnings around deprecated methods and sending
the "initialize" message to NSObject.
This commit is contained in:
Greg 2019-05-10 02:23:07 -04:00
parent dcb7105fca
commit 2fe435f137
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wrap/main.go
View File

@ -357,7 +357,7 @@ func (w *Wrapper) AddEnum(n *ast.EnumDecl,rs []string) {
} }
for _,c := range n.Children() { for _,c := range n.Children() {
switch x := c.(type) { switch x := c.(type) {
case *ast.AvailabilityAttr, *ast.UnavailableAttr: case *ast.AvailabilityAttr, *ast.UnavailableAttr, *ast.DeprecatedAttr:
a.Add(x) a.Add(x)
case *ast.EnumConstantDecl: case *ast.EnumConstantDecl:
//fmt.Printf("*ast.EnumConstantDecl: (%s) '%s': %s\n",n.Type,n.Name,x.Name) //fmt.Printf("*ast.EnumConstantDecl: (%s) '%s': %s\n",n.Type,n.Name,x.Name)
@ -405,6 +405,9 @@ func (w *Wrapper) add(name string, ns []ast.Node) {
//} //}
case *ast.ObjCMethodDecl: case *ast.ObjCMethodDecl:
//fmt.Printf("ObjCMethodDecl: %s (%s) %s\n",x.Type,name,x.Name) //fmt.Printf("ObjCMethodDecl: %s (%s) %s\n",x.Type,name,x.Name)
if name == "NSObject" && x.Name == "initialize" {
continue
}
m := &Method{ m := &Method{
Name: x.Name, Name: x.Name,
Type: types.NewTypeFromString(x.Type,name), Type: types.NewTypeFromString(x.Type,name),
@ -484,7 +487,7 @@ func (a *Avail) Add(n ast.Node) {
Version: x.Version, Version: x.Version,
Deprecated: (x.Unknown1 != "0") || x.IsUnavailable, Deprecated: (x.Unknown1 != "0") || x.IsUnavailable,
}) })
case *ast.UnavailableAttr: case *ast.UnavailableAttr, *ast.DeprecatedAttr:
*a = append(*a, AvailAttr{ *a = append(*a, AvailAttr{
OS: "macos", Deprecated: true }) OS: "macos", Deprecated: true })
} }
@ -531,7 +534,7 @@ func (w *Wrapper) GetParms(n ast.Node,class string) ([]*Parameter,bool) {
j++ j++
case *ast.Variadic: case *ast.Variadic:
ret[j-1].Type.Variadic = true ret[j-1].Type.Variadic = true
case *ast.AvailabilityAttr, *ast.UnavailableAttr: case *ast.AvailabilityAttr, *ast.UnavailableAttr, *ast.DeprecatedAttr:
avail.Add(x) avail.Add(x)
case *ast.Unknown: case *ast.Unknown:
if Debug { fmt.Printf("GetParms(): ast.Unknown: %s\n",x.Name) } if Debug { fmt.Printf("GetParms(): ast.Unknown: %s\n",x.Name) }
@ -1193,12 +1196,9 @@ void*
fmt.Printf("%d functions\n", len(w.Functions)) fmt.Printf("%d functions\n", len(w.Functions))
fmt.Printf("%d enums\n", len(w.NamedEnums) + len(w.AnonEnums)) fmt.Printf("%d enums\n", len(w.NamedEnums) + len(w.AnonEnums))
of.WriteString("package " + w.Package + "\n\n") of.WriteString("package " + w.Package + "\n\n")
ef.WriteString("package " + w.Package + "\n\n")
of.WriteString(w.cgoFlags.String() + "\n") of.WriteString(w.cgoFlags.String() + "\n")
ef.WriteString(w.cgoFlags.String() + "\n")
of.WriteString(w.cImports.String() + "\n") of.WriteString(w.cImports.String() + "\n")
ef.WriteString(w.cImports.String() + "\n")
of.WriteString(w.cCode.String()) of.WriteString(w.cCode.String())
of.WriteString(` of.WriteString(`
@ -1215,6 +1215,10 @@ import (
of.WriteString(w.goCode.String()) of.WriteString(w.goCode.String())
of.Close() of.Close()
if len(w.Delegates) > 0 {
ef.WriteString("package " + w.Package + "\n\n")
ef.WriteString(w.cgoFlags.String() + "\n")
ef.WriteString(w.cImports.String() + "\n")
ef.WriteString(` ef.WriteString(`
*/ */
import "C" import "C"
@ -1225,4 +1229,12 @@ import (
`) `)
ef.WriteString(w.goExports.String()) ef.WriteString(w.goExports.String())
ef.Close() ef.Close()
} else {
ef.Close()
err := os.Remove(path.Join(w.Package,"exports.go"))
if err != nil {
fmt.Printf("Error removing 'exports.go'. %s\n",err)
os.Exit(-1)
}
}
} }