Title: [1124] trunk/jparsetree/lib/jparsetree.rb:
Fix ZeroArgNode to 0 instead of nil.
- Revision
- 1124
- Author
- headius
- Date
- 2008-08-18 02:34:12 -0400 (Mon, 18 Aug 2008)
Log Message
Fix ZeroArgNode to 0 instead of nil.
Modified Paths
Diff
Modified: trunk/jparsetree/lib/jparsetree.rb (1123 => 1124)
--- trunk/jparsetree/lib/jparsetree.rb 2008-08-18 06:18:25 UTC (rev 1123)
+++ trunk/jparsetree/lib/jparsetree.rb 2008-08-18 06:34:12 UTC (rev 1124)
@@ -35,9 +35,9 @@
class ParseTree
+ import org.jruby.ast.ZeroArgNode
-
# Compatibility for ParseTree which requires a boolean argument,
# except when it doesn't. The argument isn't used from what I can see,
# but it's passed in in the demo.
@@ -937,8 +937,12 @@
end
def visitIterNode(iVisited)
- visit(iVisited.var_node)
- var = @stackElements.pop
+ if ZeroArgNode == iVisited.class.java_class
+ var = 0
+ else
+ visit(iVisited.var_node)
+ var = @stackElements.pop
+ end
visit(iVisited.body_node)
body = JParseTree.filter_nested_arrays(@stackElements.pop)
visit(iVisited.iter_node)
@@ -957,13 +961,19 @@
tmp_elements = location([:block_pass, body, cond], iVisited)
tmp_elements
end
+
+ import org.jruby.ast.ZeroArgNode
def visitIterNode_fromCall(iVisited, cond)
if !iVisited.respond_to? :var_node
visitIterNode_fromBlockPass(iVisited.body_node, cond)
else
- visit(iVisited.var_node)
- var = @stackElements.pop
+ if ZeroArgNode === iVisited.var_node
+ var = 0
+ else
+ visit(iVisited.var_node)
+ var = @stackElements.pop
+ end
visit(iVisited.body_node)
body = JParseTree.filter_nested_arrays(@stackElements.pop)
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
