Permalink
Browse files

Keep up to date with trunk

git-svn-id: http://svn.codehaus.org/jruby/branches/enebo_block@2836 961051c9-f516-0410-bf72-c9f7e237a7b7
  • Loading branch information...
1 parent 526a65f commit bc682bcfc95039738aaff5bfa8de4283f2305651 @enebo enebo committed Jan 24, 2007
Showing with 4 additions and 2 deletions.
  1. +1 −1 jruby/bin/jruby
  2. +1 −1 jruby/src/org/jruby/evaluator/EvaluationState.java
  3. +2 −0 jruby/test/testClass.rb
View
@@ -141,7 +141,7 @@ if [ "$1" = "SERVER" ]; then
shift
fi
-JAVA_OPTS="-Djruby.jit.enabled=true -Djruby.tailcall.enabled=true"
+#JAVA_OPTS="-Djruby.jit.enabled=true -Djruby.tailcall.enabled=true"
"$JAVA_CMD" $JAVA_OPTS $DEBUG -Xmx256m -Xss1024k -ea -classpath "$CP" \
"-Djruby.base=$JRUBY_BASE" \
@@ -456,7 +456,7 @@ private static IRubyObject evalInternal(ThreadContext context, Node node, IRubyO
((RubyModule) context.peekCRef().getValue()).setClassVar(iVisited.getName(),
result);
- return runtime.getNil();
+ return result;
}
case NodeTypes.CLASSVARNODE: {
ClassVarNode iVisited = (ClassVarNode) node;
View
@@ -207,3 +207,5 @@ class NoConstantInInstanceVariables
end
test_equal([], NoConstantInInstanceVariables.new.class.instance_variables)
+
+test_equal(3, @@a = 3)

0 comments on commit bc682bc

Please sign in to comment.