From cae962dd4d35663a03597b8ce0655b9aec8f907e Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 18 Nov 2001 10:49:28 +0000
Subject: * parse.y: needless conditionals.

* parse.y (parse_regx): parse error at unterminated regex /#{.
  (ruby-bugs-ja:PR#142)


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 54bccbad3..0981a4a74 100644
--- a/parse.y
+++ b/parse.y
@@ -442,9 +442,7 @@ stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
 			    }
 			    else {
 				$$ = n;
-				if ($$) {
-				    $$->nd_value = call_op(gettable($1),$2,1,$3);
-				}
+				$$->nd_value = call_op(gettable($1),$2,1,$3);
 			    }
 			    fixpos($$, $3);
 			}
@@ -789,9 +787,7 @@ arg		: lhs '=' arg
 			    }
 			    else {
 				$$ = n;
-				if ($$) {
-				    $$->nd_value = call_op(gettable($1),$2,1,$3);
-				}
+				$$->nd_value = call_op(gettable($1),$2,1,$3);
 			    }
 			    fixpos($$, $3);
 			}
@@ -2518,7 +2514,7 @@ parse_regx(term, paren)
 	switch (c) {
 	  case '#':
 	    list = str_extend(list, term);
-	    if (list == (NODE*)-1) return 0;
+	    if (list == (NODE*)-1) goto unterminated;
 	    continue;
 
 	  case '\\':
-- 
cgit