Nobuyoshi Nakada
nobu.****@softh*****
2002年 12月 5日 (木) 03:55:40 JST
なかだです。
At Wed, 04 Dec 2002 18:48:15 +0900,
Yuya Kato wrote:
> > |> 1.7には対応してないのね…。
> > |1.7に対応する精神的余裕がないらしい。(苦笑)
> > 余裕がないなら1.6を切り捨てればいいのに。
> なるほど。その手がありますね。:-)
>
> なんで1.6系で開発を始めてしまったのだろう、、、
とりあえずコンパイル通すだけのパッチです。あとなんかNODE追加し
てなかったっけ。
# うーん、改行コードが…。
Index: ext/bruby/BRbNode.cpp
===================================================================
RCS file: /cvsroot/bruby/bruby/ext/bruby/BRbNode.cpp,v
retrieving revision 1.4
diff -u -2 -p -r1.4 BRbNode.cpp
--- ext/bruby/BRbNode.cpp 18 Aug 2002 15:39:58 -0000 1.4
+++ ext/bruby/BRbNode.cpp 4 Dec 2002 18:53:44 -0000
@@ -30,5 +30,7 @@ const BRbNodeName BRbNode::NAMES[] = {
{NODE_CREF, "NODE_CREF"},
{NODE_CVAR, "NODE_CVAR"},
+#ifdef HAVE_CVAR2
{NODE_CVAR2, "NODE_CVAR2"},
+#endif
{NODE_CVASGN, "NODE_CVASGN"},
{NODE_CVDECL, "NODE_CVDECL"},
Index: ext/bruby/BRbReadNode.cpp
===================================================================
RCS file: /cvsroot/bruby/bruby/ext/bruby/BRbReadNode.cpp,v
retrieving revision 1.33
diff -u -2 -p -r1.33 BRbReadNode.cpp
--- ext/bruby/BRbReadNode.cpp 4 Dec 2002 04:50:04 -0000 1.33
+++ ext/bruby/BRbReadNode.cpp 4 Dec 2002 18:53:44 -0000
@@ -180,5 +180,9 @@ BRbReadNode::read_node()
case NODE_BREAK:
{
+#ifdef BREAK_WITH_ARGUMENT
+ return NEW_BREAK(read_node());
+#else
return NEW_BREAK();
+#endif
}
case NODE_CALL:
@@ -479,5 +483,9 @@ BRbReadNode::read_node()
case NODE_NEXT:
{
+#ifdef BREAK_WITH_ARGUMENT
+ return NEW_NEXT(read_node());
+#else
return NEW_NEXT();
+#endif
}
case NODE_NIL:
Index: ext/bruby/BRbWriteNode.cpp
===================================================================
RCS file: /cvsroot/bruby/bruby/ext/bruby/BRbWriteNode.cpp,v
retrieving revision 1.31
diff -u -2 -p -r1.31 BRbWriteNode.cpp
--- ext/bruby/BRbWriteNode.cpp 4 Dec 2002 04:50:04 -0000 1.31
+++ ext/bruby/BRbWriteNode.cpp 4 Dec 2002 18:53:44 -0000
@@ -191,4 +191,7 @@ BRbWriteNode::write_node(NODE* node)
case NODE_BREAK:
{
+#ifdef BREAK_WITH_ARGUMENT
+ write_node(node->nd_body);
+#endif
break;
}
@@ -477,4 +480,7 @@ BRbWriteNode::write_node(NODE* node)
case NODE_NEXT:
{
+#ifdef BREAK_WITH_ARGUMENT
+ write_node(node->nd_body);
+#endif
break;
}
Index: ext/bruby/extconf.rb
===================================================================
RCS file: /cvsroot/bruby/bruby/ext/bruby/extconf.rb,v
retrieving revision 1.3
diff -u -2 -p -r1.3 extconf.rb
--- ext/bruby/extconf.rb 4 Sep 2002 02:17:37 -0000 1.3
+++ ext/bruby/extconf.rb 4 Dec 2002 18:53:44 -0000
@@ -5,4 +5,27 @@ require "mkmf"
can_make = have_library('stdc++')
+print "checking for NODE_CVAR2..."; $>.flush
+if try_compile(%{
+#include "ruby.h"
+#include "node.h"
+int node_cvar2 = NODE_CVAR2;
+})
+ $defs << "-DHAVE_CVAR2"
+ puts "yes"
+else
+ puts "no"
+end
+
+print "checking for NEW_BREAK takes argument..."; $>.flush
+if try_cpp(%{
+#include "node.h"
+NEW_BREAK(s)
+})
+ $defs << "-DBREAK_WITH_ARGUMENT"
+ puts "yes"
+else
+ puts "no"
+end
+
if can_make
create_makefile("bruby")
--
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
中田 伸悦