52f2059851
some more minore changes for UML1.4 (ArgoUML) compatibility
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4354 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-07 11:39:20 +00:00
2f6628cf50
changes for UML1.4 (ArgoUML) compatibility
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4353 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-07 10:26:54 +00:00
Achim D. Brucker
dfe13bc7ac
SM update and fixes
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4320 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-05 10:29:18 +00:00
71c7e39694
allow OCL expressions in transition guards
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4319 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-05 09:50:36 +00:00
Achim D. Brucker
08d30e9545
implode -> String.implode and explode -> String.explode
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4215 3260e6d1-4efc-4170-b0a7-36055960796d
2006-03-21 15:51:22 +00:00
41c727cb0a
adapted ROOT.ML files and .cm files
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4214 3260e6d1-4efc-4170-b0a7-36055960796d
2006-03-21 14:14:11 +00:00
4ba2516d92
codegen-sourcen von Raphael
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4212 3260e6d1-4efc-4170-b0a7-36055960796d
2006-03-21 13:14:15 +00:00
69b426c531
attributes without explicit mutliplicity now get multiplicity 1
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4124 3260e6d1-4efc-4170-b0a7-36055960796d
2006-03-08 11:19:20 +00:00
5ab79aa912
simple prettyprinter for Rep.Classifier
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4123 3260e6d1-4efc-4170-b0a7-36055960796d
2006-03-08 10:55:55 +00:00
ed0d9fbc3a
relaxed recognition of typename in UML_OCL package
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3961 3260e6d1-4efc-4170-b0a7-36055960796d
2006-02-13 12:11:44 +00:00
5ad94a91bf
fixed a nonexhausitve match failure
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3922 3260e6d1-4efc-4170-b0a7-36055960796d
2006-02-06 08:48:54 +00:00
9bf4259bf3
added name attribute for composite states
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3898 3260e6d1-4efc-4170-b0a7-36055960796d
2006-02-03 09:51:43 +00:00
7919a1b5c7
added name attribute to simple states and action states, parse effects on transitions. Beware: this breaks parsing of entry and exit actions
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3896 3260e6d1-4efc-4170-b0a7-36055960796d
2006-02-02 15:11:48 +00:00
ae7a78bdd4
started work on parsing secureuml stereotypes
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3796 3260e6d1-4efc-4170-b0a7-36055960796d
2006-01-22 21:18:26 +00:00
Achim D. Brucker
9f504ee119
adding missing )
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3750 3260e6d1-4efc-4170-b0a7-36055960796d
2006-01-17 17:48:45 +00:00
bce2acafcb
support for SU4SML_HOME environment variable, which is supposed to point to the su4sml directory
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3748 3260e6d1-4efc-4170-b0a7-36055960796d
2006-01-17 15:52:29 +00:00
c38d173407
added some missing files
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3730 3260e6d1-4efc-4170-b0a7-36055960796d
2006-01-12 16:07:16 +00:00
Achim D. Brucker
b03a72e189
fixed typo in operator name
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3398 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-17 11:07:07 +00:00
Achim D. Brucker
719054e664
added missing path seperator
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3375 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-16 07:18:38 +00:00
Achim D. Brucker
7e0c828e9e
fixed missing |
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3369 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-15 22:34:07 +00:00
Achim D. Brucker
c33c10d328
updated intpretation of HOLOCL_HOME
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3366 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-15 10:36:56 +00:00
620a634c0a
validate the parsed xmi-file against UML15OCL.dtd, print error and warning messages while parsing, but continues to parse the xmi file when file is not valid but still well-formed
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3364 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-14 16:16:05 +00:00
Achim D. Brucker
30840ea1bb
made attribute multiplicities and init values optional
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3359 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-14 12:06:21 +00:00
af1f1e2844
improved support for statemachine
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3347 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-11 16:15:47 +00:00
9429803f72
replace empty variable names with "anonIterVar_<xmiid>"
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3343 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-11 11:43:22 +00:00
c9ac1a7af2
parse _empty_ CollectionLiterals (again, a change to OclTerm was necessary, so please check)
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3331 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-09 18:37:10 +00:00
06871fd6ee
parse Iterate expressions (needed to change oclterm type for that, so please check)
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3330 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-09 18:06:29 +00:00
ba702bdaf1
handle variables in iterators
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3313 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-04 08:21:21 +00:00
a03a843c72
Actionstates only have entry actions, no exit or do actions.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3307 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-03 10:40:49 +00:00
d1e17656f6
Pseudostates do not have entry, exit or do actions.
...
Finalstates do not have outgoing transitions
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3306 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-03 10:37:29 +00:00
51ad229c80
added statemachines to classes, parse do- and exit activities
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3305 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-03 10:13:41 +00:00
fbdc3ece36
updated .cm file
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3304 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-03 09:29:09 +00:00
Achim D. Brucker
ced17e87f2
added normalize_init
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3300 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-02 17:59:56 +00:00
0af74bb770
support for body expressions: convert in to "result = ..." postconditions. There might appear DummyT's, however...
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3299 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-02 15:23:23 +00:00
b636c52e76
support for initial values for attributes
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3298 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-02 11:35:44 +00:00
024a426c24
started work on parsing collection literals
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3294 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-01 17:51:19 +00:00
14438e3903
datatype declarations for CollectionLiterals
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3293 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-01 17:48:24 +00:00
9db920768b
next draft of "secure" repository structure
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3289 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-01 16:35:23 +00:00
Achim D. Brucker
d29962fec9
added init to assoc_ends and attributes and introduced a type 'attribute'
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3287 3260e6d1-4efc-4170-b0a7-36055960796d
2005-11-01 07:32:21 +00:00
e03d096f11
handle operation calls with more than one argument.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3275 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-31 09:17:26 +00:00
Achim D. Brucker
e276df5b6a
ocl2string now also works with plain SML
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3268 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-30 19:15:00 +00:00
e3cab5df8d
actually starts to transform xmi statemachines into rep statemachines
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3264 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-28 15:52:01 +00:00
0211494494
rudimentary support for parsing ArgoUML 0.19.7 activity diagrams into rep_statemachines. Needs to be cleaned up and consolidated with Poseidon support (which should still work however, as far as it worked before)
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3263 3260e6d1-4efc-4170-b0a7-36055960796d
2005-10-28 14:39:09 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
7bf5fc4dce
added states and transitions to xmi_idtable
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3105 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-20 13:26:26 +00:00
7b2cd8f2e4
small fix to make parsing of packages safer
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3104 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-20 13:25:46 +00:00
Achim D. Brucker
838bb27f24
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3103 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-20 12:13:24 +00:00
Achim D. Brucker
6332cfe676
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3102 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-20 11:55:10 +00:00
f0ac1607e9
added reference from classifiers to activity graphs into xmi_idtable
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3098 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-19 16:03:43 +00:00
Achim D. Brucker
de0cb4d9b4
updated/added cm files
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3093 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-19 06:10:47 +00:00
6b81909579
fixed a nonexhaustive pattern match
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3075 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 15:56:28 +00:00
f75dab512f
cd -> OS.FileSys.chDir
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3073 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 13:51:27 +00:00
85e178d1f8
revert typo fix (Achim was faster...)
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3072 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 13:49:35 +00:00
a87b1572d6
include original XMI.Classifier in Hashtable (xmi_idtable)
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3071 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 13:33:59 +00:00
Achim D. Brucker
54df0876dd
updated MLton support
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3070 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 13:33:06 +00:00
0d761ea3dd
added auxiliary function
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3069 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 13:32:21 +00:00
a9a46e16c3
fixed typo (missing paren)
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3068 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 13:31:33 +00:00
Achim D. Brucker
a53a861696
fixed syntax error
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3067 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 13:25:07 +00:00
4f023966ff
simplified some things by using new semantics of XmlTree.follow
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3065 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 11:31:24 +00:00
b07f4135e4
moved two (forgotten) insert functions into xmi_idtable
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3064 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 10:55:49 +00:00
70c95f2abe
support for stereotypes on XMI.Class's
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3063 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 10:54:51 +00:00
8d2def2b44
XmlTree.follow now returns an empty list (of child trees) instead of throwing an error
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3062 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 10:52:35 +00:00
e02f2e6371
moved xmi.id table to a seperate structure and file
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3061 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-14 16:51:46 +00:00
Achim D. Brucker
0ab220228b
a first step towards mlton support
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3060 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-14 13:24:57 +00:00
Achim D. Brucker
b3095da12d
a first step towards mlton support
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3059 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-14 13:24:44 +00:00
ccc635a0ee
fixes bugs due to including of CDATA in XmlTree
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3057 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-14 09:21:47 +00:00
6fa8fe4a36
parses CData (text between XML elements)
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3056 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-14 07:58:28 +00:00
Achim D. Brucker
3eac0ae7f6
Tagged Values (modulo Bug in XMLtree Schnittstelle)
...
und Stereotypes eingebaut.
Allerdings haben Transitionen noch keine stereotypes.
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3055 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-13 20:15:00 +00:00
b9ef294de6
be more liberal in parsing association ends:
...
names, orderingKind, aggregationKind attributes are now optional in the XMI.
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3052 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-13 15:56:31 +00:00
Achim D. Brucker
a5671a5d4f
Guards und Entries eingebaut.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3048 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-12 20:13:23 +00:00
93620333cf
added leading "<?xml version=...?>" line to the output of WriteXmlTree.
...
added small comment to WriteXmlTree
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3046 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-12 08:58:30 +00:00
376d29234f
added UML:CallACtion, UML:Action.script and UML:ActionExpression to DTD, for compatibility with Poseidon 3.1
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3045 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-12 07:30:10 +00:00
Achim D. Brucker
552f62e765
Mehr States im xmi parser beruecksichtigt.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3044 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-09 14:58:20 +00:00
Achim D. Brucker
76390fcbee
First xmi-parser for smoe activity graph.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3043 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-08 17:00:46 +00:00
Achim D. Brucker
964e16b176
First Version of xmi_activity_charts.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3042 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-08 10:27:14 +00:00
Achim D. Brucker
dc631024a5
First Version of a StateMachine-xmi.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3041 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-08 10:11:43 +00:00
Achim D. Brucker
6d0b9307a7
Kommentierung verbessert.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3040 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-08 09:43:47 +00:00
Achim D. Brucker
8eac5e0f8a
structural reform: end.
...
- xmi_state_machines introduced.
- file renaming: machine -> machines.
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3039 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-08 09:26:32 +00:00
Achim D. Brucker
07e0e9f7ed
Structural Reform: Splitting xmi.sml in subparts.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3038 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-08 09:16:50 +00:00
Achim D. Brucker
ddc36ea5e8
Tiefes Renaming von rep_ocl.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3037 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-07 18:23:24 +00:00
Achim D. Brucker
6faecbf088
xdg
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3036 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-07 17:49:13 +00:00
Achim D. Brucker
e2bee654b9
Further restructuring.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3035 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-07 17:44:26 +00:00
Achim D. Brucker
fc39c1e45d
More Restructuring.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3034 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-07 17:32:04 +00:00
Achim D. Brucker
06fac57fc1
Further restructuring.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3033 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-07 17:20:25 +00:00
Achim D. Brucker
29832a00ae
Further Alignments of FileNames.
...
(Structure Names will follow...)
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3032 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-07 17:10:46 +00:00
Achim D. Brucker
b05c61c478
iGlobal Renaming.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3031 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-07 17:06:26 +00:00
Achim D. Brucker
280d3cdfea
First restructuring with including activity graphs.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3030 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-07 17:02:47 +00:00
e3ca4161e1
support for "OclOperationWithTypeArgExp" like "oclIsKindOf"
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3029 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-07 07:35:31 +00:00
Achim D. Brucker
1ae8e04ff4
In Kernsignatur Elemente von ActivityCharts eingebaut.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3026 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-05 16:26:07 +00:00
Achim D. Brucker
5306516f26
added dummyT in string_of_OclType
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2996 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-29 06:28:17 +00:00
60fd646460
catch errors while parsing constraints and return the trivial constraint "true" in these cases.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2995 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-26 12:29:56 +00:00
2b615407b9
added support for string and real literals
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2994 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-26 11:56:18 +00:00
b861fabc8a
ocl expression now include a "ocl_type.DummyT", if no type information is found in the xmi-file
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2993 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-26 11:50:39 +00:00
Achim D. Brucker
99fe3d0c9d
added result type to mangeling
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2984 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-24 11:47:57 +00:00
9f2e45b8a2
generate safe invariant name
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2978 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-23 15:38:39 +00:00
8ded57064a
support multiplicites and ordering kind for attributes
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2976 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-23 15:03:15 +00:00
cc344ed2d3
"almost" completely reads examples/royals_and_loyals/Poseidon/royals_and_loyals.zuml
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2972 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-23 11:37:41 +00:00
Achim D. Brucker
bc29e3ffae
convert empty strings in contraint names to NONE
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2968 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-23 09:27:26 +00:00
9a76391fd9
some cleanup for exception handling
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2967 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-23 09:13:15 +00:00
fcd0e9adaa
exception handling now kind of works. Has to be cleand up though.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2966 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-23 08:03:09 +00:00
db5a6214e8
transform association end calls in ocl expressions
...
parse and transform iterator expressions (like collect)
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2961 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-22 15:04:08 +00:00
73ab2c0fee
worked on exception handling. goal is that exceptions should be catched and an empty list of classifiers should be returned
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2958 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-20 20:50:18 +00:00
0446731942
names for associations are now optional
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2957 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-20 18:55:18 +00:00
ac5c281303
some refactoring
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2956 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-20 18:42:39 +00:00
d2078029c1
added some signature definitions
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2955 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-19 16:04:10 +00:00
ab657b2ecf
fixed mkStereotype
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2954 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-19 14:40:25 +00:00
Achim D. Brucker
fad686ade3
getIntegerAtt -> getIntAtt
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2953 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-19 13:58:50 +00:00
1b5c0e69e1
refactoring: split XMI_UML into an increasing sequence of smaller structures, roughly following UML 1.5 packages: OCL -> DataTypes -> Extension Mechanismes -> Core -> Model Management -> ...
...
removed some redundant "UML" prefixes in datatypes
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2952 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-19 11:39:04 +00:00
3e22dc7585
more verbose exception handling
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2950 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-18 16:18:28 +00:00
7a649832f8
fixed Bug: Parser did find the dummy.xmi, but not the dtd referenced in it.
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2949 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-18 15:17:51 +00:00
Achim D. Brucker
9d3d6d389d
cleanup
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2945 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-18 05:55:15 +00:00
Achim D. Brucker
3857c3c1ff
integrated last patches from Jürgen
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2944 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-17 17:22:10 +00:00
Achim D. Brucker
c07c040925
inital version (removed all dependencies to Isabelle)
...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@2941 3260e6d1-4efc-4170-b0a7-36055960796d
2005-08-17 15:45:10 +00:00
Jürgen Doser
Achim D. Brucker