IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small refactoring for how modifiers are parsed in the C++ domain.

Browse Source
This commit is contained in:
Armin Ronacher 2011-09-22 10:54:16 +02:00
parent 9753d743fc
commit deda15bed3
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sphinx/domains/cpp.py
View File

@ -525,6 +525,12 @@ class DefinitionParser(object):
def skip_ws(self):
return self.match(_whitespace_re)
def skip_word_and_ws(self, word):
if self.skip_word(word):
self.skip_ws()
return True
return False
@property
def eof(self):
return self.pos >= self.end
@ -765,9 +771,7 @@ class DefinitionParser(object):
args.append(ArgumentDefExpr(argtype, argname, default))
self.skip_ws()
const = self.skip_word('const')
if const:
self.skip_ws()
const = self.skip_word_and_ws('const')
if self.skip_string('='):
self.skip_ws()
if not (self.skip_string('0') or \
@ -782,7 +786,7 @@ class DefinitionParser(object):
return args, const, pure_virtual
def _parse_visibility_static(self):
visibility = 'public'
visibility = 'public'
if self.match(_visibility_re):
visibility = self.matched_text
static = self.skip_word('static')
@ -815,13 +819,8 @@ class DefinitionParser(object):
def parse_function(self):
visibility, static = self._parse_visibility_static()
def _read_word(x):
if self.skip_word(x):
self.skip_ws()
return True
return False
explicit = _read_word('explicit')
constexpr = _read_word('constexpr')
explicit = self.skip_word_and_ws('explicit')
constexpr = self.skip_word_and_ws('constexpr')
rv = self._parse_type()
self.skip_ws()