Commit Graph

273 Commits

Author SHA1 Message Date
Achim D. Brucker f27239f22a Changed handling of association ends with multiplicity (0,1) or (1,1). Instead
of generating attributes of type Set (or Sequence) we generate non-collection 
typed attributes. In the case of multiplicty (0,0) no invariant is generated, in 
the case of (1,1) the invariant "assocEnd->OclIsDefined()" is generated.



git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3251 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-24 19:51:49 +00:00
Achim D. Brucker 0f1b8df03d overal improvements
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3245 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-23 12:53:39 +00:00
Achim D. Brucker 3a4853ff76 git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3243 3260e6d1-4efc-4170-b0a7-36055960796d 2005-10-20 17:36:34 +00:00
Jürgen Doser 103ed6b315 removed permission names from ProtectedAction datatype
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3240 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-20 15:50:05 +00:00
Jürgen Doser 7cedb2def8 fixed small bug when parsing associations with stereotypes.
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3239 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-20 15:45:46 +00:00
Achim D. Brucker 3b6ad522da added first simple implementation of an OCL-term to string (aka ugly/pretty printing)
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3238 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-20 14:35:46 +00:00
Jürgen Doser 7528ea1d9a added first draft of structure Rep_SecureUML. There are however no functions for parsing Rep_SecureUML-types...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3237 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-20 13:08:17 +00:00
Jürgen Doser b447ec81d8 support for ownerScope and targetScope (i.e., whether they are static features or not) for attributes, operations, and association ends
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3236 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-20 13:03:44 +00:00
Jürgen Doser 85c5d8d406 2 simple testing function for kind of pseudo states
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3188 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-07 17:04:26 +00:00
Achim D. Brucker 268c540455 git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3182 3260e6d1-4efc-4170-b0a7-36055960796d 2005-10-06 17:10:55 +00:00
Achim D. Brucker 902a9a1912 sadly, fxp needs Word32 ...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3181 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-06 16:33:24 +00:00
Jürgen Doser 22cd693896 don't escape apostrophes when printing attribute values
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3180 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-06 16:30:55 +00:00
Jürgen Doser 12675f13af support for tagged values on attributes
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3179 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-06 16:30:20 +00:00
Achim D. Brucker d523496968 changed all occurrences of "Word32" to "LargeWord" which
is more portable, i.e., all standard compliant compilers
should offer LargeWord whereas Word32 is not required by 
the standard. Note that "Word" should be suffiecent on 
most modern architectures....



git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3176 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-06 08:30:19 +00:00
Jürgen Doser 68318dc4bf some support for ClassifierInState
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3175 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-05 17:18:41 +00:00
Jürgen Doser d3c2e3c478 auxiliary function state_entry_of
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3174 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-05 16:13:49 +00:00
Jürgen Doser a8f529d490 handle output of Text nodes when writing XML trees
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3173 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-05 16:13:27 +00:00
Achim D. Brucker 190a9166dd new stub based on LargeWord
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3171 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-05 12:40:40 +00:00
Achim D. Brucker aedc7882c3 added patch for compiling with PolyML 4.1.4 (not yet functional)
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3168 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-05 10:52:16 +00:00
Jürgen Doser 098d84ef77 helper function state_name_of
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3159 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-30 10:14:47 +00:00
Jürgen Doser af79670266 support for reading from stdin and writing to stdout
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3157 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-29 11:30:13 +00:00
Jürgen Doser e46e2e3a78 escape the special characters "<", ">", "'", "\"", "&" when outputting xml
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3156 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-29 10:10:53 +00:00
Jürgen Doser 57201694f9 fxp parses text with quotations as lists of text elements, so we have to concatenate these when parsing tagged values
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3155 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-29 10:09:19 +00:00
Jürgen Doser 29c36c6059 stereotypes and tagged values on packages
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3153 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-28 16:55:59 +00:00
Jürgen Doser 72b04971f0 fixed two non-exhaustive pattern matches
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3151 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-28 11:56:37 +00:00
Jürgen Doser 0270ddc47c helper function for tagged values of states
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3142 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-27 11:18:26 +00:00
Jürgen Doser 5fa0463fc6 added helper function to check whether a class has a given stereotype
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3141 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-27 09:20:59 +00:00
Jürgen Doser f915c4e4e2 eliminated some dependencies on library.sml and commented out some unneeded functions from library.sml
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3136 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-26 16:20:14 +00:00
Jürgen Doser b9e16e2073 commented out the parsing of the dtd. it does not seem to have an effect. Apparently, the parser build a matching dtd while parsing the xml-file. I have yet to find out how to force the parser to validate the xml against a given dtd.
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3135 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-26 16:01:31 +00:00
Jürgen Doser dd5df17576 print "<tagname />" instead of "<tagname></tagname>" in WriteXmlTree
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3134 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-26 13:30:11 +00:00
Jürgen Doser fa5bd35478 moved two functions from xmi2rep to xmi_idtable to allow reuse
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3133 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-26 12:30:02 +00:00
Achim D. Brucker 6b6f4d37ba removed no longer needed UML15OCL.dtd and dummy.xmi
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3132 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-26 12:22:22 +00:00
Jürgen Doser 08e15919cd fixed some non-exhaustive pattern matches
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3130 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-26 11:02:10 +00:00
Jürgen Doser 6a83e8243a typo...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3129 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-26 10:29:11 +00:00
Jürgen Doser 44d9fd6c6b handle association classes as classifiers.
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3128 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-26 10:27:06 +00:00
Jürgen Doser 1da326058f AssociationClass is now represented in XMI datatstructure directly
(this may break xmi2rep for a while...)

git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3127 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-26 10:23:34 +00:00
Achim D. Brucker 956087e4a2 readded UML150CL.dtd
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3121 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-25 12:26:54 +00:00
Achim D. Brucker ea2923a7f8 removed old CVS subdirs
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3120 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-25 12:26:24 +00:00
Jürgen Doser ed7dd0c58e added check for environment variable UML2CDL_HOME, merged dummy.xmi and UML15OCL.dtd
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3119 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-23 11:18:24 +00:00
Jürgen Doser 946bc897f4 List.map => List.app to make mlton happier
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3117 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-22 12:02:31 +00:00
Achim D. Brucker 91cabacecb renaming
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3116 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-22 11:20:12 +00:00
Achim D. Brucker 078abb3d2d git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3114 3260e6d1-4efc-4170-b0a7-36055960796d 2005-09-21 18:22:50 +00:00
Achim D. Brucker 2f78b7aeeb git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3113 3260e6d1-4efc-4170-b0a7-36055960796d 2005-09-21 18:22:32 +00:00
Jürgen Doser d2c9e3321e taggedValues for informationTypes
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3112 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-21 16:40:24 +00:00
Jürgen Doser 62487325d5 support for taggedValues
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3111 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-21 16:11:45 +00:00
Jürgen Doser a18ccbf2db also handle dependencies in top-level model, not only in packages
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3110 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-21 15:04:23 +00:00
Jürgen Doser b9c847257e parse Interfaces as interfaces, not as primitive types
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3109 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-21 14:47:17 +00:00
Jürgen Doser de936e6745 some support for Dependencies between Classifiers (e.g., a class realizes an interface)
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3108 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-21 14:17:47 +00:00
Jürgen Doser dd246533da added some auxiliary functions for handling states and transitions
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3107 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-20 16:20:08 +00:00
Achim D. Brucker b351643028 Bereinigte Modelle.
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3106 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-20 13:55:05 +00:00