Created
September 15, 2017 18:58
-
-
Save sgolemon/2b08b14d08861d1329d3529599f75022 to your computer and use it in GitHub Desktop.
Pipe Operator v2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y | |
index 2c508a59fe..05e345c4ec 100644 | |
--- a/Zend/zend_language_parser.y | |
+++ b/Zend/zend_language_parser.y | |
@@ -72,7 +72,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); | |
%nonassoc T_IS_EQUAL T_IS_NOT_EQUAL T_IS_IDENTICAL T_IS_NOT_IDENTICAL T_SPACESHIP | |
%nonassoc '<' T_IS_SMALLER_OR_EQUAL '>' T_IS_GREATER_OR_EQUAL | |
%left T_SL T_SR | |
-%left '+' '-' '.' | |
+%left '+' '-' '.' T_PIPE_OPERATOR | |
%left '*' '/' '%' | |
%right '!' | |
%nonassoc T_INSTANCEOF | |
@@ -192,6 +192,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); | |
%token T_EXTENDS "extends (T_EXTENDS)" | |
%token T_IMPLEMENTS "implements (T_IMPLEMENTS)" | |
%token T_OBJECT_OPERATOR "-> (T_OBJECT_OPERATOR)" | |
+%token T_PIPE_OPERATOR "|> (T_PIPE_OPERATOR)" | |
%token T_DOUBLE_ARROW "=> (T_DOUBLE_ARROW)" | |
%token T_LIST "list (T_LIST)" | |
%token T_ARRAY "array (T_ARRAY)" | |
@@ -951,6 +952,9 @@ expr_without_variable: | |
{ $$ = zend_ast_create(ZEND_AST_GREATER_EQUAL, $1, $3); } | |
| expr T_SPACESHIP expr | |
{ $$ = zend_ast_create_binary_op(ZEND_SPACESHIP, $1, $3); } | |
+ | expr T_PIPE_OPERATOR expr | |
+ { $$ = zend_ast_create(ZEND_AST_CALL, $3, | |
+ zend_ast_create_list(1, ZEND_AST_ARG_LIST, $1)); } | |
| expr T_INSTANCEOF class_name_reference | |
{ $$ = zend_ast_create(ZEND_AST_INSTANCEOF, $1, $3); } | |
| '(' expr ')' { $$ = $2; } | |
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l | |
index aafca1682d..33a3883dbf 100644 | |
--- a/Zend/zend_language_scanner.l | |
+++ b/Zend/zend_language_scanner.l | |
@@ -1289,6 +1289,10 @@ NEWLINE ("\r"|"\n"|"\r\n") | |
RETURN_TOKEN(T_OBJECT_OPERATOR); | |
} | |
+<ST_IN_SCRIPTING>"|>" { | |
+ RETURN_TOKEN(T_PIPE_OPERATOR); | |
+} | |
+ | |
<ST_IN_SCRIPTING,ST_LOOKING_FOR_PROPERTY>{WHITESPACE}+ { | |
HANDLE_NEWLINES(yytext, yyleng); | |
RETURN_TOKEN(T_WHITESPACE); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment