DynamicJava: Updated plt.jar.

dlsmith · dlsmith · commit 8500ef01cd7f · 2008-05-06T20:48:44.000Z
git-svn-id: file:///tmp/test-svn/trunk@4469 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/dynamicjava/lib/plt.jar b/dynamicjava/lib/plt.jar
diff --git a/dynamicjava/lib/readme.txt b/dynamicjava/lib/readme.txt
@@ -5,7 +5,7 @@ buildlib/*.jar: Binaries used in the build process, but that should not be part
 
 VERSIONS:
 
-plt.jar: plt-20071203-2149
+plt.jar: plt-20080506-2028
 retroweaver-rt-1.2.3.jar: Retroweaver 1.2.3
 buildlib/ant-contrib.jar: ANT Contrib 1.0b2
 buildlib/astgen.jar: astgen-20060419-1726
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/TreeCompiler.java b/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/TreeCompiler.java
@@ -1329,7 +1329,7 @@ private Object evaluateBlock(BlockStatement block, RuntimeBindings bindings) thr
         return null;
       }
       catch (StatementEvaluator.ReturnException e) {
-        return Option.unwrap(e.value(), (Object) null);
+        return e.value().unwrap(null);
       }
       catch (WrappedException e) {
         if (e.getCause() instanceof EvaluatorException) {
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/symbol/LocalFunction.java b/dynamicjava/src/edu/rice/cs/dynamicjava/symbol/LocalFunction.java
@@ -53,7 +53,7 @@ public Object evaluate(Iterable<Object> args, RuntimeBindings bindings, Options
       return null;
     }
     catch (StatementEvaluator.ReturnException e) {
-      return Option.unwrap(e.value(), (Object) null);
+      return e.value().unwrap(null);
     }
     catch (WrappedException e) {
       if (e.getCause() instanceof EvaluatorException) { throw (EvaluatorException) e.getCause(); }

Original file line number	Diff line number	Diff line change
`@@ -1329,7 +1329,7 @@ private Object evaluateBlock(BlockStatement block, RuntimeBindings bindings) thr`
`1329`	`1329`	`return null;`
`1330`	`1330`	`}`
`1331`	`1331`	`catch (StatementEvaluator.ReturnException e) {`
`1332`		`- return Option.unwrap(e.value(), (Object) null);`
	`1332`	`+ return e.value().unwrap(null);`
`1333`	`1333`	`}`
`1334`	`1334`	`catch (WrappedException e) {`
`1335`	`1335`	`if (e.getCause() instanceof EvaluatorException) {`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public Object evaluate(Iterable<Object> args, RuntimeBindings bindings, Options`
`53`	`53`	`return null;`
`54`	`54`	`}`
`55`	`55`	`catch (StatementEvaluator.ReturnException e) {`
`56`		`- return Option.unwrap(e.value(), (Object) null);`
	`56`	`+ return e.value().unwrap(null);`
`57`	`57`	`}`
`58`	`58`	`catch (WrappedException e) {`
`59`	`59`	`if (e.getCause() instanceof EvaluatorException) { throw (EvaluatorException) e.getCause(); }`