From b7933917f6f29a7252c80bc676ac65f28596ea0c Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@php.net>
Date: Tue, 14 Mar 2006 11:20:19 +0000
Subject: [PATCH] "jump" -> "goto"

---
 Zend/tests/jump01.phpt       | 4 ++--
 Zend/tests/jump02.phpt       | 6 +++---
 Zend/tests/jump03.phpt       | 4 ++--
 Zend/tests/jump04.phpt       | 4 ++--
 Zend/tests/jump05.phpt       | 4 ++--
 Zend/tests/jump06.phpt       | 6 +++---
 Zend/tests/jump07.phpt       | 6 +++---
 Zend/tests/jump08.phpt       | 6 +++---
 Zend/tests/jump09.phpt       | 6 +++---
 Zend/tests/jump10.phpt       | 6 +++---
 Zend/zend_compile.c          | 4 ++--
 Zend/zend_language_scanner.l | 2 +-
 12 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Zend/tests/jump01.phpt b/Zend/tests/jump01.phpt
index 90897cda965..87dba88baf0 100755
--- a/Zend/tests/jump01.phpt
+++ b/Zend/tests/jump01.phpt
@@ -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
diff --git a/Zend/tests/jump02.phpt b/Zend/tests/jump02.phpt
index 80a9fa22edb..ff83bc4b937 100755
--- a/Zend/tests/jump02.phpt
+++ b/Zend/tests/jump02.phpt
@@ -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--
diff --git a/Zend/tests/jump03.phpt b/Zend/tests/jump03.phpt
index e07acb49e8c..2399f30ade5 100755
--- a/Zend/tests/jump03.phpt
+++ b/Zend/tests/jump03.phpt
@@ -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:
diff --git a/Zend/tests/jump04.phpt b/Zend/tests/jump04.phpt
index 27462d1032b..2bbf1f5c017 100755
--- a/Zend/tests/jump04.phpt
+++ b/Zend/tests/jump04.phpt
@@ -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 @@ L1: if ($s != "X") {
 	while ($s != "XXX") {
 		echo "3: ok\n";	
 		$s .= "X";
-		jump L1;
+		goto L1;
 		echo "bug\n";	
 	}
 	echo "bug\n";	
diff --git a/Zend/tests/jump05.phpt b/Zend/tests/jump05.phpt
index 59758122e47..2e5e50c0682 100755
--- a/Zend/tests/jump05.phpt
+++ b/Zend/tests/jump05.phpt
@@ -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 @@ foreach ($ar as $val) {
 			break;
 		case "2":
 			echo "2: ok\n";
-			jump L1;
+			goto L1;
 		case "3":
 			echo "bug\n";
 			break;
diff --git a/Zend/tests/jump06.phpt b/Zend/tests/jump06.phpt
index 0492fe77577..ef01b0e5b3a 100755
--- a/Zend/tests/jump06.phpt
+++ b/Zend/tests/jump06.phpt
@@ -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
diff --git a/Zend/tests/jump07.phpt b/Zend/tests/jump07.phpt
index f5cc9af6b89..c0cb112a7b7 100755
--- a/Zend/tests/jump07.phpt
+++ b/Zend/tests/jump07.phpt
@@ -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
diff --git a/Zend/tests/jump08.phpt b/Zend/tests/jump08.phpt
index d864d612671..25a211c8c44 100755
--- a/Zend/tests/jump08.phpt
+++ b/Zend/tests/jump08.phpt
@@ -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
diff --git a/Zend/tests/jump09.phpt b/Zend/tests/jump09.phpt
index 81bd5c9a5df..52a14b7d542 100755
--- a/Zend/tests/jump09.phpt
+++ b/Zend/tests/jump09.phpt
@@ -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 @@ switch (0) {
 		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
diff --git a/Zend/tests/jump10.phpt b/Zend/tests/jump10.phpt
index 3b4be15469e..67206a29ae8 100755
--- a/Zend/tests/jump10.phpt
+++ b/Zend/tests/jump10.phpt
@@ -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 @@ switch (0) {
 }
 ?>
 --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
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 8c54192d979..0babb016ff5 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -4357,7 +4357,7 @@ void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2
 	    	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 @@ void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2
 	    		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;
 	}
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 2c1586e79f6..662c85a77e3 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1522,7 +1522,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
 	return T_CONTINUE;
 }
 
-<ST_IN_SCRIPTING>"jump" {
+<ST_IN_SCRIPTING>"goto" {
 	return T_GOTO;
 }