Commit Graph

222 Commits

Author SHA1 Message Date
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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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
Jürgen Doser 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