Improved namespace aliases

phalcon · May 31, 2015 · 6dec5d1 · 6dec5d1
1 parent 1a0a0a3
commit 6dec5d1
Show file tree

Hide file tree

Showing 17 changed files with 3,111 additions and 3,046 deletions.
diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c
diff --git a/ext/phalcon/mvc/model/query.zep.c b/ext/phalcon/mvc/model/query.zep.c
diff --git a/ext/phalcon/mvc/model/query/builder.zep.c b/ext/phalcon/mvc/model/query/builder.zep.c
diff --git a/ext/phalcon/mvc/model/query/generate b/ext/phalcon/mvc/model/query/generate
@@ -12,3 +12,4 @@ sed s/YY/PP/g scanner.c > xx && mv -f xx scanner.c
 sed s/yy/pp/g scanner.c > xx && mv -f xx scanner.c
 sed s/YY/PP/g parser.c > xx && mv -f xx parser.c
 sed s/yy/pp/g parser.c > xx && mv -f xx parser.c
+sed s/"define TOKEN"/"define PPTOKEN"/g parser.c > xx && mv -f xx parser.c
diff --git a/ext/phalcon/mvc/model/query/parser.c b/ext/phalcon/mvc/model/query/parser.c
diff --git a/ext/phalcon/mvc/model/query/parser.lemon b/ext/phalcon/mvc/model/query/parser.lemon
@@ -461,7 +461,7 @@ static zval *phql_ret_func_call(phql_parser_token *name, zval *arguments, zval *
 	if (arguments) {
 		add_assoc_zval(ret, "arguments", arguments);
 	}
-	
+
 	if (distinct) {
 		add_assoc_zval(ret, "distinct", distinct);
 	}
@@ -849,7 +849,7 @@ where_clause(R) ::= . {
 	R = NULL;
 }
 
-%destructor order_clause { zephir_safe_zval_ptr_dtor($$); } 
+%destructor order_clause { zephir_safe_zval_ptr_dtor($$); }
 
 order_clause(R) ::= ORDER BY order_list(O) . {
 	R = O;
@@ -1185,14 +1185,6 @@ expr(R) ::= SPLACEHOLDER(P) . {
 
 %destructor qualified_name { zval_ptr_dtor(&$$); }
 
-qualified_name(R) ::= IDENTIFIER(A) COLON IDENTIFIER(B) DOT IDENTIFIER(C) . {
-	R = phql_ret_qualified_name(A, B, C);
-}
-
-qualified_name(R) ::= IDENTIFIER(A) COLON IDENTIFIER(B) . {
-	R = phql_ret_qualified_name(A, NULL, B);
-}
-
 qualified_name(R) ::= IDENTIFIER(A) DOT IDENTIFIER(B) . {
 	R = phql_ret_qualified_name(NULL, A, B);
 }