summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-29 07:09:40 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-29 07:09:40 +0000
commit8ffeda041b92f1dbdc05d9356e05d9f624922ef3 (patch)
tree880407125de33025450a76608493a2175c52ce03
parent79316a1c735badcc6b06441f34d6580b904381c5 (diff)
* common.mk (node_name.inc): remove command option -n and give
file as stdin, because IronRuby 1.1 still doesn't support it. So now we can use ir.exe as BASERUBY. * tool/node_name.rb: read stdin with while gets. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--common.mk2
-rwxr-xr-xtool/node_name.rb8
3 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c8725b9ab..a26f15ff27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Aug 29 16:02:54 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * common.mk (node_name.inc): remove command option -n and give
+ file as stdin, because IronRuby 1.1 still doesn't support it.
+ So now we can use ir.exe as BASERUBY.
+
+ * tool/node_name.rb: read stdin with while gets.
+
Sun Aug 29 13:22:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (rb_thread_method_id_and_class): curried proc has no
diff --git a/common.mk b/common.mk
index cd04851b0e..6cfb0fbd6e 100644
--- a/common.mk
+++ b/common.mk
@@ -725,7 +725,7 @@ id.h: parse.h $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl
$(srcdir)/template/id.h.tmpl --vpath=$(VPATH) parse.h
node_name.inc: {$(VPATH)}node.h
- $(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
+ $(BASERUBY) -n $(srcdir)/tool/node_name.rb < $? > $@
encdb.h: $(PREP) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/encdb.h.tmpl
$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/encdb.h.tmpl $(srcdir)/enc enc
diff --git a/tool/node_name.rb b/tool/node_name.rb
index 5d39e9f5cc..fef7720a5a 100755
--- a/tool/node_name.rb
+++ b/tool/node_name.rb
@@ -1,4 +1,6 @@
-#! ./miniruby -n
-if ~/enum node_type \{/..~/^\};/
- ~/(NODE_.+),/ and puts(" case #{$1}:\n\treturn \"#{$1}\";")
+#! ./miniruby
+while gets
+ if ~/enum node_type \{/..~/^\};/
+ ~/(NODE_.+),/ and puts(" case #{$1}:\n\treturn \"#{$1}\";")
+ end
end