diff options
| author | Matthäus G. Chajdas <dev@anteru.net> | 2020-01-07 21:10:52 +0100 |
|---|---|---|
| committer | Matthäus G. Chajdas <dev@anteru.net> | 2020-01-07 21:10:52 +0100 |
| commit | c7751058ec70e380fa57b7a8db102c1a8a37c25c (patch) | |
| tree | e1097d74aedbe4aef48f9fdcab0c3b74ce48ae9f /pygments/lexers/php.py | |
| parent | d55d8be8da86fb5a273263375fab90993ddb7e9e (diff) | |
| parent | 4f8b0b66ebb7ea5695441d5a97ac836b75e97e7a (diff) | |
| download | pygments-git-c7751058ec70e380fa57b7a8db102c1a8a37c25c.tar.gz | |
Merge branch 'master' into 671/upsuper/webidl
This allows us to resolve the merge conflict properly.
Diffstat (limited to 'pygments/lexers/php.py')
| -rw-r--r-- | pygments/lexers/php.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pygments/lexers/php.py b/pygments/lexers/php.py index bd4a2376..680f0573 100644 --- a/pygments/lexers/php.py +++ b/pygments/lexers/php.py @@ -50,13 +50,14 @@ class ZephirLexer(RegexLexer): include('commentsandwhitespace'), (r'/(\\.|[^[/\\\n]|\[(\\.|[^\]\\\n])*])+/' r'([gim]+\b|\B)', String.Regex, '#pop'), + (r'/', Operator, '#pop'), default('#pop') ], 'badregex': [ (r'\n', Text, '#pop') ], 'root': [ - (r'^(?=\s|/|<!--)', Text, 'slashstartsregex'), + (r'^(?=\s|/)', Text, 'slashstartsregex'), include('commentsandwhitespace'), (r'\+\+|--|~|&&|\?|:|\|\||\\(?=\n)|' r'(<<|>>>?|==?|!=?|->|[-<>+*%&|^/])=?', Operator, 'slashstartsregex'), |