Changeset 12738

Timestamp:

27.10.2009 11:18:55 (4 weeks ago)

Author:

codruta

Message:

Fixed ExtModal/Logic?_ExtModal.hs

Files:

• trunk/ExtModal/Logic_ExtModal.hs (modified) (3 diffs)

trunk/ExtModal/Logic_ExtModal.hs

@@ -25 +25 @@
 import CASL.Morphism
 import CASL.SymbolMapAnalysis
-import CASL.Logic_CASL
 import CASL.AS_Basic_CASL
 import CASL.Parse_AS_Basic
 import CASL.MapSentence
 import CASL.SymbolParser
-import CASL.Sublogic
 import CASL.SimplifySen
 import CASL.Taxonomy
@@ -81 +79 @@
                         Nominal nom -> let nms = nom_map (extended_map morph) 
                                        in if Map.member nom nms then (Nominal (nms Map.! nom)) else nm
-                        _ -> nm
             new_f = mapSen map_EM_FORMULA morph f
         in Hybrid choice new_nom new_f pos
@@ -115 +112 @@
 simEMSen sign (UntilSince choice f1 f2 pos) = 
         UntilSince choice (simplifySen frmTypeAna simEMSen sign f1) 
-                (simplifySen frmTypeAna simEMSen sign f1) pos
+                (simplifySen frmTypeAna simEMSen sign f2) pos
 simEMSen sign (NextY choice f pos) =
         NextY choice (simplifySen frmTypeAna simEMSen sign f) pos