From 288ceaeec2077d06df3ba46bca97960f76f283e1 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 17 Nov 2004 02:27:38 +0000
Subject: * re.c (rb_reg_initialize_m): should raise exception instead of  
 compile error.  [ruby-core:03755]

* string.c (rb_str_splice): move rb_str_modify() after
  StringValue(), which may alter the receiver.  [ruby-dev:24878]

* error.c (rb_error_frozen): now raise RuntimeError instead of
  TypeError.


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

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 051bee456f..a19cc38603 100644
--- a/parse.y
+++ b/parse.y
@@ -3599,7 +3599,7 @@ string_content	: tSTRING_CONTENT
 			COND_LEXPOP();
 			CMDARG_LEXPOP();
 		    /*%%%*/
-			FL_UNSET($3, NODE_NEWLINE);
+		        $3->flags &= ~NODE_NEWLINE;
 			$$ = new_evstr($3);
 		    /*%
 			$$ = dispatch1(string_embexpr, $3);
@@ -6507,7 +6507,9 @@ static NODE*
 newline_node(node)
     NODE *node;
 {
-    FL_SET(node, NODE_NEWLINE);
+		    if (node) {
+			node->flags |= NODE_NEWLINE;
+		    }
     return node;
 }
 
-- 
cgit v1.2.3