Improved type handling.

This commit is contained in:
gmp
2019-04-11 11:46:24 -04:00
parent 2fbd9134a0
commit 74f4073d35
5 changed files with 195 additions and 75 deletions
+6 -4
View File
@@ -191,13 +191,13 @@ func Parse(fullline string) Node {
case "ObjCImplementation":
return parseObjCImplementation(line)
case "ObjCInterface":
return parseObjCInterface(line)
case "ObjCInterfaceType":
return parseObjCInterfaceType(line)
return parseObjCInterface(line,false)
case "super ObjCInterface":
return parseSuperObjCInterface(line)
return parseObjCInterface(line,true)
case "ObjCInterfaceDecl":
return parseObjCInterfaceDecl(line)
case "ObjCInterfaceType":
return parseObjCInterfaceType(line)
case "getter ObjCMethod":
return parseObjCMethod(line)
case "ObjCMethod":
@@ -272,6 +272,8 @@ func Parse(fullline string) Node {
return parseUnaryExprOrTypeTraitExpr(line)
case "UnaryOperator":
return parseUnaryOperator(line)
case "UnavailableAttr":
return parseUnavailableAttr(line)
case "UnusedAttr":
return parseUnusedAttr(line)
case "VAArgExpr":
+2 -8
View File
@@ -8,13 +8,7 @@ type ObjCInterface struct {
ChildNodes []Node
}
func parseSuperObjCInterface(line string) *ObjCInterface {
ret := parseObjCInterface(line)
ret.Super = true
return ret
}
func parseObjCInterface(line string) *ObjCInterface {
func parseObjCInterface(line string, super bool) *ObjCInterface {
groups := groupsFromRegex(
"'(?P<name>.*)'",
line,
@@ -23,7 +17,7 @@ func parseObjCInterface(line string) *ObjCInterface {
return &ObjCInterface{
Addr: ParseAddress(groups["address"]),
Name: groups["name"],
Super: false,
Super: super,
ChildNodes: []Node{},
}
}
+55
View File
@@ -0,0 +1,55 @@
package ast
import (
"strings"
)
// UnavailableAttr is node represents an unavailable attribute.
type UnavailableAttr struct {
Addr Address
Pos Position
Position2 string
Content string
ChildNodes []Node
}
func parseUnavailableAttr(line string) *UnavailableAttr {
groups := groupsFromRegex(
`(?:prev (?P<prev>0x[0-9a-f]+) )?
<(?P<position><invalid sloc>|.*?)>
(?P<position2> <invalid sloc>| col:\d+| line:\d+:\d+)?
(?P<content>.*)`,
line,
)
return &UnavailableAttr{
Addr: ParseAddress(groups["address"]),
Pos: NewPositionFromString(groups["position"]),
Position2: strings.TrimSpace(groups["position2"]),
Content: strings.TrimSpace(groups["content"]),
ChildNodes: []Node{},
}
}
// AddChild adds a new child node. Child nodes can then be accessed with the
// Children attribute.
func (n *UnavailableAttr) AddChild(node Node) {
n.ChildNodes = append(n.ChildNodes, node)
}
// Address returns the numeric address of the node. See the documentation for
// the Address type for more information.
func (n *UnavailableAttr) Address() Address {
return n.Addr
}
// Children returns the child nodes. If this node does not have any children or
// this node does not support children it will always return an empty slice.
func (n *UnavailableAttr) Children() []Node {
return n.ChildNodes
}
// Position returns the position in the original source code.
func (n *UnavailableAttr) Position() Position {
return n.Pos
}