reverse order of if then else code

Author: Thomas Mahler

app/Main.hs

@@ -65,7 +65,7 @@ ackermann = [r|
 factorial :: SourceCode
 factorial = [r| 
   fact = y(λf n. if (eql n 0) 1 (* n (f (- n 1))))
-  main = fact 100
+  main = fact 10
 |]
 
 fibonacci :: SourceCode

src/CLTerm.hs

@@ -82,10 +82,10 @@ toCL (m `App` n) = toCL m :@ toCL n
 toCL (Int i) = INT i
 
 -- | Scott-encoded TRUE and FALSE using basic SKI combinators
--- TRUE  = λt e. t = K
--- FALSE = λt e. e = A (where A is λx y. y)
+-- TRUE  = λt e. e = A (selects second argument)
+-- FALSE = λt e. t = K (selects first argument)
 trueCL :: CL
-trueCL = Com K
+trueCL = Com A
 
 falseCL :: CL 
-falseCL = Com A
+falseCL = Com K

src/GraphReduction.hs

@@ -230,10 +230,10 @@ binaryMathOp op p1 p2 = do
 
 -- Helper functions to create Scott-encoded boolean Graph structures
 allocTrue :: ST s (STRef s (Graph s))
-allocTrue = newSTRef (Comb K)
+allocTrue = newSTRef (Comb A)
 
 allocFalse :: ST s (STRef s (Graph s))
-allocFalse = newSTRef (Comb A)
+allocFalse = newSTRef (Comb K)
 
 -- Binary comparison operations that return TRUE/FALSE combinators
 binaryCompOp ::

src/LambdaToSKI.hs

@@ -127,10 +127,12 @@ abstractToCCC = cccAbs
 
 -- | Desugar If expressions to Scott encoded boolean applications
 --   Detects pattern: ((if condition) thenExpr) elseExpr
---   and transforms it to: condition thenExpr elseExpr
+--   and transforms it to: condition elseExpr thenExpr
+--   With TRUE=A (selects second arg) and FALSE=K (selects first arg)
+--   This ensures TRUE selects thenExpr and FALSE selects elseExpr
 desugarIf :: Expr -> Expr
 desugarIf (((Var "if" `App` condition) `App` thenExpr) `App` elseExpr) =
-  (desugarIf condition `App` desugarIf thenExpr) `App` desugarIf elseExpr
+  (desugarIf condition `App` desugarIf elseExpr) `App` desugarIf thenExpr
 desugarIf (App e1 e2) = App (desugarIf e1) (desugarIf e2)
 desugarIf (Lam x e) = Lam x (desugarIf e)
 desugarIf expr = expr  -- Var, Int remain unchanged

test/SimpleTestSources.hs

@@ -14,7 +14,7 @@ basicArithmetic = [r|
 
 basicComparison :: SourceCode
 basicComparison = [r| 
-  expected = k
+  expected = a
   main = eql 5 5
 |]