If PHP Was English

gistfile1.diff

Index: Zend/zend_language_scanner.l
===================================================================
--- Zend/zend_language_scanner.l	(revision 322482)
+++ Zend/zend_language_scanner.l	(working copy)
@@ -916,7 +916,7 @@
 						break;
 					}
 				case '\\':
-				case '$':
+				case '£':
 					*t++ = *s;
 					zendlval->value.str.len--;
 					break;
@@ -998,7 +998,7 @@
 LABEL	[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*
 WHITESPACE [ \n\r\t]+
 TABS_AND_SPACES [ \t]*
-TOKENS [;:,.\[\]()|^&+-/*=%!~$<>?@]
+TOKENS [;:,.\[\]()|^&+-/*=%!~£<>?@]
 ANY_CHAR [^]
 NEWLINE ("\r"|"\n"|"\r\n")
 
@@ -1010,7 +1010,7 @@
 	return T_EXIT;
 }
 
-<ST_IN_SCRIPTING>"die" {
+<ST_IN_SCRIPTING>"cheerio" {
 	return T_EXIT;
 }
 
@@ -1026,11 +1026,11 @@
 	return T_RETURN;
 }
 
-<ST_IN_SCRIPTING>"try" {
+<ST_IN_SCRIPTING>"would_you_mind" {
 	return T_TRY;
 }
 
-<ST_IN_SCRIPTING>"catch" {
+<ST_IN_SCRIPTING>"actually_i_do_mind" {
 	return T_CATCH;
 }
 
@@ -1038,7 +1038,7 @@
 	return T_THROW;
 }
 
-<ST_IN_SCRIPTING>"if" {
+<ST_IN_SCRIPTING>"per_chance" {
 	return T_IF;
 }
 
@@ -1050,7 +1050,7 @@
 	return T_ENDIF;
 }
 
-<ST_IN_SCRIPTING>"else" {
+<ST_IN_SCRIPTING>"otherwise" {
 	return T_ELSE;
 }
 
@@ -1098,23 +1098,23 @@
 	return T_AS;
 }
 
-<ST_IN_SCRIPTING>"switch" {
+<ST_IN_SCRIPTING>"what_about" {
 	return T_SWITCH;
 }
 
-<ST_IN_SCRIPTING>"endswitch" {
+<ST_IN_SCRIPTING>"end_what_about" {
 	return T_ENDSWITCH;
 }
 
-<ST_IN_SCRIPTING>"case" {
+<ST_IN_SCRIPTING>"perhaps" {
 	return T_CASE;
 }
 
-<ST_IN_SCRIPTING>"default" {
+<ST_IN_SCRIPTING>"on_the_off_chance" {
 	return T_DEFAULT;
 }
 
-<ST_IN_SCRIPTING>"break" {
+<ST_IN_SCRIPTING>"splendid" {
 	return T_BREAK;
 }
 
@@ -1126,7 +1126,7 @@
 	return T_GOTO;
 }
 
-<ST_IN_SCRIPTING>"echo" {
+<ST_IN_SCRIPTING>"announce" {
 	return T_ECHO;
 }
 
@@ -1134,7 +1134,7 @@
 	return T_PRINT;
 }
 
-<ST_IN_SCRIPTING>"class" {
+<ST_IN_SCRIPTING>"upper_class" {
 	return T_CLASS;
 }
 
@@ -1192,7 +1192,7 @@
 	return T_NS_SEPARATOR;
 }
 
-<ST_IN_SCRIPTING>"new" {
+<ST_IN_SCRIPTING>"nouveau" {
 	return T_NEW;
 }
 
@@ -1439,7 +1439,7 @@
 }
 
 
-<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"${" {
+<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"£{" {
 	yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
 	return T_DOLLAR_OPEN_CURLY_BRACES;
 }
@@ -1836,7 +1836,7 @@
 /* Make sure a label character follows "->", otherwise there is no property
  * and "->" will be taken literally
  */
-<ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE>"$"{LABEL}"->"[a-zA-Z_\x7f-\xff] {
+<ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE>"£"{LABEL}"->"[a-zA-Z_\x7f-\xff] {
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
@@ -1846,7 +1846,7 @@
 
 /* A [ always designates a variable offset, regardless of what follows
  */
-<ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE>"$"{LABEL}"[" {
+<ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE>"£"{LABEL}"[" {
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET TSRMLS_CC);
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
@@ -1854,7 +1854,7 @@
 	return T_VARIABLE;
 }
 
-<ST_IN_SCRIPTING,ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE,ST_VAR_OFFSET>"$"{LABEL} {
+<ST_IN_SCRIPTING,ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE,ST_VAR_OFFSET>"£"{LABEL} {
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
@@ -2053,13 +2053,13 @@
 				yyleng = YYCURSOR - SCNG(yy_text);
 				zend_scan_escape_string(zendlval, yytext+bprefix+1, yyleng-bprefix-2, '"' TSRMLS_CC);
 				return T_CONSTANT_ENCAPSED_STRING;
-			case '$':
+			case '£':
 				if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') {
 					break;
 				}
 				continue;
 			case '{':
-				if (*YYCURSOR == '$') {
+				if (*YYCURSOR == '£') {
 					break;
 				}
 				continue;
@@ -2154,7 +2154,7 @@
 }
 
 
-<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"{$" {
+<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"{£" {
 	zendlval->value.lval = (long) '{';
 	yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
 	yyless(1);
@@ -2192,13 +2192,13 @@
 		switch (*YYCURSOR++) {
 			case '"':
 				break;
-			case '$':
+			case '£':
 				if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') {
 					break;
 				}
 				continue;
 			case '{':
-				if (*YYCURSOR == '$') {
+				if (*YYCURSOR == '£') {
 					break;
 				}
 				continue;
@@ -2235,13 +2235,13 @@
 		switch (*YYCURSOR++) {
 			case '`':
 				break;
-			case '$':
+			case '£':
 				if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') {
 					break;
 				}
 				continue;
 			case '{':
-				if (*YYCURSOR == '$') {
+				if (*YYCURSOR == '£') {
 					break;
 				}
 				continue;
@@ -2306,13 +2306,13 @@
 					}
 				}
 				continue;
-			case '$':
+			case '£':
 				if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') {
 					break;
 				}
 				continue;
 			case '{':
-				if (*YYCURSOR == '$') {
+				if (*YYCURSOR == '£') {
 					break;
 				}
 				continue;