diff options
| author | Rich Hickey <richhickey@gmail.com> | 2008-11-15 15:07:46 +0000 |
|---|---|---|
| committer | Rich Hickey <richhickey@gmail.com> | 2008-11-15 15:07:46 +0000 |
| commit | 1fd3602858cfe6578199a4f08f20014b1612d2e5 (patch) | |
| tree | 2016df095fbf3b42901b9b31e3914ab58e8136c8 /src | |
| parent | e17df799eb82f61430439d377b3f901e1d77ef4c (diff) | |
fixed Namespace toString
Diffstat (limited to 'src')
| -rw-r--r-- | src/jvm/clojure/lang/Compiler.java | 36 | ||||
| -rw-r--r-- | src/jvm/clojure/lang/Var.java | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java index 4bea5031..cabbed82 100644 --- a/src/jvm/clojure/lang/Compiler.java +++ b/src/jvm/clojure/lang/Compiler.java @@ -4530,24 +4530,24 @@ public static Object compile(Reader rdr, String sourcePath, String sourceName) t clinitgen.returnValue(); clinitgen.endMethod(); -// //main -// GeneratorAdapter maingen = new GeneratorAdapter(ACC_PUBLIC + ACC_STATIC, -// Method.getMethod("void main (String[])"), -// null, -// null, -// cv); -// maingen.visitCode(); -// maingen.push(fn.internalName.replace('/', '.')); -// maingen.push("main"); -// maingen.invokeStatic(RT_TYPE, Method.getMethod("clojure.lang.Var var(String,String)")); -// maingen.loadArgs(); -// maingen.invokeStatic(RT_TYPE,Method.getMethod("clojure.lang.ISeq seq(Object)")); -// maingen.invokeInterface(IFN_TYPE, new Method("applyTo",OBJECT_TYPE,new Type[]{Type.getType(ISeq.class)})); -// maingen.pop(); -// -// //end of main -// maingen.returnValue(); -// maingen.endMethod(); + //main + GeneratorAdapter maingen = new GeneratorAdapter(ACC_PUBLIC + ACC_STATIC, + Method.getMethod("void main (String[])"), + null, + null, + cv); + maingen.visitCode(); + maingen.push(fn.internalName.replace('/', '.')); + maingen.push("main"); + maingen.invokeStatic(RT_TYPE, Method.getMethod("clojure.lang.Var var(String,String)")); + maingen.loadArgs(); + maingen.invokeStatic(RT_TYPE,Method.getMethod("clojure.lang.ISeq seq(Object)")); + maingen.invokeInterface(IFN_TYPE, new Method("applyTo",OBJECT_TYPE,new Type[]{Type.getType(ISeq.class)})); + maingen.pop(); + + //end of main + maingen.returnValue(); + maingen.endMethod(); //end of class cv.visitEnd(); diff --git a/src/jvm/clojure/lang/Var.java b/src/jvm/clojure/lang/Var.java index fcbd746f..5fcfd5eb 100644 --- a/src/jvm/clojure/lang/Var.java +++ b/src/jvm/clojure/lang/Var.java @@ -126,7 +126,7 @@ final public Object get(){ return b.val; if(hasRoot()) return root; - throw new IllegalStateException(String.format("Var %s is unbound.", sym)); + throw new IllegalStateException(String.format("Var %s/%s is unbound.", ns, sym)); } public void setValidator(IFn vf){ |