interim checkin

1 files changed, 18 insertions, 2 deletions

diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java
index f21635e4..893dd0fe 100644
--- a/src/jvm/clojure/lang/Compiler.java
+++ b/src/jvm/clojure/lang/Compiler.java
@@ -307,7 +307,7 @@ private static Expr analyzeSeq(C context, ISeq form) throws Exception {
     else if(op == NOT || op == NULL_QM_)
         return analyzeNot(context, form);
     else
-        throw new UnsupportedOperationException();
+        throw new Exception("Unsupported op: " + op);
 }
 
 private static Expr analyzeLet(C context, ISeq form) throws Exception {
@@ -365,7 +365,23 @@ static class LetExpr extends AnExpr{
         this.body = body;
     }
 
-    public void emitExpression() throws Exception {
+    public void emitStatement() throws Exception {
+        emitBindings();
+        body.emitStatement();
+    }
+
+    private void emitBindings() throws Exception {
+        for(int i=0;i<bindingInits.count();i++)
+            {
+            BindingInit bi = (BindingInit) bindingInits.nth(i);
+            if(!(bi.init instanceof FnExpr && ((FnExpr)bi.init).willBeStaticMethod()))
+                bi.binding.emitDeclaration(bi.init.emitExpressionString());
+            }
+    }
+
+    public void emitReturn() throws Exception {
+        emitBindings();
+        body.emitReturn();
     }
 
 }