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

su4sml/src/ocl_parser/model_import.sml

@@ -134,7 +134,7 @@ fun removePackages (uml,ocl) packageList =
 	 * (Rep_Core.package_of cl = p)) model *)
 	fun filter_package (all_classifiers,all_associations) p = 
 	    let
-		val 
+
 		(* FIXME: correct handling for reflexive assocs + !isNavigable *)
 		fun valid_assoc {name,aends,qualifiers,aclass} = 
                     List.length aends > 1

su4sml/src/rep_helper.sml

@@ -1,7 +1,6 @@
 signature REP_HELP_FUNCTIONS =
 sig
 
-    
     (**
      * Filter a list (OBSOLETE?)
      *)
@@ -181,4 +180,5 @@ fun join s nil = ""
 fun uncurry f (x,y) = f x y
 fun curry f x y     = f (x,y)
 
+
 end

su4sml/src/rep_logger.sml

@@ -75,7 +75,7 @@ end
 structure Rep_Logger:REP_LOGGER =
 struct
 
-
+open Rep_Help_Functions
 
 
 (* minimal tracing support (modifed version of ocl_parser tracing *)
@@ -180,13 +180,6 @@ fun append xs ys = xs @ ys;
 fun find _ []        = Option.NONE
   | find p (x :: xs) = if p x then Option.SOME x else find p xs;
     
-fun member x [] = false
-| member x (h::tail) = 
-    if (x = h) then
-	true
-    else 
-	member x tail
-
 fun swap1 f a b c = f c b a
 
 (* fun getenv var =

su4sml/src/wfcpo-gen/load_model.sml

@@ -19,8 +19,8 @@ val zargo = "../../../examples/meeting/Meeting.zargo"
 val ocl = ""
 *)
 
-val zargo = "../../../examples/ebank/ebank.zargo"
-val ocl="../../../examples/ebank/ebank.ocl"
+val zargo = "../../../examples/stack_manu/stack.zargo"
+val ocl="../../../examples/stack_manu/stack.ocl"
 
 (** import model *)
 val i_model = import zargo ocl [] 

su4sml/src/wfcpo-gen/refine_constraint.sml

@@ -26,8 +26,9 @@ structure Refine_Constraint : REFINE_CONSTRAINT =
 struct
 
 (* su4sml *)
-open Rep_Core
+open Rep_Help_Functions
 open Rep_Logger
+open Rep_Core
 open Rep_OclTerm
 open Rep_OclType
 open Rep2String