diff options
| author | Georg Brandl <georg@python.org> | 2015-07-21 17:11:15 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2015-07-21 17:11:15 +0200 |
| commit | cc457136465d80cf9b8882b7ff1090d1585c6a1b (patch) | |
| tree | fe645fc50b153ce5097d7c28f7d0adec530b6622 | |
| parent | de91f486af4a31618406b4c14e1fc185348e5de0 (diff) | |
| parent | 71923e58fde76713a236a47653990f7f610b9d3e (diff) | |
| download | pygments-cc457136465d80cf9b8882b7ff1090d1585c6a1b.tar.gz | |
Merged in erikrose/pygments-main (pull request #441)
#1081: Revert e19e3591780ae26aaa0c2a672771192f71c28b50 to fix a case of pathological slowness.
| -rw-r--r-- | pygments/lexers/c_cpp.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pygments/lexers/c_cpp.py b/pygments/lexers/c_cpp.py index bbac406e..35ea517f 100644 --- a/pygments/lexers/c_cpp.py +++ b/pygments/lexers/c_cpp.py @@ -28,8 +28,10 @@ class CFamilyLexer(RegexLexer): #: optional Comment or Whitespace _ws = r'(?:\s|//.*?\n|/[*].*?[*]/)+' + + # The trailing ?, rather than *, avoids a geometric performance drop here. #: only one /* */ style comment - _ws1 = r'\s*(?:/[*].*?[*]/\s*)*' + _ws1 = r'\s*(?:/[*].*?[*]/\s*)?' tokens = { 'whitespace': [ |