[Refactor render code into SemSyn.renderCode
Joachim Breitner <mail@joachim-breitner.de>**20100915133721
 Ignore-this: dad578980fb99cd4aae1c399c61eee61
] 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) )
-
conflictor [
hunk ./Main.hs 261
-                                     print $ outputCode conf False (cprog) (typeInference cprog)
+                                     let transformed = typeInference cprog 
+                                     in checkAndDoBidirectionalize conf False cprog transformed
hunk ./Main.hs 264
-                                     print $ outputCode conf False (cprog) (shapify $ typeInference cprog)
-                               _ | isShapifyPlusMode conf -> 
-                                     print $ outputCode conf True  (cprog) (introNat $ shapify $ typeInference cprog)
-                               _ ->
-                                   print $ outputCode conf True  (cprog) (introNat $ shapify $ typeInference cprog)
+                                     let transformed = shapify $ typeInference cprog 
+                                     in checkAndDoBidirectionalize conf False cprog transformed
+                               _ | isShapifyPlusMode conf || True -> 
+                                     let transformed = introNat $ shapify $ typeInference cprog
+                                     in checkAndDoBidirectionalize conf True cprog transformed 
]
:
hunk ./Main.hs 260
-                               _ | 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)
-                               _ ->
-                                   print $ outputCode conf True  (cprog) (introNat $ shapify $ typeInference cprog)
+                               _ -> print $ renderCode conf cprog
hunk ./SemSyn.hs 177
-                                  
+
+
+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) )
+
+renderCode :: Config -> AST -> Doc
+renderCode conf cprog
+    | isNormalMode conf =      outputCode conf False (cprog) (typeInference cprog)
+    | isShapifyMode conf =     outputCode conf False (cprog) (shapify $ typeInference cprog)
+    | isShapifyPlusMode conf = outputCode conf True  (cprog) (introNat $ shapify $ typeInference cprog)
+    | otherwise =              outputCode conf True  (cprog) (introNat $ shapify $ typeInference cprog)
+