Skip to content

Commit b8732e6

Browse files
committed
Allow to customize regular expressions handler
1 parent ead3706 commit b8732e6

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/JsPhpize/Compiler/Compiler.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,8 @@ protected function visitConstant(Constant $constant)
171171
$value = str_replace('$', '\\$', $value);
172172
}
173173
if ($constant->type === 'regexp') {
174-
$value = rtrim($value, 'gimuy');
175-
$value = '(object) ' . var_export(array(
176-
'isRegularExpression' => true,
177-
'regExp' => $value,
178-
), true);
174+
$regExp = $this->engine->getHelperName('regExp');
175+
$value = $this->helperWrap($regExp, array(var_export($value, true)));
179176
}
180177

181178
return $value;

src/JsPhpize/JsPhpizeOptions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function __construct(array $options = array())
3333
new Pattern(10, 'newline', '\n'),
3434
new Pattern(20, 'comment', '\/\/.*?\n|\/\*[\s\S]*?\*\/'),
3535
new Pattern(30, 'string', '"(?:\\\\.|[^"\\\\])*"|\'(?:\\\\.|[^\'\\\\])*\''),
36-
new Pattern(30, 'regexp', '\\/(?:\\\\.|[^\\/\\\\])*\\/[gimuy]*'),
36+
new Pattern(35, 'regexp', '\\/(?:\\\\.|[^\\/\\\\])*\\/[gimuy]*'),
3737
new Pattern(40, 'number', '0[bB][01]+|0[oO][0-7]+|0[xX][0-9a-fA-F]+|(\d+(\.\d*)?|\.\d+)([eE]-?\d+)?'),
3838
new Pattern(50, 'lambda', '=>'),
3939
new Pattern(60, 'operator', array('delete', 'typeof', 'void'), true),

0 commit comments

Comments
 (0)