generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Documentation: fixed operators regex; added varargs support

Browse Source
This commit is contained in:
Andrey Kamaev 2012-05-29 15:42:38 +00:00
parent cf25f572a6
commit aaf043e7ba
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/ocv.py
View File

@ -295,7 +295,7 @@ class OCVPyXRefRole(XRefRole):
########################### C/C++/Java Part ########################### ########################### C/C++/Java Part ###########################
_identifier_re = re.compile(r'(~?\b[a-zA-Z_][a-zA-Z0-9_]*\b)') _identifier_re = re.compile(r'(~?\b[a-zA-Z_][a-zA-Z0-9_]*\b)')
_argument_name_re = re.compile(r'(~?\b[a-zA-Z_][a-zA-Z0-9_]*\b(?:\[\d*\])?)') _argument_name_re = re.compile(r'(~?\b[a-zA-Z_][a-zA-Z0-9_]*\b(?:\[\d*\])?|\.\.\.)')
_whitespace_re = re.compile(r'\s+(?u)') _whitespace_re = re.compile(r'\s+(?u)')
_string_re = re.compile(r"[LuU8]?('([^'\\]*(?:\\.[^'\\]*)*)'" _string_re = re.compile(r"[LuU8]?('([^'\\]*(?:\\.[^'\\]*)*)'"
r'|"([^"\\]*(?:\\.[^"\\]*)*)")', re.S) r'|"([^"\\]*(?:\\.[^"\\]*)*)")', re.S)
@ -304,10 +304,10 @@ _operator_re = re.compile(r'''(?x)
\[\s*\] \[\s*\]
| \(\s*\) | \(\s*\)
| (<<|>>)=? | (<<|>>)=?
| \+\+ | -- | ->\*?
| [!<>=/*%+|&^-]=? | [!<>=/*%+|&^-]=?
| \+\+ | --
| ~ | && | \| | \|\| | ~ | && | \| | \|\|
| ->\*? | \, | \,
''') ''')
_id_shortwords = { _id_shortwords = {
@ -793,7 +793,6 @@ class DefinitionParser(object):
if self.match(_operator_re): if self.match(_operator_re):
return NameDefExpr('operator' + return NameDefExpr('operator' +
_whitespace_re.sub('', self.matched_text)) _whitespace_re.sub('', self.matched_text))
# new/delete operator? # new/delete operator?
for allocop in 'new', 'delete': for allocop in 'new', 'delete':
if not self.skip_word(allocop): if not self.skip_word(allocop):
@ -1009,8 +1008,13 @@ class DefinitionParser(object):
self.skip_ws() self.skip_ws()
argtype = self._parse_type() argtype = self._parse_type()
argname = default = None
self.skip_ws() self.skip_ws()
if unicode(argtype) == u"...":
if not self.skip_string(')'):
self.fail("var arg must be the last argument")
args.append(ArgumentDefExpr(None, argtype, None))
break
argname = default = None
if self.skip_string('='): if self.skip_string('='):
self.pos += 1 self.pos += 1
default = self._parse_default_expr() default = self._parse_default_expr()