* parse.y: needless conditional.

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 4 deletions

diff --git a/parse.y b/parse.y
index cec533f8ca..60fe76cd0d 100644
--- a/parse.y
+++ b/parse.y
@@ -683,9 +683,7 @@ arg		: lhs '=' arg
 			    }
 			    else {
 				$$ = $<node>3;
-				if ($$) {
-				    $$->nd_value = call_op(gettable($1),$2,1,$4);
-				}
+				$$->nd_value = call_op(gettable($1),$2,1,$4);
 			    }
 			    fixpos($$, $4);
 			}
@@ -2349,7 +2347,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 '\\':