From c3f58eb3ec1c19e770ef427eebdb54827d1a10f0 Mon Sep 17 00:00:00 2001 From: Angel Ortega Date: Mon, 4 Jul 2011 23:00:28 +0200 Subject: [PATCH] Renamed 'HASHPAIR' to 'ARROW' in mpsl.y. --- mpsl.l | 2 +- mpsl.y | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mpsl.l b/mpsl.l index 251075c..3f8ebe8 100644 --- a/mpsl.l +++ b/mpsl.l @@ -169,7 +169,7 @@ INTEGER ({DECINTEGER}|{OCTINTEGER}|{HEXINTEGER}|{BININTEGER}) "<=" return NUMLE; "&&" return BOOLAND; "||" return BOOLOR; -"=>" return HASHPAIR; +"=>" return ARROW; ".." return RANGE; "&" return AMPERSAND; "|" return BITOR; diff --git a/mpsl.y b/mpsl.y index b2b1279..7243700 100644 --- a/mpsl.y +++ b/mpsl.y @@ -96,7 +96,7 @@ static void compiler_warning(char *str) %left BOOLAND BOOLOR %left INC DEC IADD ISUB IMUL IDIV IMOD IBITAND IBITOR IBITXOR ISHR ISHL %left '!' -%left STRCAT STREQ NUMEQ STRNE NUMNE NUMGE NUMLE HASHPAIR RANGE '>''<' INVCALL +%left STRCAT STREQ NUMEQ STRNE NUMNE NUMGE NUMLE ARROW RANGE '>''<' INVCALL %left AMPERSAND %left BITOR BITXOR %left SHL SHR @@ -274,10 +274,10 @@ sym_list: ; hash: - expr HASHPAIR expr { + expr ARROW expr { $$ = INS2(L"HASH", $1, $3); } - | hash ',' expr HASHPAIR expr + | hash ',' expr ARROW expr { /* build hash from list of instructions */ -- 2.11.4.GIT