Add constants for C enum types. Add NSEnumerator helper. Fix

bugs in Go class names. Add "Frameworks" option to nswrap.toml.
Improve handling of ast.EnumDecl and ast.EnumConstantDecl.
This commit is contained in:
gmp
2019-05-02 14:14:29 -04:00
parent 9b71889a69
commit 758ea40679
7 changed files with 219 additions and 52 deletions
+16 -4
View File
@@ -1,5 +1,9 @@
package ast
import (
"strings"
)
// EnumConstantDecl is node represents a enum constant declaration.
type EnumConstantDecl struct {
Addr Address
@@ -8,6 +12,7 @@ type EnumConstantDecl struct {
Referenced bool
Name string
Type string
Type2 string
ChildNodes []Node
}
@@ -16,18 +21,25 @@ func parseEnumConstantDecl(line string) *EnumConstantDecl {
`<(?P<position>.*)>
( (?P<position2>[^ ]+))?
( (?P<referenced>referenced))?
(?P<name>.+)
'(?P<type>.+?)'`,
(?P<name> \w+)
(?P<type> '.*?')?
(?P<type2>:'.*?')?`,
line,
)
type2 := groups["type2"]
if type2 != "" {
type2 = type2[2 : len(type2)-1]
}
return &EnumConstantDecl{
Addr: ParseAddress(groups["address"]),
Pos: NewPositionFromString(groups["position"]),
Position2: groups["position2"],
Referenced: len(groups["referenced"]) > 0,
Name: groups["name"],
Type: groups["type"],
Name: strings.TrimSpace(groups["name"]),
Type: removeQuotes(groups["type"]),
Type2: type2,
ChildNodes: []Node{},
}
}
+15 -1
View File
@@ -10,20 +10,34 @@ type EnumDecl struct {
Pos Position
Position2 string
Name string
Type string
Type2 string
ChildNodes []Node
}
func parseEnumDecl(line string) *EnumDecl {
groups := groupsFromRegex(
`(?:prev (?P<prev>0x[0-9a-f]+) )?<(?P<position>.*)>(?P<position2> .+:\d+)?(?P<name>.*)`,
`(?:prev (?P<prev>0x[0-9a-f]+) )?
<(?P<position>.*)>
(?P<position2> .+:\d+)?
(?P<name> \w+)?
(?P<type> '.*?')?
(?P<type2>:'.*')?`,
line,
)
type2 := groups["type2"]
if type2 != "" {
type2 = type2[2 : len(type2)-1]
}
return &EnumDecl{
Addr: ParseAddress(groups["address"]),
Pos: NewPositionFromString(groups["position"]),
Position2: groups["position2"],
Name: strings.TrimSpace(groups["name"]),
Type: removeQuotes(groups["type"]),
Type2: type2,
ChildNodes: []Node{},
}
}