Fix in GreedyReduce

src/qir/driver/QIRGreedyReduceVisitor.java

@@ -74,7 +74,12 @@ final class QIRGreedyReduceVisitor implements IQIRVisitor<QIRNode> {
 
     @Override
     public final QIRNode visit(final QIRLambda qirLambda) {
-        return new QIRLambda(qirLambda.sourceSection, qirLambda.funName, qirLambda.var, qirLambda.body.accept(this), qirLambda.target.getRootNode().getFrameDescriptor());
+        if (qirLambda.var == null || !env.containsKey(qirLambda.var.id))
+            return new QIRLambda(qirLambda.sourceSection, qirLambda.funName, qirLambda.var, qirLambda.body.accept(this), qirLambda.target.getRootNode().getFrameDescriptor());
+        final QIRNode value = env.remove(qirLambda.var.id);
+        final QIRLambda res = new QIRLambda(qirLambda.sourceSection, qirLambda.funName, qirLambda.var, qirLambda.body.accept(this), qirLambda.target.getRootNode().getFrameDescriptor());
+        env.put(qirLambda.var.id, value);
+        return res;
     }
 
     @Override
@@ -90,9 +95,9 @@ final class QIRGreedyReduceVisitor implements IQIRVisitor<QIRNode> {
             return fun.body;
         final String varName = var.id;
         env.put(varName, right);
-        final QIRLambda res = (QIRLambda) fun.accept(this);
+        final QIRNode res = fun.body.accept(this);
         env.remove(varName);
-        return res.body;
+        return res;
     }
 
     @Override