* parse.y (internal_id_gen): internal ID must be bigger than

  tLAST_TOKEN.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 9cb335d37..2ae927a7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 10 04:47:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (internal_id_gen): internal ID must be bigger than
+	  tLAST_TOKEN.
+
 Thu Aug  9 16:04:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (stmt): check if rhs has value before assignment instead
diff --git a/parse.y b/parse.y
index 06de11fce..9b90ff320 100644
--- a/parse.y
+++ b/parse.y
@@ -8307,6 +8307,7 @@ static ID
 internal_id_gen(struct parser_params *parser)
 {
     ID id = (ID)vtable_size(lvtbl->args) + (ID)vtable_size(lvtbl->vars);
+    id += ((tLAST_TOKEN - ID_INTERNAL) >> ID_SCOPE_SHIFT) + 1;
     return ID_INTERNAL | (id << ID_SCOPE_SHIFT);
 }
 
diff --git a/version.h b/version.h
index a51f0f260..84938eff8 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-08-09"
+#define RUBY_RELEASE_DATE "2007-08-10"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070809
+#define RUBY_RELEASE_CODE 20070810
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];