[Bug fixes on preprocessing options.
Kazutaka Matsuda <kztk@kb.ecei.tohoku.ac.jp>**20100913132631
 Ignore-this: a6cf99b7a848b6efc18954139711c03c
] hunk ./Main.hs 71
---       Option "-s" (Just "--shapify") (empty)
---              (text "Convert terms with type \"T a\" to \"T Unit\".")
---              (NullaryAction (\conf -> conf {execMode = Shapify})),
+      Option "-s" (Just "--shapify") (empty)
+             (text "Convert terms with type \"T a\" to \"T Unit\".")
+             (NullaryAction (\conf -> conf {execMode = Shapify})),
hunk ./Main.hs 218
+isNormalMode conf =
+    ( b18nMode conf == SemanticB18n ) 
+    || ( (b18nMode conf == SyntacticB18n || b18nMode conf == NoB18n)
+         && (execMode conf == Normal) )
+    
+
+isShapifyMode conf = 
+    (b18nMode conf == SyntacticB18n || b18nMode conf == NoB18n)
+    && (execMode conf == Shapify)
+
+isShapifyPlusMode conf =
+    (b18nMode conf == CombinedB18n) 
+    || ( (b18nMode conf == SyntacticB18n || b18nMode conf == NoB18n)
+         && (execMode conf == ShapifyPlus) )
+
hunk ./Main.hs 249
-                               Normal | (b18nMode conf == SyntacticB18n || b18nMode conf == NoB18n) -> 
-                                   print $
-                                         outputCode conf False (cprog) (typeInference cprog)
---                                Shapify -> print $
---                                    outputCode conf False (cprog) (shapify $ typeInference cprog)
---                                    -- putStrLn "Not Supported Now."
-                               ShapifyPlus -> 
-                                   print $
-                                         outputCode conf True  (cprog) (introNat $ shapify $ typeInference cprog)
+--                                Normal | (b18nMode conf == SyntacticB18n || b18nMode conf == NoB18n) -> 
+--                                    print $
+--                                          outputCode conf False (cprog) (typeInference cprog)
+-- --                                Shapify -> print $
+-- --                                    outputCode conf False (cprog) (shapify $ typeInference cprog)
+-- --                                    -- putStrLn "Not Supported Now."
+--                                ShapifyPlus -> 
+--                                    print $
+--                                          outputCode conf True  (cprog) (introNat $ shapify $ typeInference cprog)
hunk ./Main.hs 274
+                               _ | isNormalMode conf ->
+                                     print $ outputCode conf False (cprog) (typeInference cprog)
+                               _ | isShapifyMode conf -> 
+                                     print $ outputCode conf False (cprog) (shapify $ typeInference cprog)
+                               _ | isShapifyPlusMode conf -> 
+                                     print $ outputCode conf True  (cprog) (introNat $ shapify $ typeInference cprog)