From c8854934fd33b169a215889815f34c132242a043 Mon Sep 17 00:00:00 2001
From: Manuel Krucker <mkrucker@ethz.ch>
Date: Thu, 27 Mar 2008 18:07:13 +0000
Subject: [PATCH] git-svn-id:
 https://projects.brucker.ch/su4sml/svn/su4sml/trunk@7534
 3260e6d1-4efc-4170-b0a7-36055960796d

---
 su4sml/src/rep_core.sml           | 3 ++-
 su4sml/src/su4sml_core.cm         | 3 ++-
 su4sml/src/xmi_core.sml           | 2 +-
 su4sml/src/xmi_ocl.sml            | 3 ++-
 su4sml/src/xmi_state_machines.sml | 8 ++++----
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/su4sml/src/rep_core.sml b/su4sml/src/rep_core.sml
index 5f63553..5e090d1 100644
--- a/su4sml/src/rep_core.sml
+++ b/su4sml/src/rep_core.sml
@@ -835,7 +835,8 @@ end
 
 structure Rep_Core  :  REP_CORE = 
 struct
-open library
+open Rep_Logger
+open Rep_Help_Functions
 open Rep_OclTerm
 open Rep_OclType
 open XMI_DataTypes
diff --git a/su4sml/src/su4sml_core.cm b/su4sml/src/su4sml_core.cm
index 2c242e5..9de51d2 100644
--- a/su4sml/src/su4sml_core.cm
+++ b/su4sml/src/su4sml_core.cm
@@ -59,7 +59,8 @@ Group is
   contrib/HashTable.sml
 #endif
     ../lib/fxp/src/fxlib.cm
-  library.sml
+  rep_logger.sml
+  rep_help_functions.sml
   listeq.sml 
   stringHandling.sml
   xmi_ocl.sml 
diff --git a/su4sml/src/xmi_core.sml b/su4sml/src/xmi_core.sml
index f6e08fe..2b7829a 100644
--- a/su4sml/src/xmi_core.sml
+++ b/su4sml/src/xmi_core.sml
@@ -400,7 +400,7 @@ fun classifier_elementtype_of (Collection{elementtype,...}) = elementtype
   | classifier_elementtype_of (Set{elementtype,...}) = elementtype
   | classifier_elementtype_of (Bag{elementtype,...}) = elementtype
   | classifier_elementtype_of (OrderedSet{elementtype,...}) = elementtype
-  | classifier_elementtype_of _ = library.error "in classifier_elementtype_of: \
+  | classifier_elementtype_of _ = Rep_Logger.error "in classifier_elementtype_of: \
                                                 \argument is not a collection value"
 
 end
diff --git a/su4sml/src/xmi_ocl.sml b/su4sml/src/xmi_ocl.sml
index 58d2b00..b891ebb 100644
--- a/su4sml/src/xmi_ocl.sml
+++ b/su4sml/src/xmi_ocl.sml
@@ -1,3 +1,4 @@
+
 (*****************************************************************************
  * su4sml --- a SML repository for managing (Secure)UML/OCL models
  *             http://projects.brucker.ch/su4sml/
@@ -129,7 +130,7 @@ fun expression_source_of (AssociationEndCallExp{source,...}) = source
   | expression_source_of (OperationWithTypeArgExp{source,...}) = source 
   | expression_source_of (IterateExp{source,...})       = source
   | expression_source_of (IteratorExp{source,...})      = source
-  | expression_source_of _                              = library.error "expression has no source"
+  | expression_source_of _                              = Rep_Logger.error ("expression has no source")
 
 (* from UML 1.5 Core: --------------------------------------------------------
  * A constraint is a semantic condition or restriction expressed in text.
diff --git a/su4sml/src/xmi_state_machines.sml b/su4sml/src/xmi_state_machines.sml
index 8d34302..90f8ec7 100644
--- a/su4sml/src/xmi_state_machines.sml
+++ b/su4sml/src/xmi_state_machines.sml
@@ -201,7 +201,7 @@ and	StateMachine = mk_StateMachine of
                             transitions      : Transition list}
 
 fun state_type_of  (ObjectFlowState{type_,...}) = type_
-  | state_type_of  _ = library.error "in state_type_of: argument is not an ObjectFlow state"
+  | state_type_of  _ = Rep_Logger.error "in state_type_of: argument is not an ObjectFlow state"
 
 fun state_entry_of (CompositeState{entry,...}) = entry
   | state_entry_of (SubactivityState{entry,...}) = entry
@@ -209,7 +209,7 @@ fun state_entry_of (CompositeState{entry,...}) = entry
   | state_entry_of (ActionState{entry,...}) = entry
   | state_entry_of (ObjectFlowState{entry,...}) = entry
   | state_entry_of (FinalState{entry,...}) = entry
-  | state_entry_of _ = library.error "in state_entry_of: argument does not have entry actions"
+  | state_entry_of _ = Rep_Logger.error "in state_entry_of: argument does not have entry actions"
 
 fun state_xmiid_of (CompositeState{xmiid,...}) = xmiid
   | state_xmiid_of (SubactivityState{xmiid,...}) = xmiid
@@ -231,7 +231,7 @@ fun state_name_of (CompositeState{name,...}) = name
 
 fun state_subvertices_of (CompositeState{subvertex,...}) = subvertex
   | state_subvertices_of (SubactivityState{subvertex,...}) = subvertex
-  | state_subvertices_of _ = library.error "in state_subvertices_of: argument is \
+  | state_subvertices_of _ = Rep_Logger.error "in state_subvertices_of: argument is \
                                            \not a composite state" 
 
 fun state_outgoing_trans_of (CompositeState{outgoing,...}) = outgoing
@@ -241,7 +241,7 @@ fun state_outgoing_trans_of (CompositeState{outgoing,...}) = outgoing
   | state_outgoing_trans_of (ObjectFlowState{outgoing,...}) = outgoing
   | state_outgoing_trans_of (PseudoState{outgoing,...}) = outgoing
   | state_outgoing_trans_of (SyncState{outgoing,...}) = outgoing
-  | state_outgoing_trans_of (FinalState _) = library.error "in state_outgoing_trans_of: \
+  | state_outgoing_trans_of (FinalState _) = Rep_Logger.error "in state_outgoing_trans_of: \
                                                            \argument is a final state"
 
 fun state_incoming_trans_of (CompositeState{incoming,...}) = incoming