X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perly.y;h=f4a83442ef9ef28e55696a55bda0cb8537f71d80;hb=ca7ae272c37436849b129d53b917f29db94ee48f;hp=48049eb83e632f8ac1395a7b2caf3951a9dfdad4;hpb=be3c0a43e1e6b1244032726df02a3ab450a3c4be;p=p5sagit%2Fp5-mst-13.2.git diff --git a/perly.y b/perly.y index 48049eb..f4a8344 100644 --- a/perly.y +++ b/perly.y @@ -1,6 +1,6 @@ /* perly.y * - * Copyright (c) 1991-2002, Larry Wall + * Copyright (c) 1991-2002, 2003, 2004 Larry Wall * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -12,44 +12,11 @@ * All that is gold does not glitter, not all those who wander are lost.' */ -%{ -#include "EXTERN.h" -#define PERL_IN_PERLY_C -#include "perl.h" -#ifdef EBCDIC -#undef YYDEBUG -#endif -#define dep() deprecate("\"do\" to call subroutines") - -/* stuff included here to make perly_c.diff apply better */ - -#define yydebug PL_yydebug -#define yynerrs PL_yynerrs -#define yyerrflag PL_yyerrflag -#define yychar PL_yychar -#define yyval PL_yyval -#define yylval PL_yylval - -struct ysv { - short* yyss; - YYSTYPE* yyvs; - int oldyydebug; - int oldyynerrs; - int oldyyerrflag; - int oldyychar; - YYSTYPE oldyyval; - YYSTYPE oldyylval; -}; - -static void yydestruct(pTHX_ void *ptr); - -%} +/* Make the parser re-entrant. */ -%start prog +%pure_parser -%{ -#if 0 /* get this from perly.h instead */ -%} +%start prog %union { I32 ival; @@ -58,16 +25,6 @@ static void yydestruct(pTHX_ void *ptr); GV *gvval; } -%{ -#endif /* 0 */ - -#ifdef USE_PURE_BISON -#define YYLEX_PARAM (&yychar) -#define yylex yylex_r -#endif - -%} - %token '{' %token WORD METHOD FUNCMETH THING PMFUNC PRIVATEREF @@ -83,7 +40,7 @@ static void yydestruct(pTHX_ void *ptr); %token COLONATTR %type prog decl format startsub startanonsub startformsub -%type progstart remember mremember '&' +%type progstart remember mremember '&' savescope %type block mblock lineseq line loop cond else %type expr term subscripted scalar ary hsh arylen star amper sideff %type argexpr nexpr texpr iexpr mexpr mnexpr mtexpr miexpr @@ -96,7 +53,7 @@ static void yydestruct(pTHX_ void *ptr); %nonassoc PREC_LOW %nonassoc LOOPEX -%left OROP +%left OROP DOROP %left ANDOP %right NOTOP %nonassoc LSTOP LSTOPSUB @@ -104,7 +61,7 @@ static void yydestruct(pTHX_ void *ptr); %right ASSIGNOP %right '?' ':' %nonassoc DOTDOT -%left OROR +%left OROR DORDOR %left ANDAND %left BITOROP %left BITANDOP @@ -134,7 +91,7 @@ prog : progstart /* An ordinary block */ block : '{' remember lineseq '}' { if (PL_copline > (line_t)$1) - PL_copline = $1; + PL_copline = (line_t)$1; $$ = block_end($2, $3); } ; @@ -144,9 +101,6 @@ remember: /* NULL */ /* start a full lexical scope */ progstart: { -#if defined(YYDEBUG) && defined(DEBUGGING) - yydebug = (DEBUG_p_TEST); -#endif PL_expect = XSTATE; $$ = block_start(TRUE); } ; @@ -154,7 +108,7 @@ progstart: mblock : '{' mremember lineseq '}' { if (PL_copline > (line_t)$1) - PL_copline = $1; + PL_copline = (line_t)$1; $$ = block_end($2, $3); } ; @@ -162,16 +116,20 @@ mremember: /* NULL */ /* start a partial lexical scope */ { $$ = block_start(FALSE); } ; +savescope: /* NULL */ /* remember stack pos in case of error */ + { $$ = PL_savestack_ix; } + /* A collection of "lines" in the program */ lineseq : /* NULL */ { $$ = Nullop; } | lineseq decl { $$ = $1; } - | lineseq line - { $$ = append_list(OP_LINESEQ, - (LISTOP*)$1, (LISTOP*)$2); + | lineseq savescope line + { LEAVE_SCOPE($2); + $$ = append_list(OP_LINESEQ, + (LISTOP*)$1, (LISTOP*)$3); PL_pad_reset_pending = TRUE; - if ($1 && $2) PL_hints |= HINT_BLOCK_SCOPE; } + if ($1 && $3) PL_hints |= HINT_BLOCK_SCOPE; } ; /* A "line" in the program */ @@ -206,7 +164,7 @@ sideff : error | expr UNTIL iexpr { $$ = newLOOPOP(OPf_PARENS, 1, $3, $1);} | expr FOR expr - { $$ = newFOROP(0, Nullch, $2, + { $$ = newFOROP(0, Nullch, (line_t)$2, Nullop, $3, $1, Nullop); } ; @@ -216,18 +174,18 @@ else : /* NULL */ | ELSE mblock { ($2)->op_flags |= OPf_PARENS; $$ = scope($2); } | ELSIF '(' mexpr ')' mblock else - { PL_copline = $1; + { PL_copline = (line_t)$1; $$ = newCONDOP(0, $3, scope($5), $6); PL_hints |= HINT_BLOCK_SCOPE; } ; /* Real conditional expressions */ cond : IF '(' remember mexpr ')' mblock else - { PL_copline = $1; + { PL_copline = (line_t)$1; $$ = block_end($3, newCONDOP(0, $4, scope($6), $7)); } | UNLESS '(' remember miexpr ')' mblock else - { PL_copline = $1; + { PL_copline = (line_t)$1; $$ = block_end($3, newCONDOP(0, $4, scope($6), $7)); } ; @@ -241,31 +199,31 @@ cont : /* NULL */ /* Loops: while, until, for, and a bare block */ loop : label WHILE '(' remember mtexpr ')' mblock cont - { PL_copline = $2; + { PL_copline = (line_t)$2; $$ = block_end($4, newSTATEOP(0, $1, newWHILEOP(0, 1, (LOOP*)Nullop, $2, $5, $7, $8))); } | label UNTIL '(' remember miexpr ')' mblock cont - { PL_copline = $2; + { PL_copline = (line_t)$2; $$ = block_end($4, newSTATEOP(0, $1, newWHILEOP(0, 1, (LOOP*)Nullop, $2, $5, $7, $8))); } | label FOR MY remember my_scalar '(' mexpr ')' mblock cont { $$ = block_end($4, - newFOROP(0, $1, $2, $5, $7, $9, $10)); } + newFOROP(0, $1, (line_t)$2, $5, $7, $9, $10)); } | label FOR scalar '(' remember mexpr ')' mblock cont { $$ = block_end($5, - newFOROP(0, $1, $2, mod($3, OP_ENTERLOOP), + newFOROP(0, $1, (line_t)$2, mod($3, OP_ENTERLOOP), $6, $8, $9)); } | label FOR '(' remember mexpr ')' mblock cont { $$ = block_end($4, - newFOROP(0, $1, $2, Nullop, $5, $7, $8)); } + newFOROP(0, $1, (line_t)$2, Nullop, $5, $7, $8)); } | label FOR '(' remember mnexpr ';' mtexpr ';' mnexpr ')' mblock /* basically fake up an initialize-while lineseq */ { OP *forop; - PL_copline = $2; + PL_copline = (line_t)$2; forop = newSTATEOP(0, $1, newWHILEOP(0, 1, (LOOP*)Nullop, $2, scalar($7), @@ -404,8 +362,6 @@ subbody : block { $$ = $1; } package : PACKAGE WORD ';' { package($2); } - | PACKAGE ';' - { package(Nullop); } ; use : USE startsub @@ -419,6 +375,8 @@ expr : expr ANDOP expr { $$ = newLOGOP(OP_AND, 0, $1, $3); } | expr OROP expr { $$ = newLOGOP($2, 0, $1, $3); } + | expr DOROP expr + { $$ = newLOGOP(OP_DOR, 0, $1, $3); } | argexpr %prec PREC_LOW ; @@ -477,7 +435,8 @@ method : METHOD subscripted: star '{' expr ';' '}' /* *main::{something} */ /* In this and all the hash accessors, ';' is * provided by the tokeniser */ - { $$ = newBINOP(OP_GELEM, 0, $1, scalar($3)); } + { $$ = newBINOP(OP_GELEM, 0, $1, scalar($3)); + PL_expect = XOPERATOR; } | scalar '[' expr ']' /* $array[$element] */ { $$ = newBINOP(OP_AELEM, 0, oopsAV($1), scalar($3)); } | term ARROW '[' expr ']' /* somearef->[$element] */ @@ -545,6 +504,8 @@ termbinop : term ASSIGNOP term /* $x = $y */ { $$ = newLOGOP(OP_AND, 0, $1, $3); } | term OROR term /* $x || $y */ { $$ = newLOGOP(OP_OR, 0, $1, $3); } + | term DORDOR term /* $x // $y */ + { $$ = newLOGOP(OP_DOR, 0, $1, $3); } | term MATCHOP term /* $x =~ /$y/ */ { $$ = bind_match($2, $1, $3); } ; @@ -789,13 +750,3 @@ indirob : WORD | PRIVATEREF { $$ = $1; } ; - -%% /* PROGRAM */ - -/* more stuff added to make perly_c.diff easier to apply */ - -#ifdef yyparse -#undef yyparse -#endif -#define yyparse() Perl_yyparse(pTHX) -