Skip to content

Commit

Permalink
Merge pull request #32 from robotpy/yup
Browse files Browse the repository at this point in the history 
Yup
  • Loading branch information
@virtuald
virtuald authored Dec 27, 2019
2 parents 5432b45 + f6109d2 commit da9a33c
Show file tree
Hide file tree
Showing 3 changed files with 144 additions and 57 deletions.
145 changes: 88 additions & 57 deletions CppHeaderParser/CppHeaderParser.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,9 @@ def is_method_namestack(stack):
elif "{" in stack and stack.index("{") < stack.index("("):
r = False # struct that looks like a method/class
elif "(" in stack and ")" in stack:
if "{" in stack and "}" in stack:
if stack[-1] == ":":
r = True
elif "{" in stack and "}" in stack:
r = True
elif stack[-1] == ";":
if is_function_pointer_stack(stack):
Expand Down Expand Up @@ -255,11 +257,13 @@ def _split_namespace(namestack):
:rtype: Tuple[str, list]
"""
# TODO: this should be using tokens instead of nhack

last_colon = None
for i, n in enumerate(namestack):
if n == ":":
if n == "::":
last_colon = i
if i and n != ":" and not _nhack.match(n):
if i and n != "::" and not _nhack.match(n):
break

if last_colon:
Expand Down Expand Up @@ -472,12 +476,8 @@ def _parse_cppclass_name(c, stack):
if t == ":":
if i >= sl:
raise CppParseError("class decl ended with ':'")
t = stack[i]
if t != ":":
# reached the base declaration
break

i += 1
break
elif t == "::":
name += "::"
continue
elif t == "final":
Expand Down Expand Up @@ -954,7 +954,7 @@ def __init__(self, nameStack, curClass, methinfo, curTemplate, doxygen, location
if len(self["rtnType"]) == 0 or self["name"] == curClass:
self["rtnType"] = "void"

self["rtnType"] = self["rtnType"].replace(" : : ", "::")
self["rtnType"] = self["rtnType"].replace(" :: ", "::")
self["rtnType"] = self["rtnType"].replace(" < ", "<")
self["rtnType"] = self["rtnType"].replace(" > ", "> ").replace(">>", "> >")
self["rtnType"] = self["rtnType"].replace(" ,", ",")
Expand Down Expand Up @@ -996,22 +996,6 @@ def __init__(self, nameStack, curClass, methinfo, curTemplate, doxygen, location
self.update(methinfo)
set_location_info(self, location)

# Filter out initializer lists used in constructors
try:
paren_depth_counter = 0
for i in range(0, len(nameStack)):
elm = nameStack[i]
if elm == "(":
paren_depth_counter += 1
if elm == ")":
paren_depth_counter -= 1
if paren_depth_counter == 0 and nameStack[i + 1] == ":":
debug_print("Stripping out initializer list")
nameStack = nameStack[: i + 1]
break
except:
pass

paramsStack = self._params_helper1(nameStack)

debug_print("curTemplate: %s", curTemplate)
Expand Down Expand Up @@ -1959,8 +1943,8 @@ def finalize(self):
)
meth["returns_unknown"] = True

if meth["returns"].startswith(": : "):
meth["returns"] = meth["returns"].replace(": : ", "::")
if meth["returns"].startswith(":: "):
meth["returns"] = meth["returns"].replace(":: ", "::")

for cls in list(self.classes.values()):
methnames = cls.get_all_method_names()
Expand Down Expand Up @@ -1992,11 +1976,9 @@ def finalize(self):

def parse_method_type(self, stack):
trace_print("meth type info", stack)
if stack[0] in ":;" and stack[1] != ":":
stack = stack[1:]
info = {
"debug": " ".join(stack)
.replace(" : : ", "::")
.replace(" :: ", "::")
.replace(" < ", "<")
.replace(" > ", "> ")
.replace(" >", ">")
Expand All @@ -2010,7 +1992,7 @@ def parse_method_type(self, stack):

header = stack[: stack.index("(")]
header = " ".join(header)
header = header.replace(" : : ", "::")
header = header.replace(" :: ", "::")
header = header.replace(" < ", "<")
header = header.replace(" > ", "> ")
header = header.replace("default ", "default")
Expand All @@ -2022,6 +2004,10 @@ def parse_method_type(self, stack):
self.braceHandled = True
elif stack[-1] == ";":
info["defined"] = False
elif stack[-1] == ":":
info["defined"] = True
self._discard_ctor_initializer()
self.braceHandled = True
else:
assert 0

Expand Down Expand Up @@ -2452,6 +2438,7 @@ def evalute_forward_decl(self):
"+",
"STRING_LITERAL",
"ELLIPSIS",
"DBL_COLON",
"SHIFT_LEFT",
}

Expand Down Expand Up @@ -2651,6 +2638,7 @@ def __init__(self, headerFileName, argType="file", encoding=None, **kwargs):
#

self._doxygen_cache = None
self.braceHandled = False
tok = None
self.stmtTokens = []

Expand Down Expand Up @@ -2809,6 +2797,12 @@ def __init__(self, headerFileName, argType="file", encoding=None, **kwargs):
self.nameStack = []
self.stack = []
self.stmtTokens = []
elif is_method_namestack(self.stack):
debug_print("trace")
self._evaluate_method_stack()
self.nameStack = []
self.stack = []
self.stmtTokens = []
else:
self.nameStack.append(tok.value)

Expand Down Expand Up @@ -2874,6 +2868,7 @@ def __init__(self, headerFileName, argType="file", encoding=None, **kwargs):
for key in [
"_precomp_macro_buf",
"_doxygen_cache",
"braceHandled",
"lex",
"nameStack",
"nameSpaces",
Expand Down Expand Up @@ -2926,7 +2921,7 @@ def _parse_error(self, tokens, expected):
def _next_token_must_be(self, *tokenTypes):
tok = self.lex.token()
if tok.type not in tokenTypes:
raise self._parse_error((tok,), " or ".join(tokenTypes))
raise self._parse_error((tok,), "' or '".join(tokenTypes))
return tok

_end_balanced_tokens = {">", "}", "]", ")", "DBL_RBRACKET"}
Expand Down Expand Up @@ -2986,6 +2981,59 @@ def _discard_contents(self, start_type, end_type):
if level == 0:
break

def _discard_ctor_initializer(self):
"""
ctor_initializer: ":" mem_initializer_list
mem_initializer_list: mem_initializer ["..."]
| mem_initializer "," mem_initializer_list ["..."]
mem_initializer: mem_initializer_id "(" [expression_list] ")"
| mem_initializer_id braced_init_list
mem_initializer_id: class_or_decltype
| IDENTIFIER
"""
debug_print("discarding ctor intializer")
# all of this is discarded.. the challenge is to determine
# when the initializer ends and the function starts
while True:
tok = self.lex.token()
if tok.type == "DBL_COLON":
tok = self.lex.token()

if tok.type == "decltype":
tok = self._next_token_must_be("(")
self._consume_balanced_tokens(tok)
tok = self.lex.token()

# each initializer is either foo() or foo{}, so look for that
while True:
if tok.type not in ("{", "("):
tok = self.lex.token()
continue

if tok.type == "{":
self._discard_contents("{", "}")
elif tok.type == "(":
self._discard_contents("(", ")")

tok = self.lex.token()
break

# at the end
if tok.type == "ELLIPSIS":
tok = self.lex.token()

if tok.type == ",":
continue
elif tok.type == "{":
# reached the function
self._discard_contents("{", "}")
return
else:
raise self._parse_error((tok,), ",' or '{")

def _evaluate_stack(self, token=None):
"""Evaluates the current name stack"""

Expand Down Expand Up @@ -3076,24 +3124,10 @@ def _evaluate_stack(self, token=None):
self.using[alias] = atype
elif is_method_namestack(self.stack) and "(" in self.nameStack:
debug_print("trace")
if self.braceDepth > 0:
if (
"{" in self.stack
and self.stack[0] != "{"
and self.stack[-1] == ";"
and self.braceDepth == 1
):
# Special case of a method defined outside a class that has a body
pass
else:
self._evaluate_method_stack()
else:
# Free function
self._evaluate_method_stack()
self._evaluate_method_stack()
elif is_enum_namestack(self.nameStack):
debug_print("trace")
self._parse_enum()
self.nameStack = []
self.stack = []
self.stmtTokens = []
elif (
Expand Down Expand Up @@ -3137,25 +3171,22 @@ def _evaluate_stack(self, token=None):

elif not self.curClass:
debug_print("trace")
self.nameStack = []
elif self.braceDepth < 1:
debug_print("trace")
# Ignore global stuff for now
debug_print("Global stuff: %s" % self.nameStack)
self.nameStack = []
elif self.braceDepth > len(self.nameSpaces) + 1:
debug_print("trace")
self.nameStack = []
else:
debug_print("Discarded statement %s" % (self.nameStack,))

try:
self.nameStackHistory[self.braceDepth] = (nameStackCopy, self.curClass)
except:
self.nameStackHistory.append((nameStackCopy, self.curClass))
self.nameStack = (
[]
) # its a little confusing to have some if/else above return and others not, and then clearning the nameStack down here

# its a little confusing to have some if/else above return and others not, and then clearning the nameStack down here
self.nameStack = []
self.lex.doxygenCommentCache = ""
self.curTemplate = None

Expand All @@ -3164,7 +3195,7 @@ def _parse_template(self):
consumed = self._consume_balanced_tokens(tok)
tmpl = " ".join(tok.value for tok in consumed)
tmpl = (
tmpl.replace(" : : ", "::")
tmpl.replace(" :: ", "::")
.replace(" <", "<")
.replace("< ", "<")
.replace(" >", ">")
Expand Down Expand Up @@ -3364,10 +3395,10 @@ def _parse_enumerator_list(self, values):
while True:
tok = self.lex.token()
if tok.type == "}":
value["value"] = (" ".join(v)).replace(": :", "::")
value["value"] = " ".join(v)
return
elif tok.type == ",":
value["value"] = (" ".join(v)).replace(": :", "::")
value["value"] = " ".join(v)
break
elif tok.type in self._balanced_token_map:
v.extend(t.value for t in self._consume_balanced_tokens(tok))
Expand Down
2 changes: 2 additions & 0 deletions CppHeaderParser/lexer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class Lexer(object):
"ELLIPSIS",
"DBL_LBRACKET",
"DBL_RBRACKET",
"DBL_COLON",
"SHIFT_LEFT",
]

Expand Down Expand Up @@ -85,6 +86,7 @@ def t_COMMENT_SINGLELINE(self, t):
t_ELLIPSIS = r"\.\.\."
t_DBL_LBRACKET = r"\[\["
t_DBL_RBRACKET = r"\]\]"
t_DBL_COLON = r"::"
t_SHIFT_LEFT = r"<<"
# SHIFT_RIGHT introduces ambiguity

Expand Down
54 changes: 54 additions & 0 deletions CppHeaderParser/test/test_CppHeaderParser.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3366,5 +3366,59 @@ def test_nothing(self):
self.assertEqual(self.cppHeader.functions, [])


class InitializerWithInitializerList_TestCase(unittest.TestCase):
def setUp(self):
self.cppHeader = CppHeaderParser.CppHeader(
"""
struct ComplexInit : SomeBase {
ComplexInit(int i) :
m_stuff{i,2}
{
auto i = something();
}
void fn();
std::vector<int> m_stuff;
};
template <typename T>
class future final {
public:
template <typename R>
future(future<R>&& oth) noexcept
: future(oth.then([](R&& val) -> T { return val; })) {}
};
""",
"string",
)

def test_cls_props(self):
c = self.cppHeader.classes["ComplexInit"]
self.assertEqual(2, len(c["methods"]["public"]))
self.assertEqual(0, len(c["methods"]["private"]))
self.assertEqual(0, len(c["methods"]["private"]))
self.assertEqual(1, len(c["properties"]["public"]))
self.assertEqual(0, len(c["properties"]["private"]))
self.assertEqual(0, len(c["properties"]["protected"]))

self.assertEqual(c["methods"]["public"][0]["name"], "ComplexInit")
self.assertEqual(c["methods"]["public"][1]["name"], "fn")

self.assertEqual(c["properties"]["public"][0]["name"], "m_stuff")

def test_future(self):
c = self.cppHeader.classes["future"]
self.assertEqual(1, len(c["methods"]["public"]))
self.assertEqual(0, len(c["methods"]["private"]))
self.assertEqual(0, len(c["methods"]["private"]))
self.assertEqual(0, len(c["properties"]["public"]))
self.assertEqual(0, len(c["properties"]["private"]))
self.assertEqual(0, len(c["properties"]["protected"]))
self.assertEqual(c["methods"]["public"][0]["name"], "future")


if __name__ == "__main__":
unittest.main()

0 comments on commit da9a33c

Please sign in to comment.