Index: Zend/zend_compile.c
===================================================================
RCS file: /repository/ZendEngine2/zend_compile.c,v
retrieving revision 1.571
diff -u -r1.571 zend_compile.c
--- Zend/zend_compile.c	29 Jul 2004 17:45:29 -0000	1.571
+++ Zend/zend_compile.c	29 Jul 2004 17:48:53 -0000
@@ -3483,6 +3483,41 @@
 	}	
 }
 
+void zend_do_label(znode *label TSRMLS_DC)
+{
+	zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+
+	opline->opcode = ZEND_NOP;
+	SET_UNUSED(opline->result);
+	SET_UNUSED(opline->op1);
+	SET_UNUSED(opline->op2);
+
+	if (label->op_type == IS_CONST &&
+		label->u.constant.type == IS_STRING) {
+		if (!CG(active_op_array)->labels) {
+			CG(active_op_array)->labels = emalloc(sizeof(HashTable));
+			zend_hash_init(CG(active_op_array)->labels, 16, NULL, NULL, 0);
+		}
+		if (zend_hash_exists(CG(active_op_array)->labels, label->u.constant.value.str.val, label->u.constant.value.str.len + 1)) {
+			zend_error(E_COMPILE_ERROR, "Label cannot be redefined.");
+		} else {
+			/* Point to our newly created NOP instruction */
+			zend_hash_add(CG(active_op_array)->labels, label->u.constant.value.str.val, label->u.constant.value.str.len + 1, &opline, sizeof(zend_op*), NULL);
+		}
+		zval_dtor(&label->u.constant);
+	} else {
+		zend_error(E_COMPILE_ERROR, "Invalid label identifier, expecting T_STRING");
+	}
+}
+void zend_do_goto(znode *label TSRMLS_DC)
+{
+	zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+
+	opline->opcode = ZEND_GOTO;
+	SET_UNUSED(opline->result);
+	opline->op1 = *label;
+	SET_UNUSED(opline->op2);
+}
 
 void zend_do_exit(znode *result, znode *message TSRMLS_DC)
 {
Index: Zend/zend_compile.h
===================================================================
RCS file: /repository/ZendEngine2/zend_compile.h,v
retrieving revision 1.286
diff -u -r1.286 zend_compile.h
--- Zend/zend_compile.h	29 Jul 2004 17:45:29 -0000	1.286
+++ Zend/zend_compile.h	29 Jul 2004 17:48:53 -0000
@@ -170,6 +170,7 @@
 	zend_uint *refcount;
 
 	zend_op *opcodes;
+	HashTable *labels;
 	zend_uint last, size;
 
 	zend_uint T;
@@ -459,6 +460,8 @@
 void zend_do_end_heredoc(TSRMLS_D);
 
 void zend_do_exit(znode *result, znode *message TSRMLS_DC);
+void zend_do_goto(znode *label TSRMLS_DC);
+void zend_do_label(znode *label TSRMLS_DC);
 
 void zend_do_begin_silence(znode *strudel_token TSRMLS_DC);
 void zend_do_end_silence(znode *strudel_token TSRMLS_DC);
@@ -714,6 +717,7 @@
 
 #define ZEND_HANDLE_EXCEPTION		149
 
+#define ZEND_GOTO			150
 /* end of block */
 /* END: OPCODES */
 
Index: Zend/zend_execute.c
===================================================================
RCS file: /repository/ZendEngine2/zend_execute.c,v
retrieving revision 1.660
diff -u -r1.660 zend_execute.c
--- Zend/zend_execute.c	29 Jul 2004 17:45:30 -0000	1.660
+++ Zend/zend_execute.c	29 Jul 2004 17:48:53 -0000
@@ -4058,6 +4058,31 @@
 	return zend_isset_isempty_dim_prop_obj_handler(0, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
+int zend_goto_handler(ZEND_OPCODE_HANDLER_ARGS)
+{
+	zend_op **target;
+	zval *label = get_zval_ptr(&opline->op1, EX(Ts), &EG(free_op1), BP_VAR_R);
+	zval tmp;
+
+	tmp = *label;
+	zval_copy_ctor(&tmp);
+	convert_to_string(&tmp);
+	label = &tmp;
+
+	if (op_array->labels &&
+		zend_hash_find(op_array->labels, label->value.str.val, label->value.str.len + 1, (void **)&target) == SUCCESS) {
+#if DEBUG_ZEND>=2
+		printf("Jumping on goto to opcode %08X\n", *target);
+#endif
+		zval_dtor(&tmp);
+		SET_OPCODE(*target);
+		return 0;
+	}
+
+	zend_error(E_ERROR, "Unknown label %s", Z_STRVAL_P(label));
+	zval_dtor(&tmp);
+	NEXT_OPCODE();
+}
 
 int zend_isset_isempty_prop_obj_handler(ZEND_OPCODE_HANDLER_ARGS)
 {
@@ -4438,6 +4463,7 @@
 
 	zend_opcode_handlers[ZEND_HANDLE_EXCEPTION] = zend_handle_exception_handler;
 
+	zend_opcode_handlers[ZEND_GOTO] = zend_goto_handler;
 }
 
 /*
Index: Zend/zend_language_scanner.l
===================================================================
RCS file: /repository/ZendEngine2/zend_language_scanner.l,v
retrieving revision 1.114
diff -u -r1.114 zend_language_scanner.l
--- Zend/zend_language_scanner.l	29 Jul 2004 17:45:31 -0000	1.114
+++ Zend/zend_language_scanner.l	29 Jul 2004 17:48:53 -0000
@@ -762,6 +762,10 @@
 %option noyywrap
 %%
 
+<ST_IN_SCRIPTING>"goto" {
+	return T_GOTO;
+}
+
 <ST_IN_SCRIPTING>"exit" {
 	return T_EXIT;
 }
Index: Zend/zend_language_parser.y
===================================================================
RCS file: /repository/ZendEngine2/zend_language_parser.y,v
retrieving revision 1.147
diff -u -r1.147 zend_language_parser.y
--- Zend/zend_language_parser.y	29 Jul 2004 17:45:31 -0000	1.147
+++ Zend/zend_language_parser.y	29 Jul 2004 17:48:53 -0000
@@ -145,6 +145,7 @@
 %token T_NULL
 %token T_FALSE
 %token T_TRUE
+%token T_GOTO
 
 %% /* Rules */
 
@@ -223,6 +224,8 @@
 		'{' inner_statement_list '}' { zend_do_end_catch(&$1 TSRMLS_CC); }
 		additional_catches { zend_do_mark_last_catch(&$7, &$18 TSRMLS_CC); }
 	|	T_THROW expr ';' { zend_do_throw(&$2 TSRMLS_CC); }
+	|	T_GOTO expr	';' { zend_do_goto(&$2 TSRMLS_CC); }
+	|	T_STRING ':'	{ zend_do_label(&$1 TSRMLS_CC); }
 ;
 
 
Index: Zend/zend_opcode.c
===================================================================
RCS file: /repository/ZendEngine2/zend_opcode.c,v
retrieving revision 1.105
diff -u -r1.105 zend_opcode.c
--- Zend/zend_opcode.c	29 Jul 2004 17:45:31 -0000	1.105
+++ Zend/zend_opcode.c	29 Jul 2004 17:48:53 -0000
@@ -63,6 +63,7 @@
 	op_array->size = initial_ops_size;
 	op_array->last = 0;
 	op_array->opcodes = NULL;
+	op_array->labels = NULL;
 	op_array_alloc_ops(op_array);
 
 	op_array->T = 0;
@@ -224,6 +225,11 @@
 	}
 	efree(op_array->opcodes);
 
+	if (op_array->labels) {
+		zend_hash_destroy(op_array->labels);
+		efree(op_array->labels);
+	}
+
 	if (op_array->function_name) {
 		efree(op_array->function_name);
 	}