HOL-OCL
/
su4sml
1
0
Fork 0
Code Issues Pull Requests Releases Activity

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

This commit is contained in:
Achim D. Brucker 2009-01-04 22:57:12 +00:00
parent db33d7e43c
commit ec3ff089c2
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
su4sml/src/ocl_parser/type_checker.sml
View File

@ -153,7 +153,7 @@ fun FromSet_desugarator rterm path attr_or_meth rargs (model as (cls,assocs):Rep
val attrs_or_assocs = get_overloaded_attrs_or_assocends class (List.last path) model val attrs_or_assocs = get_overloaded_attrs_or_assocends class (List.last path) model
in in
if (List.length attrs_or_assocs = 0) if (List.length attrs_or_assocs = 0)
then raise UpcastingError ("Attriubte '" ^ (List.last path) ^ "' does not exist ...") then raise UpcastingError ("Attribute '" ^ (List.last path) ^ "' does not exist ...")
else else
let let
val insert_term = upcast_att_aend attrs_or_assocs (Variable iterVar) model val insert_term = upcast_att_aend attrs_or_assocs (Variable iterVar) model
@ -192,7 +192,7 @@ fun FromSet_desugarator rterm path attr_or_meth rargs (model as (cls,assocs):Rep
(* RETURN: OclTerm (OperationCall/AttributeCall) *) (* RETURN: OclTerm (OperationCall/AttributeCall) *)
fun AsSet_desugarator rterm path attr_or_meth rargs (model as (cls,assocs)) = fun AsSet_desugarator rterm path attr_or_meth rargs (model as (cls,assocs)) =
let let
val _ = if isColl_Type (type_of_term rterm) then print "\n error in AsSet_Desugarotr\n" else () val _ = if isColl_Type (type_of_term rterm) then Logger.error "\n error in AsSet_Desugarotr\n" else ()
val _ = (Logger.debug2 ("TypeChecker.AsSet_desugarator class= " ^ (string_of_OclType (type_of_term rterm)) ^ " , attr\n")) val _ = (Logger.debug2 ("TypeChecker.AsSet_desugarator class= " ^ (string_of_OclType (type_of_term rterm)) ^ " , attr\n"))
val res = if (attr_or_meth = 0) val res = if (attr_or_meth = 0)
then (* OperationCall *) then (* OperationCall *)
@ -225,7 +225,7 @@ fun AsSet_desugarator rterm path attr_or_meth rargs (model as (cls,assocs)) =
in in
if (List.length attrs = 0) if (List.length attrs = 0)
then then
raise TC_NoSuchAttributeError ("Attriubte '" ^ (List.last path) ^ "' does not exist ...") raise TC_NoSuchAttributeError ("Attribute '" ^ (List.last path) ^ "' does not exist ...")
else else
upcast_att_aend attrs new_rterm model upcast_att_aend attrs new_rterm model
end end

8
su4sml/src/su4sml.sml
View File

@ -62,14 +62,14 @@ fun print_help name = let
val _ = print(" transform-model\n") val _ = print(" transform-model\n")
val _ = print(" typecheck\n") val _ = print(" typecheck\n")
val _ = print("\n") val _ = print("\n")
val _ = print("Reading ArgoUML files requires the '"^Config.unzip^"' program.\n")
val _ = print("Current status: ")
val _ = print("The program '"^Config.unzip^"' was ")
val _ = print("\n")
val _ = print("Reading XMI or ArguUML files requires the file '"^Config.umlocl_dtd^"' which\n") val _ = print("Reading XMI or ArguUML files requires the file '"^Config.umlocl_dtd^"' which\n")
val _ = print("must be either located in the local directory or in '$SU4SML_HOME/share'.\n") val _ = print("must be either located in the local directory or in '$SU4SML_HOME/share'.\n")
val _ = print("Current status: ") val _ = print("Current status: ")
val _ = print("SU4SML_HOME="^(Config.su4sml_home())^"\n") val _ = print("SU4SML_HOME="^(Config.su4sml_home())^"\n")
val _ = print("\n")
val _ = print("Reading ArgoUML files requires the '"^Config.unzip^"' program.\n")
val _ = print("Current status: ")
val _ = print("The program '"^Config.unzip^"' was ")
val _ = if Config.check_unzip() val _ = if Config.check_unzip()
then print "" then print ""
else print "not" else print "not"