Commit ae3c754b authored by Andrey Kamaev's avatar Andrey Kamaev

Fixed Java API build

parent a2024897
...@@ -589,9 +589,8 @@ class ClassInfo(object): ...@@ -589,9 +589,8 @@ class ClassInfo(object):
self.jname = m[1:] self.jname = m[1:]
self.base = '' self.base = ''
if decl[1]: if decl[1]:
self.base = re.sub(r"\b"+self.jname+r"\b", "", decl[1].replace(":", "")).strip() #self.base = re.sub(r"\b"+self.jname+r"\b", "", decl[1].replace(":", "")).strip()
self.base = re.sub(r"^.*:", "", decl[1].split(",")[0]).strip().replace(self.jname, "")
class ArgInfo(object): class ArgInfo(object):
def __init__(self, arg_tuple): # [ ctype, name, def val, [mod], argno ] def __init__(self, arg_tuple): # [ ctype, name, def val, [mod], argno ]
......
...@@ -143,7 +143,7 @@ class RstParser(object): ...@@ -143,7 +143,7 @@ class RstParser(object):
#if section_name.find(" ") >= 0 and section_name.find("::operator") < 0: #if section_name.find(" ") >= 0 and section_name.find("::operator") < 0:
if section_name.find(" ") >= 0 and not bool(re.match(r"(\w+::)*operator\s*(\w+|>>|<<|\(\)|->|\+\+|--|=|==|\+=|-=)", section_name)): if section_name.find(" ") >= 0 and not bool(re.match(r"(\w+::)*operator\s*(\w+|>>|<<|\(\)|->|\+\+|--|=|==|\+=|-=)", section_name)):
if show_errors: if show_errors:
print "RST parser warning W%03d: SKIPPED: \"%s\" File: %s:%s" % (WARNING_002_HDRWHITESPACE, section_name, file_name, lineno) print >> sys.stderr, "RST parser warning W%03d: SKIPPED: \"%s\" File: %s:%s" % (WARNING_002_HDRWHITESPACE, section_name, file_name, lineno)
self.sections_skipped += 1 self.sections_skipped += 1
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment