From 2230a91829f39b72973e6fecf275d9c664911ca0 Mon Sep 17 00:00:00 2001 From: Allen Rohner Date: Tue, 23 Mar 2010 12:09:40 -0500 Subject: Print SOURCE_PATH rather than SOURCE on exception, so it's easier to discover the file with an error when two files have the same name in different directories. Signed-off-by: Stuart Halloway --- src/jvm/clojure/lang/Compiler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java index bc19538a..1eaa9e81 100644 --- a/src/jvm/clojure/lang/Compiler.java +++ b/src/jvm/clojure/lang/Compiler.java @@ -5774,7 +5774,7 @@ private static Expr analyze(C context, Object form, String name) throws Exceptio catch(Throwable e) { if(!(e instanceof CompilerException)) - throw new CompilerException((String) SOURCE.deref(), (Integer) LINE.deref(), e); + throw new CompilerException((String) SOURCE_PATH.deref(), (Integer) LINE.deref(), e); else throw (CompilerException) e; } @@ -5947,7 +5947,7 @@ private static Expr analyzeSeq(C context, ISeq form, String name) throws Excepti catch(Throwable e) { if(!(e instanceof CompilerException)) - throw new CompilerException((String) SOURCE.deref(), (Integer) LINE.deref(), e); + throw new CompilerException((String) SOURCE_PATH.deref(), (Integer) LINE.deref(), e); else throw (CompilerException) e; } @@ -6434,7 +6434,7 @@ public static Object load(Reader rdr, String sourcePath, String sourceName) thro } catch(LispReader.ReaderException e) { - throw new CompilerException(sourceName, e.line, e.getCause()); + throw new CompilerException(sourcePath, e.line, e.getCause()); } finally { @@ -6653,7 +6653,7 @@ public static Object compile(Reader rdr, String sourcePath, String sourceName) t } catch(LispReader.ReaderException e) { - throw new CompilerException(sourceName, e.line, e.getCause()); + throw new CompilerException(sourcePath, e.line, e.getCause()); } finally { -- cgit v1.2.3-18-g5258