diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-02-06 09:38:50 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-02-06 09:38:50 +0100 |
| commit | 45d2df5f119d17804ccf6068cbe1132e118579b2 (patch) | |
| tree | e3014245763e4290de480fad0b1142728314b965 /Zend/zend_language_scanner.l | |
| parent | b33060af82c648bb3971de9d8fe67e52781cbd7a (diff) | |
| parent | e5ded6e843fc43dde4b6c65405a1d3e2ae026eb4 (diff) | |
| download | php-git-broken-5.6-20140206.tar.gz | |
Merge branch 'datibbaw/pow-operator' into PHP-5.6broken-5.6-20140206
Diffstat (limited to 'Zend/zend_language_scanner.l')
| -rw-r--r-- | Zend/zend_language_scanner.l | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index ccf8a4ca00..4f50658a59 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1383,6 +1383,14 @@ NEWLINE ("\r"|"\n"|"\r\n") return T_MUL_EQUAL; } +<ST_IN_SCRIPTING>"*\*" { + return T_POW; +} + +<ST_IN_SCRIPTING>"*\*=" { + return T_POW_EQUAL; +} + <ST_IN_SCRIPTING>"/=" { return T_DIV_EQUAL; } |