From 6a6d0ad22009c437217eb6aeb4c3750f7a3aaa6d Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 3 Mar 2003 05:17:39 +0000
Subject: * parse.y (arg): parse 'lhs = a rescue b' as 'lhs=(a rescue b)'.

* io.c (rb_io_fread): should not clearerr() if there's no filled
  buffer (i.e. rb_io_fread() returning zero).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y | 62 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 30 insertions(+), 32 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 6793af075b..73828b083f 100644
--- a/parse.y
+++ b/parse.y
@@ -240,7 +240,7 @@ static void top_local_setup();
 %type <node> singleton strings string string1 xstring regexp
 %type <node> string_contents xstring_contents string_content
 %type <node> words qwords word_list qword_list word
-%type <node> literal numeric dsym cpath clhs
+%type <node> literal numeric dsym cpath
 %type <node> bodystmt compstmt stmts stmt expr arg primary command command_call method_call
 %type <node> expr_value arg_value primary_value
 %type <node> if_tail opt_else case_body cases opt_rescue exc_list exc_var opt_ensure
@@ -290,7 +290,7 @@ static void top_local_setup();
 %nonassoc tLOWEST
 %nonassoc tLBRACE_ARG
 
-%left  kIF_MOD kUNLESS_MOD kWHILE_MOD kUNTIL_MOD
+%nonassoc  kIF_MOD kUNLESS_MOD kWHILE_MOD kUNTIL_MOD
 %left  kOR kAND
 %right kNOT
 %nonassoc kDEFINED
@@ -451,6 +451,10 @@ stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
 			    nd_set_type($$, NODE_WHILE);
 			}
 		    }
+		| stmt kRESCUE_MOD stmt
+		    {
+			$$ = NEW_RESCUE($1, NEW_RESBODY(0,$3,0), 0);
+		    }
 		| klBEGIN
 		    {
 			if (in_def || in_single) {
@@ -475,6 +479,7 @@ stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
 		    }
 		| lhs '=' command_call
 		    {
+			value_expr($3);
 			$$ = node_assign($1, $3);
 		    }
 		| mlhs '=' command_call
@@ -483,10 +488,6 @@ stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
 			$1->nd_value = NEW_RESTARY($3);
 			$$ = $1;
 		    }
-		| clhs '=' command_call
-		    {
-			$$ = node_assign($1, $3);
-		    }
 		| var_lhs tOP_ASGN command_call
 		    {
 			value_expr($3);
@@ -574,10 +575,6 @@ stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
 		    {
 			$$ = node_assign($1, NEW_SVALUE($3));
 		    }
-		| clhs '=' mrhs
-		    {
-			$$ = node_assign($1, NEW_SVALUE($3));
-		    }
 		| mlhs '=' arg_value
 		    {
 			$1->nd_value = $3;
@@ -588,10 +585,6 @@ stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
 			$1->nd_value = $3;
 			$$ = $1;
 		    }
-		| clhs '=' arg
-		    {
-			$$ = node_assign($1, $3);
-		    }
 		| expr
 		;
 
@@ -612,10 +605,6 @@ expr		: command_call
 		    {
 			$$ = NEW_NOT(cond($2));
 		    }
-		| arg kRESCUE_MOD command_call
-		    {
-			$$ = NEW_RESCUE($1, NEW_RESBODY(0,$3,0), 0);
-		    }
 		| arg
 		;
 
@@ -808,6 +797,12 @@ mlhs_node	: variable
 		    {
 			$$ = attrset($1, $3);
 		    }
+		| primary_value tCOLON2 tCONSTANT
+		    {
+			if (in_def || in_single)
+			    yyerror("dynamic constant assignment");
+			$$ = NEW_CDECL(0, 0, NEW_COLON2($1, $3));
+		    }
 		| backref
 		    {
 		        rb_backref_error($1);
@@ -835,19 +830,17 @@ lhs		: variable
 		    {
 			$$ = attrset($1, $3);
 		    }
-		| backref
-		    {
-		        rb_backref_error($1);
-			$$ = 0;
-		    }
-		;
-
-clhs		: primary_value tCOLON2 tCONSTANT
+		| primary_value tCOLON2 tCONSTANT
 		    {
 			if (in_def || in_single)
 			    yyerror("dynamic constant assignment");
 			$$ = NEW_CDECL(0, 0, NEW_COLON2($1, $3));
 		    }
+		| backref
+		    {
+		        rb_backref_error($1);
+			$$ = 0;
+		    }
 		;
 
 cname		: tIDENTIFIER
@@ -933,14 +926,17 @@ reswords	: k__LINE__ | k__FILE__  | klBEGIN | klEND
 		| kDEFINED | kDO | kELSE | kELSIF | kEND | kENSURE | kFALSE
 		| kFOR | kIF_MOD | kIN | kMODULE | kNEXT | kNIL | kNOT
 		| kOR | kREDO | kRESCUE | kRETRY | kRETURN | kSELF | kSUPER
-		| kTHEN | kTRUE | kUNDEF | kUNLESS_MOD | kUNTIL_MOD | kWHEN
-		| kWHILE_MOD | kYIELD | kRESCUE_MOD
+		| kTHEN | kTRUE | kUNDEF | kWHEN | kYIELD
 		;
 
 arg		: lhs '=' arg
 		    {
 			$$ = node_assign($1, $3);
 		    }
+		| lhs '=' arg kRESCUE_MOD arg
+		    {
+			$$ = node_assign($1, NEW_RESCUE($3, NEW_RESBODY(0,$5,0), 0));
+		    }
 		| var_lhs tOP_ASGN arg
 		    {
 			value_expr($3);
@@ -1019,6 +1015,10 @@ arg		: lhs '=' arg
 			$$ = NEW_OP_ASGN2($1, $3, $4, $5);
 		        fixpos($$, $1);
 		    }
+		| primary_value tCOLON2 tCONSTANT tOP_ASGN arg
+		    {
+			yyerror("constant re-assignment");
+		    }
 		| backref tOP_ASGN arg
 		    {
 		        rb_backref_error($1);
@@ -1157,10 +1157,6 @@ arg		: lhs '=' arg
 		    {
 			$$ = logop(NODE_OR, $1, $3);
 		    }
-		| arg kRESCUE_MOD arg
-		    {
-			$$ = NEW_RESCUE($1, NEW_RESBODY(0,$3,0), 0);
-		    }
 		| kDEFINED opt_nl {in_defined = 1;} arg
 		    {
 		        in_defined = 0;
@@ -1674,11 +1670,13 @@ primary_value 	: primary
 		;
 
 then		: term
+		| ':'
 		| kTHEN
 		| term kTHEN
 		;
 
 do		: term
+		| ':'
 		| kDO_COND
 		;
 
-- 
cgit v1.2.3