Commit Graph

305 Commits

Author SHA1 Message Date
Jürgen Doser 42535da44d actually convert let-exps into rep
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5518 3260e6d1-4efc-4170-b0a7-36055960796d
2006-10-30 10:21:20 +00:00
Jürgen Doser 214ebf3b98 take variable name inside let-exps from variable, not from let-exp...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5517 3260e6d1-4efc-4170-b0a7-36055960796d
2006-10-30 10:20:47 +00:00
Jürgen Doser 0cf0e16b30 Better error msgs for nonexisting attributes
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5516 3260e6d1-4efc-4170-b0a7-36055960796d
2006-10-30 10:20:14 +00:00
Jürgen Doser 78780b5ff9 Do not require initial values of attributes to be specified in OCL.
We still only recognize them when specified in OCL, but we do not abort otherwise, we just ignore them now.


git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5515 3260e6d1-4efc-4170-b0a7-36055960796d
2006-10-30 09:09:43 +00:00
Jürgen Doser 852c559c24 codegen now falls back to su4sml_home, when $CODEGEN_HOME is not defined
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5511 3260e6d1-4efc-4170-b0a7-36055960796d
2006-10-27 14:03:31 +00:00
Jürgen Doser 1b23e52a76 started work on su2holocl transformation
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5505 3260e6d1-4efc-4170-b0a7-36055960796d
2006-10-26 15:31:46 +00:00
Jürgen Doser c475221df5 primitive hack to support TYPE::allInstances()
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5455 3260e6d1-4efc-4170-b0a7-36055960796d
2006-10-19 13:33:02 +00:00
Jürgen Doser 3ba0df156e minor error message improvement
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5454 3260e6d1-4efc-4170-b0a7-36055960796d
2006-10-19 13:02:54 +00:00
Jürgen Doser 8351ae7cfe restructuring. should give better error messages now
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5446 3260e6d1-4efc-4170-b0a7-36055960796d
2006-10-18 17:38:47 +00:00
Jürgen Doser badb3a7342 some restructuring
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5431 3260e6d1-4efc-4170-b0a7-36055960796d
2006-10-17 15:10:32 +00:00
Jürgen Doser 679f1b4cc5 reactivated codegen support for componentuml
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5420 3260e6d1-4efc-4170-b0a7-36055960796d
2006-10-12 08:18:53 +00:00
Achim D. Brucker 1f76d533a8 added OclLib (package: UML_OCL) implementation
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5397 3260e6d1-4efc-4170-b0a7-36055960796d
2006-10-04 08:03:29 +00:00
Achim D. Brucker f3947ff40f resolved name clash with datatype constructor (Isabelle-related)
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5388 3260e6d1-4efc-4170-b0a7-36055960796d
2006-09-30 04:40:50 +00:00
Jürgen Doser 802f085a5f mainly some code cleanups and documentation additions
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5383 3260e6d1-4efc-4170-b0a7-36055960796d
2006-09-28 08:55:36 +00:00
Jürgen Doser 8b1fb88f41 fixed build files (ROOT.ML and su4sm.cm) to include statemachine cartridge
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5382 3260e6d1-4efc-4170-b0a7-36055960796d
2006-09-28 08:53:11 +00:00
Jürgen Doser c13e2fe7b8 fixed build files (ROOT.ML and su4sm.cm) to include statemachine cartridge
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5381 3260e6d1-4efc-4170-b0a7-36055960796d
2006-09-28 08:50:48 +00:00
Jürgen Doser 7806e60666 added code for statemachine generator from Rolf
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@5365 3260e6d1-4efc-4170-b0a7-36055960796d
2006-09-25 15:53:22 +00:00
Achim D. Brucker eb55357e00 git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4598 3260e6d1-4efc-4170-b0a7-36055960796d 2006-05-29 10:18:26 +00:00
Jürgen Doser 9811dcc1f6 some cleanup
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4556 3260e6d1-4efc-4170-b0a7-36055960796d
2006-05-17 17:23:26 +00:00
Jürgen Doser 8553dced2d ups. fixed syntax error...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4555 3260e6d1-4efc-4170-b0a7-36055960796d
2006-05-17 10:36:48 +00:00
Jürgen Doser 5516ce4fea fixed bug in handling composite actions
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4554 3260e6d1-4efc-4170-b0a7-36055960796d
2006-05-17 10:19:49 +00:00
Jürgen Doser 2e6e913e5c more work...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4551 3260e6d1-4efc-4170-b0a7-36055960796d
2006-05-16 14:44:25 +00:00
Jürgen Doser 9fb8dba9f1 type-checking and running, but producing wrong results...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4520 3260e6d1-4efc-4170-b0a7-36055960796d
2006-05-09 16:04:43 +00:00
Jürgen Doser 287aef041a hack to handle typing problem with @pre
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4519 3260e6d1-4efc-4170-b0a7-36055960796d
2006-05-09 13:17:45 +00:00
Jürgen Doser 3544007bb5 only store association end name in table, not the whole path
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4514 3260e6d1-4efc-4170-b0a7-36055960796d
2006-05-09 09:33:16 +00:00
Jürgen Doser 09d5268600 more work on parsing secureuml stereotypes
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4511 3260e6d1-4efc-4170-b0a7-36055960796d
2006-05-08 12:45:24 +00:00
Jürgen Doser 292d425356 allow unnamed association ends (name is generated from associated class) and better handling of association classes
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4510 3260e6d1-4efc-4170-b0a7-36055960796d
2006-05-08 12:44:07 +00:00
Jürgen Doser bc2aea45c4 more work and cleanup
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4495 3260e6d1-4efc-4170-b0a7-36055960796d
2006-05-04 15:22:13 +00:00
Jürgen Doser fa80539581 started to parse SecureUML stereotypes
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4485 3260e6d1-4efc-4170-b0a7-36055960796d
2006-05-03 17:29:43 +00:00
Achim D. Brucker dfb52793e3 added some utility methods
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4461 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-28 08:14:04 +00:00
Achim D. Brucker 0289211732 added some utility methods
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4460 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-28 08:12:27 +00:00
Jürgen Doser 67ffc91aef adjusted ROOT.ML files
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4449 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-27 14:32:25 +00:00
Jürgen Doser e9a24cfac6 some cleanup
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4448 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-27 14:27:16 +00:00
Jürgen Doser 76f9ee17e7 another typechecking but not (fully) functional version
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4446 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-26 16:22:32 +00:00
Jürgen Doser 8199af7c64 added files to ROOT.ML
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4437 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-24 12:40:46 +00:00
Jürgen Doser ba272e35a6 typechecks again, but definitely not working correctly...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4435 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-24 11:52:55 +00:00
Jürgen Doser f222e577a6 missing files...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4434 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-24 11:42:40 +00:00
Jürgen Doser 24fc67da90 typecheckes, but not sure if working...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4433 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-24 10:19:08 +00:00
Jürgen Doser ff8b5fcc03 more cleanup...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4376 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-11 17:34:08 +00:00
Jürgen Doser 5276112b7e added some documentation
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4375 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-11 16:38:21 +00:00
Jürgen Doser e973612ad3 clean up...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4374 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-11 16:36:17 +00:00
Jürgen Doser 49cd212811 clean up...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4373 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-11 16:36:10 +00:00
Jürgen Doser 7bdf56d18c started to clean up...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4372 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-11 16:35:32 +00:00
Jürgen Doser 86cffb3cd6 do not parse untype-checked ocl constraints
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4361 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-07 14:35:12 +00:00
Jürgen Doser bc00bc6bd6 do not consider associations between actors and use-cases
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4360 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-07 13:45:04 +00:00
Jürgen Doser 52030e057e parse UML1.4 Transition effects
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4359 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-07 12:37:57 +00:00
Jürgen Doser fd80d7f110 allow actions as transition effects
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4358 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-07 12:30:32 +00:00
Jürgen Doser 0a93f91872 adjustments for parsing ArgoUML statemachines and activitygraphs
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4357 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-07 12:04:18 +00:00
Jürgen Doser b8321962d0 adjusted mlb file for codegenerator
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4356 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-07 12:01:11 +00:00
Jürgen Doser 3095b974ff shortened invariant name for multiplicity constraint
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4355 3260e6d1-4efc-4170-b0a7-36055960796d
2006-04-07 12:00:05 +00:00
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
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
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
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
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
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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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