From: Harald Radi <phanto@php.net>
Date: Wed, 9 Apr 2003 20:23:06 +0000 (+0000)
Subject: removing the *syntactical sugar* again
X-Git-Tag: RELEASE_0_5~74
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07e775bcde588b767720a0b3c9b37b7721ca2e23;p=php

removing the *syntactical sugar* again

# commiting that on behalf of the community :)
# don't blame me, i'm just acting as a proxy
---

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index bdc0008488..accb9641bb 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -142,7 +142,6 @@
 %token T_CURLY_OPEN
 %token T_PAAMAYIM_NEKUDOTAYIM
 %token T_IMPORT T_FROM
-%token T_NAMESPACE_NAME
 %token T_NAMESPACE
 
 %% /* Rules */
@@ -654,8 +653,7 @@ fully_qualified_class_name:
 ;
 
 import_namespace:
-		T_NAMESPACE_NAME { zend_do_fetch_class(&$$, NULL, &$1, 0 TSRMLS_CC); }
-	|	T_STRING { zend_do_fetch_class(&$$, NULL, &$1, 0 TSRMLS_CC); }
+		T_STRING { zend_do_fetch_class(&$$, NULL, &$1, 0 TSRMLS_CC); }
 ;
 
 dynamic_class_name:
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 1aa2110de6..9d3c76795d 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -483,7 +483,6 @@ ENCAPSED_TOKENS [\[\]{}$]
 ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 ANY_CHAR (.|[\n])
 NEWLINE ("\r"|"\n"|"\r\n")
-NAMESPACE_NAME ({LABEL}":")+{LABEL}
 
 %option noyylineno
 %option noyywrap
@@ -1130,13 +1129,6 @@ NAMESPACE_NAME ({LABEL}":")+{LABEL}
 	return T_STRING;
 }
 
-<ST_IN_SCRIPTING>{NAMESPACE_NAME} {
-	zendlval->value.str.val = (char *)estrndup(yytext, yyleng);
-	zendlval->value.str.len = yyleng;
-	zendlval->type = IS_STRING;
-	return T_NAMESPACE_NAME;
-}
-
 <ST_HEREDOC>{ENCAPSED_STRING} {
 	zendlval->value.str.val = (char *)estrndup(yytext, yyleng);
 	zendlval->value.str.len = yyleng;