From e5e51130ebb109f9e433139cab098454da676b8f Mon Sep 17 00:00:00 2001
From: azidar
Date: Fri, 10 Apr 2015 16:59:27 -0700
Subject: Uncommented things

---
 src/main/stanza/passes.stanza | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/main/stanza/passes.stanza b/src/main/stanza/passes.stanza
index e9e5bfc6..79374ef2 100644
--- a/src/main/stanza/passes.stanza
+++ b/src/main/stanza/passes.stanza
@@ -1543,29 +1543,27 @@ defn solve-constraints (l:List<WGeq>) -> HashTable<Symbol,Int> :
    val o = Vector<Symbol>()
    for x in u do :
       val [n e] = [key(x) value(x)]
-      val e* = substitute(e,f)
-      ;val e* = remove-cycle{n,_} $ substitute(e,f)
-      ;if not self-rec?(n,e*) : 
-      add(o,n)
-      f[n] = e*
+      val e* = remove-cycle{n,_} $ substitute(e,f)
+      if not self-rec?(n,e*) : 
+         add(o,n)
+         f[n] = e*
 
    println("Forward Solved Constraints")
    for x in f do : println(x)
 
    ; Backwards Solve
-   ;val b = HashTable<Symbol,Width>(symbol-hash)
-   ;for i in (length(o) - 1) through 0 by -1 do :
-   ;   val n = o[i]
-   ;   b[n] = substitute(f[n],b)
-
-   ;println("Backwards Solved Constraints")
-   ;for x in b do : println(x)
-   ;; Evaluate
-   ;val e = evaluate(b)
-   ;println("Evaluated Constraints")
-   ;for x in e do : println(x)
-   ;e
-   HashTable<Symbol,Int>(symbol-hash)
+   val b = HashTable<Symbol,Width>(symbol-hash)
+   for i in (length(o) - 1) through 0 by -1 do :
+      val n = o[i]
+      b[n] = substitute(f[n],b)
+   println("Backwards Solved Constraints")
+   for x in b do : println(x)
+
+   ; Evaluate
+   val e = evaluate(b)
+   println("Evaluated Constraints")
+   for x in e do : println(x)
+   e
    
 defn width! (t:Type) -> Width :
    match(t) :
-- 
cgit v1.2.3