a nice rewrite

Author: AYadrov

src/core/mainloop.rkt

@@ -221,6 +221,7 @@
 
 ;; Converts a patch to full alt with valid history
 (define (reconstruct! alts)
+
   ;; extracts the base expression of a patch
   (define (get-starting-expr altn)
     (match* ((alt-event altn) (alt-prevs altn))
@@ -240,19 +241,16 @@
              [(list 'taylor name var) (list 'taylor loc0 name var)]
              [(list 'rr input proof soundiness) (list 'rr loc0 input proof soundiness)]
              [(list 'simplify input proof soundiness) (list 'simplify loc0 input proof soundiness)]))
-         (define expr* (location-do loc0 (alt-expr orig) (const (alt-expr altn))))
+         (define expr* (location-do loc0 (alt-expr orig) (const (batchref->expr (alt-expr altn)))))
          (alt expr* event* (list (loop (first prevs))) (alt-preprocessing orig))])))
 
   (^patched^ (reap [sow]
                    (for ([altn (in-list alts)]) ;; does not have preproc
                      (define start-expr (get-starting-expr altn))
-                     (if start-expr
-                         (for ([full-altn (in-list (^next-alts^))])
-                           (define expr (alt-expr full-altn))
-                           (for ([loc (in-list (get-locations expr start-expr))])
-                             (sow (reconstruct-alt altn loc full-altn))))
-                         ; altn is a full alt (probably iter 0 simplify)
-                         (sow altn)))))
+                     (for ([full-altn (in-list (^next-alts^))])
+                       (define expr (alt-expr full-altn))
+                       (for ([loc (in-list (get-locations expr start-expr))])
+                         (sow (reconstruct-alt altn loc full-altn)))))))
 
   (void))
 

src/core/patch.rkt

@@ -203,8 +203,4 @@
 
   (define out (append approximations rewritten))
 
-  (define (rebuild-alts x)
-    (match-define (alt expr event prevs preprocessing) x)
-    (alt (batchref->expr expr) event (map rebuild-alts prevs) preprocessing))
-
-  (map rebuild-alts out))
+  out)