diff options
| author | Robin Houston <robin@cpan.org> | 2005-12-17 20:44:31 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2005-12-19 16:26:15 +0000 |
| commit | 0d863452f5cac86322a90184dc68dbf446006ed7 (patch) | |
| tree | a6b225c0f732e2062a2c430a359c1c1db88fa36c /perly.y | |
| parent | 4f5010f268a8de0d9ea78da367041150ef2777f4 (diff) | |
| download | perl-0d863452f5cac86322a90184dc68dbf446006ed7.tar.gz | |
latest switch/say/~~
Message-Id: <20051217204431.GB28940@rpc142.cs.man.ac.uk>
p4raw-id: //depot/perl@26400
Diffstat (limited to 'perly.y')
| -rw-r--r-- | perly.y | 29 |
1 files changed, 28 insertions, 1 deletions
@@ -41,6 +41,7 @@ %token <pval> LABEL %token <ival> FORMAT SUB ANONSUB PACKAGE USE %token <ival> WHILE UNTIL IF UNLESS ELSE ELSIF CONTINUE FOR +%token <ival> GIVEN WHEN DEFAULT %token <ival> LOOPEX DOTDOT %token <ival> FUNC0 FUNC1 FUNC UNIOP LSTOP %token <ival> RELOP EQOP MULOP ADDOP @@ -49,7 +50,7 @@ %token COLONATTR %type <ival> prog decl format startsub startanonsub startformsub mintro -%type <ival> progstart remember mremember '&' savescope +%type <ival> progstart remember mremember '&' savescope mydefsv %type <opval> block mblock lineseq line loop cond else %type <opval> expr term subscripted scalar ary hsh arylen star amper sideff %type <opval> argexpr nexpr texpr iexpr mexpr mnexpr miexpr @@ -57,6 +58,7 @@ %type <opval> formname subname proto subbody cont my_scalar %type <opval> subattrlist myattrlist mysubrout myattrterm myterm %type <opval> termbinop termunop anonymous termdo +%type <opval> switch case %type <pval> label %nonassoc PREC_LOW @@ -109,6 +111,10 @@ remember: /* NULL */ /* start a full lexical scope */ { $$ = block_start(TRUE); } ; +mydefsv: /* NULL */ /* lexicalize $_ */ + { $$ = (I32) allocmy("$_"); } + ; + progstart: { PL_expect = XSTATE; $$ = block_start(TRUE); @@ -146,6 +152,10 @@ lineseq : /* NULL */ line : label cond { $$ = newSTATEOP(0, $1, $2); } | loop /* loops add their own labels */ + | switch /* ... and so do switches */ + { $$ = $1; } + | label case + { $$ = newSTATEOP(0, $1, $2); } | label ';' { if ($1 != Nullch) { $$ = newSTATEOP(0, $1, newOP(OP_NULL, 0)); @@ -200,6 +210,14 @@ cond : IF '(' remember mexpr ')' mblock else newCONDOP(0, $4, scope($6), $7)); } ; +/* Cases for a switch statement */ +case : WHEN '(' remember mexpr ')' mblock + { $$ = block_end($3, + newWHENOP($4, scope($6))); } + | DEFAULT block + { $$ = newWHENOP(0, scope($2)); } + ; + /* Continue blocks */ cont : /* NULL */ { $$ = Nullop; } @@ -253,6 +271,15 @@ loop : label WHILE '(' remember texpr ')' mintro mblock cont NOLINE, Nullop, $2, $3, 0)); } ; +/* Switch blocks */ +switch : label GIVEN '(' remember mydefsv mexpr ')' mblock + { PL_copline = (line_t) $2; + $$ = block_end($4, + newSTATEOP(0, $1, + newGIVENOP($6, scope($8), + (PADOFFSET) $5) )); } + ; + /* determine whether there are any new my declarations */ mintro : /* NULL */ { $$ = (PL_min_intro_pending && |