* parse.y (global_symbols.last_id): reduce unused ID numbers.

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

2 files changed, 9 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index f2ebafbef9..6c39bbf862 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Thu Jul  5 10:06:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jul  5 10:13:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (global_symbols.last_id): reduce unused ID numbers.
 
 	* include/ruby/st.h, st.c (st_init_table, st_init_table_with_size):
 	  constified.
diff --git a/parse.y b/parse.y
index c9cd631254..4a93ec5653 100644
--- a/parse.y
+++ b/parse.y
@@ -1145,7 +1145,7 @@ expr		: command_call
 expr_value	: expr
 		    {
 		    /*%%%*/
-			value_expr($$);
+			value_expr($1);
 			$$ = $1;
 		    /*%
 			$$ = $1;
@@ -5233,10 +5233,10 @@ parser_parse_string(struct parser_params *parser, NODE *quote)
            return tREGEXP_END;
        }
        else {
-	ruby_sourceline = nd_line(quote);
-	rb_compile_error(PARSER_ARG  "unterminated string meets end of file");
-	return tSTRING_END;
-    }
+	   ruby_sourceline = nd_line(quote);
+	   rb_compile_error(PARSER_ARG  "unterminated string meets end of file");
+	   return tSTRING_END;
+       }
     }
 
     tokfix();
@@ -8237,7 +8237,7 @@ static struct symbols {
     st_table *ivar2_id;
     st_table *id_ivar2;
     VALUE op_sym[tLAST_TOKEN];
-} global_symbols = {tLAST_TOKEN};
+} global_symbols = {tLAST_TOKEN >> ID_SCOPE_SHIFT};
 
 static const struct st_hash_type symhash = {
     rb_str_cmp,