Skip to content

Commit 964e9d8

Browse files
committed
Split complex regexes to multiple lines in zend_vm_gen.php
As requested by Dmitry in GH-12461 for easier reviewing.
1 parent d97ce2f commit 964e9d8

File tree

1 file changed

+30
-3
lines changed

1 file changed

+30
-3
lines changed

Zend/zend_vm_gen.php

+30-3
Original file line numberDiff line numberDiff line change
@@ -2414,7 +2414,16 @@ function gen_vm($def, $skel) {
24142414
strpos($line,"ZEND_VM_COLD_CONSTCONST_HANDLER(") === 0) {
24152415
// Parsing opcode handler's definition
24162416
if (preg_match(
2417-
"/^ZEND_VM_(HOT_|INLINE_|HOT_OBJ_|HOT_SEND_|HOT_NOCONST_|HOT_NOCONSTCONST_|COLD_|COLD_CONST_|COLD_CONSTCONST_)?HANDLER\(\s*([0-9]+)\s*,\s*([A-Z_]+)\s*,\s*([A-Z_|]+)\s*,\s*([A-Z_|]+)\s*(,\s*([A-Z_|]+)\s*)?(,\s*SPEC\(([A-Z_|=,]+)\)\s*)?\)/",
2417+
"/^
2418+
ZEND_VM_(HOT_|INLINE_|HOT_OBJ_|HOT_SEND_|HOT_NOCONST_|HOT_NOCONSTCONST_|COLD_|COLD_CONST_|COLD_CONSTCONST_)?HANDLER\(
2419+
\s*([0-9]+)\s*,
2420+
\s*([A-Z_]+)\s*,
2421+
\s*([A-Z_|]+)\s*,
2422+
\s*([A-Z_|]+)\s*
2423+
(,\s*([A-Z_|]+)\s*)?
2424+
(,\s*SPEC\(([A-Z_|=,]+)\)\s*)?
2425+
\)
2426+
$/x",
24182427
$line,
24192428
$m) == 0) {
24202429
die("ERROR ($def:$lineno): Invalid ZEND_VM_HANDLER definition.\n");
@@ -2465,7 +2474,17 @@ function gen_vm($def, $skel) {
24652474
strpos($line,"ZEND_VM_HOT_OBJ_TYPE_SPEC_HANDLER(") === 0) {
24662475
// Parsing opcode handler's definition
24672476
if (preg_match(
2468-
"/^ZEND_VM_(HOT_|INLINE_|HOT_OBJ_|HOT_SEND_|HOT_NOCONST_|HOT_NOCONSTCONST_)?TYPE_SPEC_HANDLER\(\s*([A-Z_|]+)\s*,\s*((?:[^(,]|\([^()]*|(?R)*\))*),\s*([A-Za-z_]+)\s*,\s*([A-Z_|]+)\s*,\s*([A-Z_|]+)\s*(,\s*([A-Z_|]+)\s*)?(,\s*SPEC\(([A-Z_|=,]+)\)\s*)?\)/",
2477+
"/^
2478+
ZEND_VM_(HOT_|INLINE_|HOT_OBJ_|HOT_SEND_|HOT_NOCONST_|HOT_NOCONSTCONST_)?TYPE_SPEC_HANDLER\(
2479+
\s*([A-Z_|]+)\s*,
2480+
\s*((?:[^(,]|\([^()]*|(?R)*\))*),
2481+
\s*([A-Za-z_]+)\s*,
2482+
\s*([A-Z_|]+)\s*,
2483+
\s*([A-Z_|]+)\s*
2484+
(,\s*([A-Z_|]+)\s*)?
2485+
(,\s*SPEC\(([A-Z_|=,]+)\)\s*)?
2486+
\)
2487+
$/x",
24692488
$line,
24702489
$m) == 0) {
24712490
die("ERROR ($def:$lineno): Invalid ZEND_VM_TYPE_HANDLER_HANDLER definition.\n");
@@ -2513,7 +2532,15 @@ function gen_vm($def, $skel) {
25132532
strpos($line,"ZEND_VM_HOT_HELPER(") === 0) {
25142533
// Parsing helper's definition
25152534
if (preg_match(
2516-
"/^ZEND_VM(_INLINE|_COLD|_HOT)?_HELPER\(\s*([A-Za-z_]+)\s*,\s*([A-Z_|]+)\s*,\s*([A-Z_|]+)\s*(?:,\s*SPEC\(([A-Z_|=,]+)\)\s*)?(?:,\s*([^)]*)\s*)?\)/",
2535+
"/^
2536+
ZEND_VM(_INLINE|_COLD|_HOT)?_HELPER\(
2537+
\s*([A-Za-z_]+)\s*,
2538+
\s*([A-Z_|]+)\s*,
2539+
\s*([A-Z_|]+)\s*
2540+
(?:,\s*SPEC\(([A-Z_|=,]+)\)\s*)?
2541+
(?:,\s*([^)]*)\s*)?
2542+
\)
2543+
$/x",
25172544
$line,
25182545
$m) == 0) {
25192546
die("ERROR ($def:$lineno): Invalid ZEND_VM_HELPER definition.\n");

0 commit comments

Comments
 (0)