simple stuff is working

Author: Thomas Mahler

src/CLTerm.hs

@@ -17,7 +17,7 @@ module CLTerm
 import Parser (Expr(..))
 import Data.Data(Data)
 
-data CL = Com Combinator | INT Integer | CL :@ CL deriving (Eq)
+data CL = Com Combinator | INT Integer | CL :@ CL deriving (Eq, Data)
 
 instance Show CL where
   showsPrec :: Int -> CL -> ShowS
@@ -30,8 +30,6 @@ instance Show CL where
       toString (BulkCom c n) = c ++ show n
       toString c = show c
 
-instance Data CL
-
 type LeftAncestors = [CL]
 
 leftAncestors :: CL -> LeftAncestors
@@ -45,7 +43,7 @@ leftAncestors clTerm = leftAncestors' clTerm []
 data Combinator = I | K | S | B | C | Y | P | R | ADD | SUB | MUL | DIV | REM | SUB1 | EQL | GEQ | ZEROP | 
                  A | B' | C' | S' | T | 
                  BulkCom String Int
-  deriving (Eq, Show)
+  deriving (Eq, Show, Data)
 
 fromString :: String -> Combinator
 fromString "i"    = I

src/TermReducer.hs

@@ -38,7 +38,8 @@ reduce (Com B' :@ t :@ u :@ v) = t :@ (u :@ v)
 reduce (Com C' :@ t :@ u :@ v) = t :@ v :@ u
 reduce (Com S' :@ t :@ u :@ v) = (t :@ v) :@ (u :@ v)
 reduce (Com T :@ t) = t
-reduce x = error $ "not a known combinator: " ++ show x
+reduce x = x
+--reduce x = error $ "not a known combinator: " ++ show x
 
 
 red :: CL -> CL

test/TermReducerSpec.hs

@@ -26,8 +26,8 @@ spec = do
       verify Simple.basicArithmetic
     it "computes basic comparison" $
       verify Simple.basicComparison
-    -- it "computes basic boolean" $
-    --   verify Simple.basicBoolean
+    it "computes basic boolean" $
+       verify Simple.basicBoolean
     it "computes basic subtraction" $
       verify Simple.basicSubtraction
     it "computes basic multiplication" $
@@ -43,7 +43,7 @@ spec = do
     it "computes simple composition" $
       verify simpleComposition
     -- it "computes Y combinator test" $
-    --   verify simpleYCombinator
+    --    verify simpleYCombinator
     -- it "computes simple fac (recursive)" $
     --   verify smallFactorial
 
@@ -123,7 +123,10 @@ runTest src = do
   -- Capture result with timeout handling
   result <- catch 
     (let actual = red aExp
-      in return $ show expected == show actual)
+      in do 
+        putStrLn $ "Expected: " ++ show expected
+        putStrLn $ "Actual: " ++ show actual 
+        return $ show expected == show actual)
     (\e -> do 
         putStrLn $ "Error during reduction: " ++ show (e :: SomeException)
         return False)