dmitry Tue Mar 14 11:20:19 2006 UTC
Modified files:
/ZendEngine2 zend_compile.c zend_language_scanner.l
/ZendEngine2/tests jump01.phpt jump02.phpt jump03.phpt jump04.phpt
jump05.phpt jump06.phpt jump07.phpt jump08.phpt
jump09.phpt jump10.phpt
Log:
"jump" -> "goto"
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_compile.c?r1=1.693&r2=1.694&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.693 ZendEngine2/zend_compile.c:1.694
--- ZendEngine2/zend_compile.c:1.693 Fri Mar 10 08:29:22 2006
+++ ZendEngine2/zend_compile.c Tue Mar 14 11:20:19 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.693 2006/03/10 08:29:22 dmitry Exp $ */
+/* $Id: zend_compile.c,v 1.694 2006/03/14 11:20:19 dmitry Exp $ */
#include <zend_language_parser.h>
#include "zend.h"
@@ -4357,7 +4357,7 @@
CG(in_compilation) = 1;
CG(active_op_array) = op_array;
CG(zend_lineno) = opline->lineno;
- zend_error(E_COMPILE_ERROR, "'jump' to undefined label '%R'", Z_TYPE(opline->op2.u.constant), Z_UNIVAL(opline->op2.u.constant));
+ zend_error(E_COMPILE_ERROR, "'goto' to undefined label '%R'", Z_TYPE(opline->op2.u.constant), Z_UNIVAL(opline->op2.u.constant));
} else {
/* Label is not defined. Delay to pass 2. */
INC_BPC(op_array);
@@ -4377,7 +4377,7 @@
CG(active_op_array) = op_array;
CG(zend_lineno) = opline->lineno;
}
- zend_error(E_COMPILE_ERROR, "'jump' into loop or switch statement is disallowed");
+ zend_error(E_COMPILE_ERROR, "'goto' into loop or switch statement is disallowed");
}
current = op_array->brk_cont_array[current].parent;
}
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_language_scanner.l?r1=1.149&r2=1.150&diff_format=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.149 ZendEngine2/zend_language_scanner.l:1.150
--- ZendEngine2/zend_language_scanner.l:1.149 Fri Mar 10 08:29:22 2006
+++ ZendEngine2/zend_language_scanner.l Tue Mar 14 11:20:19 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_scanner.l,v 1.149 2006/03/10 08:29:22 dmitry Exp $ */
+/* $Id: zend_language_scanner.l,v 1.150 2006/03/14 11:20:19 dmitry Exp $ */
#define yyleng SCNG(yy_leng)
#define yytext SCNG(yy_text)
@@ -1522,7 +1522,7 @@
return T_CONTINUE;
}
-<ST_IN_SCRIPTING>"jump" {
+<ST_IN_SCRIPTING>"goto" {
return T_GOTO;
}
http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/jump01.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/jump01.phpt
diff -u ZendEngine2/tests/jump01.phpt:1.1 ZendEngine2/tests/jump01.phpt:1.2
--- ZendEngine2/tests/jump01.phpt:1.1 Fri Mar 10 08:29:22 2006
+++ ZendEngine2/tests/jump01.phpt Tue Mar 14 11:20:19 2006
@@ -1,12 +1,12 @@
--TEST--
-jump 01: jump backward
+jump 01: goto backward
--FILE--
<?php
$n = 1;
L1:
echo "$n: ok\n";
$n++;
-if ($n <= 3) jump L1;
+if ($n <= 3) goto L1;
?>
--EXPECT--
1: ok
http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/jump02.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/jump02.phpt
diff -u ZendEngine2/tests/jump02.phpt:1.1 ZendEngine2/tests/jump02.phpt:1.2
--- ZendEngine2/tests/jump02.phpt:1.1 Fri Mar 10 08:29:22 2006
+++ ZendEngine2/tests/jump02.phpt Tue Mar 14 11:20:19 2006
@@ -1,13 +1,13 @@
--TEST--
-jump 02: jump forward
+jump 02: goto forward
--FILE--
<?php
$n = 1;
L1:
-if ($n > 3) jump L2;
+if ($n > 3) goto L2;
echo "$n: ok\n";
$n++;
-jump L1;
+goto L1;
L2:
?>
--EXPECT--
http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/jump03.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/jump03.phpt
diff -u ZendEngine2/tests/jump03.phpt:1.1 ZendEngine2/tests/jump03.phpt:1.2
--- ZendEngine2/tests/jump03.phpt:1.1 Fri Mar 10 08:29:22 2006
+++ ZendEngine2/tests/jump03.phpt Tue Mar 14 11:20:19 2006
@@ -1,11 +1,11 @@
--TEST--
-jump 03: jump inside control structures
+jump 03: goto inside control structures
--FILE--
<?php
do {
if (1) {
echo "1: ok\n";
- jump L1;
+ goto L1;
} else {
echo "bug\n";
L1:
http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/jump04.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/jump04.phpt
diff -u ZendEngine2/tests/jump04.phpt:1.1 ZendEngine2/tests/jump04.phpt:1.2
--- ZendEngine2/tests/jump04.phpt:1.1 Fri Mar 10 08:29:22 2006
+++ ZendEngine2/tests/jump04.phpt Tue Mar 14 11:20:19 2006
@@ -1,5 +1,5 @@
--TEST--
-jump 04: jump from loop (backward)
+jump 04: goto from loop (backward)
--FILE--
<?php
$s = "X";
@@ -11,7 +11,7 @@
while ($s != "XXX") {
echo "3: ok\n";
$s .= "X";
- jump L1;
+ goto L1;
echo "bug\n";
}
echo "bug\n";
http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/jump05.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/jump05.phpt
diff -u ZendEngine2/tests/jump05.phpt:1.1 ZendEngine2/tests/jump05.phpt:1.2
--- ZendEngine2/tests/jump05.phpt:1.1 Fri Mar 10 08:29:22 2006
+++ ZendEngine2/tests/jump05.phpt Tue Mar 14 11:20:19 2006
@@ -1,5 +1,5 @@
--TEST--
-jump 05: jump from loop (forward)
+jump 05: goto from loop (forward)
--FILE--
<?php
$ar = array("1","2","3");
@@ -10,7 +10,7 @@
break;
case "2":
echo "2: ok\n";
- jump L1;
+ goto L1;
case "3":
echo "bug\n";
break;
http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/jump06.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/jump06.phpt
diff -u ZendEngine2/tests/jump06.phpt:1.1 ZendEngine2/tests/jump06.phpt:1.2
--- ZendEngine2/tests/jump06.phpt:1.1 Fri Mar 10 08:29:22 2006
+++ ZendEngine2/tests/jump06.phpt Tue Mar 14 11:20:19 2006
@@ -1,8 +1,8 @@
--TEST--
-jump 06: jump to undefined label
+jump 06: goto to undefined label
--FILE--
<?php
-jump L1;
+goto L1;
?>
--EXPECTF--
-Fatal error: 'jump' to undefined label 'L1' in %sjump06.php on line 2
+Fatal error: 'goto' to undefined label 'L1' in %sjump06.php on line 2
http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/jump07.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/jump07.phpt
diff -u ZendEngine2/tests/jump07.phpt:1.1 ZendEngine2/tests/jump07.phpt:1.2
--- ZendEngine2/tests/jump07.phpt:1.1 Fri Mar 10 08:29:22 2006
+++ ZendEngine2/tests/jump07.phpt Tue Mar 14 11:20:19 2006
@@ -1,11 +1,11 @@
--TEST--
-jump 07: jump into loop (backward)
+jump 07: goto into loop (backward)
--FILE--
<?php
while (0) {
L1: echo "bug\n";
}
-jump L1;
+goto L1;
?>
--EXPECTF--
-Fatal error: 'jump' into loop or switch statement is disallowed in %sjump07.php on line 5
+Fatal error: 'goto' into loop or switch statement is disallowed in %sjump07.php on line 5
http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/jump08.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/jump08.phpt
diff -u ZendEngine2/tests/jump08.phpt:1.1 ZendEngine2/tests/jump08.phpt:1.2
--- ZendEngine2/tests/jump08.phpt:1.1 Fri Mar 10 08:29:22 2006
+++ ZendEngine2/tests/jump08.phpt Tue Mar 14 11:20:19 2006
@@ -1,11 +1,11 @@
--TEST--
-jump 08: jump into loop (forward)
+jump 08: goto into loop (forward)
--FILE--
<?php
-jump L1;
+goto L1;
while (0) {
L1: echo "bug\n";
}
?>
--EXPECTF--
-Fatal error: 'jump' into loop or switch statement is disallowed in %sjump08.php on line 2
+Fatal error: 'goto' into loop or switch statement is disallowed in %sjump08.php on line 2
http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/jump09.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/jump09.phpt
diff -u ZendEngine2/tests/jump09.phpt:1.1 ZendEngine2/tests/jump09.phpt:1.2
--- ZendEngine2/tests/jump09.phpt:1.1 Fri Mar 10 08:29:22 2006
+++ ZendEngine2/tests/jump09.phpt Tue Mar 14 11:20:19 2006
@@ -1,5 +1,5 @@
--TEST--
-jump 09: jump into switch (backward)
+jump 09: goto into switch (backward)
--FILE--
<?php
switch (0) {
@@ -7,7 +7,7 @@
L1: echo "bug\n";
break;
}
-jump L1;
+goto L1;
?>
--EXPECTF--
-Fatal error: 'jump' into loop or switch statement is disallowed in %sjump09.php on line 7
+Fatal error: 'goto' into loop or switch statement is disallowed in %sjump09.php on line 7
http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/jump10.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/jump10.phpt
diff -u ZendEngine2/tests/jump10.phpt:1.1 ZendEngine2/tests/jump10.phpt:1.2
--- ZendEngine2/tests/jump10.phpt:1.1 Fri Mar 10 08:29:22 2006
+++ ZendEngine2/tests/jump10.phpt Tue Mar 14 11:20:19 2006
@@ -1,8 +1,8 @@
--TEST--
-jump 10: jump into switch (forward)
+jump 10: goto into switch (forward)
--FILE--
<?php
-jump L1;
+goto L1;
switch (0) {
case 1:
L1: echo "bug\n";
@@ -10,4 +10,4 @@
}
?>
--EXPECTF--
-Fatal error: 'jump' into loop or switch statement is disallowed in %sjump10.php on line 2
+Fatal error: 'goto' into loop or switch statement is disallowed in %sjump10.php on line 2