summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Hickey <richhickey@gmail.com>2007-12-07 13:23:21 +0000
committerRich Hickey <richhickey@gmail.com>2007-12-07 13:23:21 +0000
commite953a3bbe78362b8d180f72400af3cc6d3e6c641 (patch)
treef79e9833623b5eac0f1d1152096e8f047d1513df
parentb5351815b3ac055168c218992a384d97646f0df5 (diff)
load-file returns value of last expression
-rw-r--r--src/jvm/clojure/lang/Compiler.java12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java
index 99b6320e..7f43ccdf 100644
--- a/src/jvm/clojure/lang/Compiler.java
+++ b/src/jvm/clojure/lang/Compiler.java
@@ -2736,19 +2736,17 @@ private static Symbol tagOf(Object o){
}
public static Object loadFile(String file) throws Exception{
- File fo = new File(file);
- if(!fo.exists())
- return null;
+// File fo = new File(file);
+// if(!fo.exists())
+// return null;
- FileInputStream f = new FileInputStream(fo);
+ FileInputStream f = new FileInputStream(file);
try
{
Var.pushThreadBindings(RT.map(SOURCE_PATH, file,
SOURCE, (new File(file)).getName()));
- load(f);
-
- return RT.T;
+ return load(f);
}
finally
{