git-svn-id: https://projects.brucker.ch/su4sml/svn/su4sml/trunk@7743 3260e6d1-4efc-4170-b0a7-36055960796d

su4sml/src/load_model.sml

@@ -16,11 +16,9 @@ val _ = Control.Print.printLength:=30
 val zargo = "../../../examples/meeting/Meeting.zargo"
 val ocl = ""
 *)
-(*
 val zargo = "../../examples/SimpleChair/SimpleChair.zargo"
 val ocl = "../../examples/SimpleChair/AbstractSimpleChair01.ocl"
 val remP = ["AbstractSimpleChair02", "AbstractSimpleChair03","AbstractSimpleChair04","ConcreteSimpleChair01","ConcreteSimpleChair02"] ;
-*)
 
 (* 
 (** EBANK **)
@@ -61,10 +59,11 @@ val ocl = "../../examples/vehicles/vehicles.ocl"
 *)
 
 (** OVERRRIDING **)
+(* 
 val zargo = "../../hol-ocl/examples/overriding/overriding.zargo"
 val ocl="../../hol-ocl/examples/overriding/overriding.ocl"
 val remP = []
-
+*)
 (** import model *)
 
 val XMI = parseUML zargo
@@ -74,10 +73,8 @@ val _ = init_offset()
 val (xmi_cls,xmi_assocs) = XMI
 val _ = init_offset()
 val fixed_ocl = Preprocessor.preprocess_context_list OCL ((OclLibrary.oclLib)@xmi_cls)
-(* 
 val typed_cl = TypeChecker.check_context_list fixed_ocl (((OclLibrary.oclLib)@xmi_cls),xmi_assocs)
 val model = Update_Model.gen_updated_classifier_list typed_cl ((OclLibrary.oclLib)@xmi_cls)
 val model = removeOclLibrary model
 val model = removePackages remP (model,xmi_assocs)
-*)
 

su4sml/src/rep_ocl.sml

@@ -308,7 +308,7 @@ fun type_of (Literal                (_,t)) = t
   | type_of (Let            (_,_,_,_,_,t)) = t
   | type_of (Iterate  (_,_,_,_,_,_,_,_,t)) = t
   | type_of (Iterator     (_,_,_,_,_,_,t)) = t
-
+  | type_of (Predicate(_,_,_,_)) = Boolean
 (* or rather short_string_of ?*)
 fun term_name_of (Literal            _) = "Literal"
   | term_name_of (CollectionLiteral  _) = "CollectionLiteral"

su4sml/src/test-suite.sml

@@ -77,7 +77,7 @@ val initResult = {
     }:result
 
 
-val prefix = "../../../examples/"
+val prefix = "../../examples/"
 
 val testcases = [
    {