From 514833953fe1e0e1c9cbc31937acd2f8c8d2ead2 Mon Sep 17 00:00:00 2001 From: Rich Hickey Date: Wed, 19 Nov 2008 20:40:15 +0000 Subject: use source name in smap --- src/jvm/clojure/lang/Compiler.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java index da3f022c..01f3c275 100644 --- a/src/jvm/clojure/lang/Compiler.java +++ b/src/jvm/clojure/lang/Compiler.java @@ -2992,8 +2992,12 @@ static public class FnExpr implements Expr{ String source = (String) SOURCE.get(); int lineBefore = (Integer) LINE_BEFORE.get(); int lineAfter = (Integer) LINE_AFTER.get() + 1; - String smap = "SMAP\n" + - simpleName + ".java\n" + + + if(source != null && SOURCE_PATH.get() != null) + { + //cv.visitSource(source, null); + String smap = "SMAP\n" + + source.substring(0,source.lastIndexOf('.')) + ".java\n" + "Clojure\n" + "*S Clojure\n" + "*F\n" + @@ -3002,9 +3006,8 @@ static public class FnExpr implements Expr{ "*L\n" + String.format("%d#1,%d:%d\n", lineBefore, lineAfter - lineBefore, lineBefore) + "*E"; - if(source != null && SOURCE_PATH.get() != null) - //cv.visitSource(source, null); cv.visitSource(source, smap); + } //static fields for constants for(int i = 0; i < constants.count(); i++) -- cgit v1.2.3-70-g09d2