diff --git a/lib/fxp/src/fxlib.110.62.cm b/lib/fxp/src/fxlib.110.62.cm deleted file mode 100644 index 45a0d7b..0000000 --- a/lib/fxp/src/fxlib.110.62.cm +++ /dev/null @@ -1,101 +0,0 @@ -Group is -#if(defined(SMLNJ_VERSION)) - $smlnj/basis/basis.cm - $smlnj/compiler/compiler.cm -#else -#endif - config.sml - Util/utilCompare.sml - Util/utilString.sml - Util/utilError.sml - Util/utilHash.sml - Util/utilInt.sml - Util/utilList.sml - Util/utilTime.sml - Util/intLists.sml - Util/intSets.sml - Util/options.sml - Util/SymDict/key.sml - Util/SymDict/dict.sml - Util/SymDict/symbolTable.sml - Util/SymDict/intSetDict.sml - Util/SymDict/intDict.sml - Util/SymDict/intListDict.sml - Util/SymDict/stringDict.sml - Unicode/Chars/uniChar.sml - Unicode/Chars/charClasses.sml - Unicode/Chars/charVecDict.sml - Unicode/Chars/dataDict.sml - Unicode/Chars/uniRanges.sml - Unicode/Chars/uniClasses.sml - Unicode/Chars/testClasses.sml - Unicode/Uri/uriDecode.sml - Unicode/Uri/uriEncode.sml - Unicode/Uri/uri.sml - Unicode/Uri/uriDict.sml - Unicode/encoding.sml - Unicode/Encode/encodeBasic.sml - Unicode/Encode/encodeError.sml - Unicode/Encode/encodeMisc.sml - Unicode/Encode/encode.sml - Unicode/Decode/decodeFile.sml - Unicode/Decode/decodeError.sml - Unicode/Decode/decodeMisc.sml - Unicode/Decode/decodeUtil.sml - Unicode/Decode/decodeUcs2.sml - Unicode/Decode/decodeUcs4.sml - Unicode/Decode/decodeUtf16.sml - Unicode/Decode/decodeUtf8.sml - Unicode/Decode/decode.sml - Parser/version.sml - Parser/Dfa/dfaData.sml - Parser/Dfa/dfaError.sml - Parser/Dfa/dfaOptions.sml - Parser/Dfa/dfaUtil.sml - Parser/Dfa/dfaPassOne.sml - Parser/Dfa/dfaPassTwo.sml - Parser/Dfa/dfaPassThree.sml - Parser/Dfa/dfaString.sml - Parser/Dfa/dfa.sml - Parser/Error/errorData.sml - Parser/Error/errorString.sml - Parser/Error/errorMessage.sml - Parser/Error/errorUtil.sml - Parser/Error/expected.sml - Parser/Error/errors.sml - Parser/Base/baseData.sml - Parser/Base/baseString.sml - Parser/Base/base.sml - Parser/Params/dtd.sml - Parser/Params/hookData.sml - Parser/Params/hooks.sml - Parser/Params/ignore.sml - Parser/Params/parserOptions.sml - Parser/Params/resolve.sml - Parser/entities.sml - Parser/Dtd/dtdDeclare.sml - Parser/Dtd/dtdAttributes.sml - Parser/Dtd/dtdManager.sml - Parser/Parse/parseBase.sml - Parser/Parse/parseNames.sml - Parser/Parse/parseMisc.sml - Parser/Parse/parseXml.sml - Parser/Parse/parseRefs.sml - Parser/Parse/parseLiterals.sml - Parser/Parse/parseTags.sml - Parser/Parse/parseDecl.sml - Parser/Parse/parseDtd.sml - Parser/Parse/parseContent.sml - Parser/Parse/parseDocument.sml - Catalog/catData.sml - Catalog/catDtd.sml - Catalog/catError.sml - Catalog/catParams.sml - Catalog/catFile.sml - Catalog/catHooks.sml - Catalog/catOptions.sml - Catalog/socatParse.sml - Catalog/catParse.sml - Catalog/catalog.sml - Catalog/catResolve.sml - genRandom.sml diff --git a/lib/fxp/src/fxlib.cm b/lib/fxp/src/fxlib.cm index 3943dde..87079c6 100644 --- a/lib/fxp/src/fxlib.cm +++ b/lib/fxp/src/fxlib.cm @@ -1,9 +1,14 @@ Group is -#if(defined(SMLNJ_VERSION)) - $/basis.cm - $smlnj/compiler/compiler.cm -#else +#if(defined(SMLNJ_VERSION) && (SMLNJ_MINOR_VERSION < 60)) + $/basis.cm + $smlnj/compiler/compiler.cm #endif + +#if(defined(SMLNJ_VERSION) && (SMLNJ_MINOR_VERSION >= 60)) + $smlnj/basis/basis.cm + $smlnj/compiler/compiler.cm +#endif + config.sml Util/utilCompare.sml Util/utilString.sml diff --git a/manual/manual.tex b/manual/manual.tex index 1adbf69..63efee1 100644 --- a/manual/manual.tex +++ b/manual/manual.tex @@ -2,9 +2,8 @@ \usepackage[utf8]{inputenc} \usepackage[draft]{fixme} \begin{document} -\titlehead{Information Security Group\\ETH Zurich} \title{The SU4SML Manual} -\author{Jürgen Doser (et al.?)} +\author{Achim Brucker and Jürgen Doser} \maketitle \tableofcontents @@ -81,6 +80,16 @@ Based on \cite{stock:automatic:2007} subsections for additional things like the jtestdataaccessor library from Manfred, or the statemachine animator from Rolf. +\chapter{Developer's Guide} +\section{Build Setup} +We currently support the following SML compiler: +\begin{itemize} +\item sml/NJ (tested with version 110.52 and 110.62) using CM files +\item mlton (tested with version 20061107-1) using CM files +\item poly/ML (tested with version 5.0) using ROOT.ML files (i.e., plain \texttt{use} commands) +\end{itemize} + + %%% bibliography: all the related papers and student theses \bibliographystyle{alpha} \bibliography{su4sml} diff --git a/src/codegen/base_cartridge.sig b/src/codegen/base_cartridge.sig deleted file mode 100644 index 0301dfb..0000000 --- a/src/codegen/base_cartridge.sig +++ /dev/null @@ -1,64 +0,0 @@ -(***************************************************************************** - * su4sml --- a SML repository for managing (Secure)UML/OCL models - * http://projects.brucker.ch/su4sml/ - * - * base_cartridge.sig --- an extended signature of CARTRIDGE specific for - * the base cartridge - * This file is part of su4sml. - * - * Copyright (c) 2005-2007, ETH Zurich, Switzerland - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ******************************************************************************) -(* $Id$ *) - -(** - * This cartridge knows about the basic elements of UML class diagrams. - * The elements are classifiers, attributes, and operations with their - * parameters in terms of the Rep interface - *) -signature BASE_CARTRIDGE = -sig - include CARTRIDGE - -(** returns the current classifier. *) -val curClassifier: environment -> Rep.Classifier option - -(** returns the current attribute *) -val curAttribute: environment -> Rep.attribute option - -(** returns the current operation *) -val curOperation: environment -> Rep.operation option - -(** returns the current operation parameter *) -val curArgument : environment -> (string * Rep_OclType.OclType) option - -end diff --git a/src/codegen/codegen.110.62.cm b/src/codegen/codegen.110.62.cm deleted file mode 100644 index 0568e65..0000000 --- a/src/codegen/codegen.110.62.cm +++ /dev/null @@ -1,70 +0,0 @@ -(***************************************************************************** - * su4sml --- a SML repository for managing (Secure)UML/OCL models - * http://projects.brucker.ch/su4sml/ - * - * codegen.110.62.cm --- - * This file is part of su4sml. - * - * Copyright (c) 2007, ETH Zurich, Switzerland - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ******************************************************************************) -(* $Id: codegen.cm 40127 2007-07-04 06:41:30Z brucker $ *) - -Group is -#if(defined(NEW_CM)) - $smlnj/basis/basis.cm - $smlnj/compiler/compiler.cm - $smlnj/smlnj-lib/smlnj-lib.cm - ../su4sml.110.62.cm -#else -#endif - cartridge.sig - security_cartridge.sig - gcg_helper.sml - tpl_parser.sml - SM_helper.sml - stateMachine.sml - stateMachineTypes.sml - base_cartridge.sml - stringHandling.sml - c#_cartridge.sml - c#_net1_cartridge.sml - secureuml_cartridge.sml - design_cartridge.sig - componentuml_cartridge.sml - c#sm_cartridge.sml - java_cartridge.sml - junit_cartridge.sml - maven_pom_cartridge.sml - use_cartridge.sml - gcg_core.sml - codegen.sml diff --git a/src/codegen/codegen.cm b/src/codegen/codegen.cm index bef3d50..e6ca335 100644 --- a/src/codegen/codegen.cm +++ b/src/codegen/codegen.cm @@ -40,31 +40,35 @@ (* $Id$ *) Group is -#if(defined(SMLNJ_VERSION)) + +#if(defined(SMLNJ_VERSION) && (SMLNJ_MINOR_VERSION < 60)) $/basis.cm - $smlnj/compiler/current.cm - $/smlnj-lib.cm -#else + $/ml-yacc-lib.cm #endif - ../su4sml.cm - cartridge.sig - security_cartridge.sig - gcg_helper.sml - tpl_parser.sml - SM_helper.sml - stateMachine.sml - stateMachineTypes.sml - base_cartridge.sml - stringHandling.sml - c#_cartridge.sml - c#_net1_cartridge.sml - secureuml_cartridge.sml - design_cartridge.sig - componentuml_cartridge.sml - c#sm_cartridge.sml - java_cartridge.sml - junit_cartridge.sml - maven_pom_cartridge.sml - use_cartridge.sml - gcg_core.sml - codegen.sml +#if(defined(SMLNJ_VERSION) && (SMLNJ_MINOR_VERSION >= 60)) + $smlnj/basis/basis.cm + $smlnj/ml-yacc/ml-yacc-lib.cm +#endif + + ../su4sml_core.cm + + stringHandling.sml + gcg_helper.sml + tpl_parser.sml + SM_helper.sml + stateMachineTypes.sml + stateMachine.sml + cartridge.sig + base_cartridge.sml + "c#_cartridge.sml" + "c#_net1_cartridge.sml" + "c#sm_cartridge.sml" + java_cartridge.sml + junit_cartridge.sml + maven_pom_cartridge.sml + use_cartridge.sml + secureuml_cartridge.sml + design_cartridge.sig + componentuml_cartridge.sml + gcg_core.sml + codegen.sml diff --git a/src/codegen/codegen.mlb b/src/codegen/codegen.mlb deleted file mode 100644 index c87089f..0000000 --- a/src/codegen/codegen.mlb +++ /dev/null @@ -1,77 +0,0 @@ -(***************************************************************************** - * su4sml --- a SML repository for managing (Secure)UML/OCL models - * http://projects.brucker.ch/su4sml/ - * - * codegen.mlb --- - * This file is part of su4sml. - * - * Copyright (c) 2005-2007, ETH Zurich, Switzerland - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ******************************************************************************) -(* $Id$ *) - -ann - "warnMatch false" - "allowFFI true" - "sequenceUnit false" - "allowExport true" -in - local - $(MLTON_ROOT)/basis/basis.mlb - ../su4sml.mlb - in - stringHandling.sml - gcg_helper.sml - tpl_parser.sig - tpl_parser.sml - SM_helper.sml - stateMachineTypes.sml - stateMachine.sml - cartridge.sig - base_cartridge.sig - base_cartridge.sml - "c#_cartridge.sml" - "c#_net1_cartridge.sml" - "c#sm_cartridge.sml" - java_cartridge.sml - junit_cartridge.sml - maven_pom_cartridge.sml - use_cartridge.sml - secureuml_cartridge.sig - secureuml_cartridge.sml - design_cartridge.sig - componentuml_cartridge.sml - gcg_core.sig - gcg_core.sml - codegen.sml - end -end diff --git a/src/codegen/secureuml_cartridge.sig b/src/codegen/secureuml_cartridge.sig deleted file mode 100644 index de73ce2..0000000 --- a/src/codegen/secureuml_cartridge.sig +++ /dev/null @@ -1,57 +0,0 @@ -(***************************************************************************** - * su4sml --- a SML repository for managing (Secure)UML/OCL models - * http://projects.brucker.ch/su4sml/ - * - * secureuml_cartridge.sig --- an extended signature of CARTRIDGE specific - * for the SecureUML cartridge - * This file is part of su4sml. - * - * Copyright (c) 2005-2007, ETH Zurich, Switzerland - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ******************************************************************************) -(* $Id$ *) - -signature SECUREUML_CARTRIDGE = -sig - include BASE_CARTRIDGE - -(** the particular secureuml dialect used *) -structure Security:SECURITY_LANGUAGE - -val curPermissionSet: environment -> Security.Permission list option -val curPermission : environment -> Security.Permission option -val curRole : environment -> string option -val curConstraint : environment -> Rep_OclTerm.OclTerm option - -val isInPermission : Security.Design.Action -> Security.Permission -> bool - -end diff --git a/src/codegen/tpl_parser.sig b/src/codegen/tpl_parser.sig deleted file mode 100644 index 3f09274..0000000 --- a/src/codegen/tpl_parser.sig +++ /dev/null @@ -1,58 +0,0 @@ -(***************************************************************************** - * su4sml --- a SML repository for managing (Secure)UML/OCL models - * http://projects.brucker.ch/su4sml/ - * - * tpl_parser.sig --- template parser of a su4sml-gcg template - * This file is part of su4sml. - * - * Copyright (c) 2005-2007, ETH Zurich, Switzerland - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ******************************************************************************) -(* $Id$ *) - -signature TPL_PARSER = -sig - -datatype TemplateTree - = ElseNode of TemplateTree list - | EvalLeaf of TemplateTree list - | ForEachNode of string * TemplateTree list - | IfNode of string * TemplateTree list - | OpenFileLeaf of string - | OpenFileIfNotExistsLeaf of string - | RootNode of TemplateTree list - | TextLeaf of string - -val printTTree : TemplateTree -> unit -val parse : string -> TemplateTree - -end diff --git a/src/ocl_parser/parser.110.62.cm b/src/ocl_parser/parser.110.62.cm deleted file mode 100644 index cb97ffa..0000000 --- a/src/ocl_parser/parser.110.62.cm +++ /dev/null @@ -1,67 +0,0 @@ -(***************************************************************************** - * su4sml --- a SML repository for managing (Secure)UML/OCL models - * http://projects.brucker.ch/su4sml/ - * - * parser.110.62.cm --- - * This file is part of su4sml. - * - * Copyright (c) 2005-2007, ETH Zurich, Switzerland - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ******************************************************************************) -(* $Id$ *) - -Group is -#if(defined(SMLNJ_VERSION)) - $smlnj/basis/basis.cm - $smlnj/compiler/compiler.cm - $smlnj/smlnj-lib/smlnj-lib.cm -#else -#endif - ../su4sml_core.110.62.cm - -#if defined (NEW_CM) - $smlnj/basis/basis.cm - $smlnj/ml-yacc/ml-yacc-lib.cm -#else - ml-yacc-lib.cm -#endif - - ocl.grm - ocl.lex - parser.sml - context_declarations.sml - library.sml - preprocessor.sml - type_checker.sml - make_classifier_list.sml - fix_types.sml - model_import.sml diff --git a/src/ocl_parser/parser.cm b/src/ocl_parser/parser.cm index 5ae9877..14353d2 100644 --- a/src/ocl_parser/parser.cm +++ b/src/ocl_parser/parser.cm @@ -40,26 +40,33 @@ (* $Id$ *) Group is -#if(defined(SMLNJ_VERSION)) + ../su4sml_core.cm + +#if(defined(SMLNJ_VERSION) && (SMLNJ_MINOR_VERSION < 60)) $/basis.cm - $smlnj/compiler/compiler.cm - $/smlnj-lib.cm -#else -#endif - ../su4sml_core.cm - -#if defined (NEW_CM) - $/basis.cm $/ml-yacc-lib.cm -#else - ml-yacc-lib.cm +#endif +#if(defined(SMLNJ_VERSION) && (SMLNJ_MINOR_VERSION >= 60)) + $smlnj/basis/basis.cm + $smlnj/ml-yacc/ml-yacc-lib.cm #endif + "library.sml" + context_declarations.sml +#if(defined(SMLNJ_VERSION)) ocl.grm ocl.lex +#else + "ml-yacc-lib/base.sig" + "ml-yacc-lib/join.sml" + "ml-yacc-lib/lrtable.sml" + "ml-yacc-lib/stream.sml" + "ml-yacc-lib/parser2.sml" + ocl.grm.sig + ocl.lex.sml + ocl.grm.sml +#endif parser.sml - library.sml - context_declarations.sml preprocessor.sml type_checker.sml make_classifier_list.sml diff --git a/src/su4sml-cygwin.mlb b/src/su4sml-cygwin.mlb deleted file mode 100644 index aeeab10..0000000 --- a/src/su4sml-cygwin.mlb +++ /dev/null @@ -1,80 +0,0 @@ -(***************************************************************************** - * su4sml --- a SML repository for managing (Secure)UML/OCL models - * http://projects.brucker.ch/su4sml/ - * - * su4sml-cygwin.mlb --- - * This file is part of su4sml. - * - * Copyright (c) 2005-2007, ETH Zurich, Switzerland - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ******************************************************************************) -(* $Id$ *) - -ann - "warnMatch true" - "sequenceUnit true" -in - local - $(MLTON_ROOT)/basis/basis.mlb - ../lib/fxp/src/fxlib.mlb - in - contrib/HashTable.sml - library.sml - xmi_ocl.sml - xmltree.sml - xmltree_hooks.sml - xmltree_helper.sml - xmltree_parser.sml - xmltree_writer.sml - xmi_datatypes.sml - xmi_extension_mechanisms.sml - xmi_state_machines.sml - xmi_activity_graphs.sml - xmi_core.sml - xmi.sml - rep_ocl.sml - rep_state_machines.sml - rep_activity_graphs.sml - rep_core.sml - ocl_library.sml - rep.sml - mds.sig - listeq.sml - component_uml.sml - secure_uml.sml - ocl2string.sml - xmi_idtable.sml - xmi_parser.sml - rep_parser.sml - rep_secure.sml - end -end diff --git a/src/su4sml.110.62.cm b/src/su4sml.110.62.cm deleted file mode 100644 index a9a1bf0..0000000 --- a/src/su4sml.110.62.cm +++ /dev/null @@ -1,43 +0,0 @@ -(***************************************************************************** - * su4sml --- a SML repository for managing (Secure)UML/OCL models - * http://projects.brucker.ch/su4sml/ - * - * su4sml.110.62.cm --- - * This file is part of su4sml. - * - * Copyright (c) 2005-2007, ETH Zurich, Switzerland - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ******************************************************************************) -(* $Id$ *) - -Group is - ocl_parser/parser.110.62.cm diff --git a/src/su4sml.cm b/src/su4sml.cm index 04da524..fb56efc 100644 --- a/src/su4sml.cm +++ b/src/su4sml.cm @@ -40,4 +40,11 @@ (* $Id$ *) Group is - ocl_parser/parser.cm +#if(defined(SMLNJ_VERSION) && (SMLNJ_MINOR_VERSION < 60)) + $/basis.cm +#endif +#if(defined(SMLNJ_VERSION) && (SMLNJ_MINOR_VERSION >= 60)) + $smlnj/basis/basis.cm +#endif + ocl_parser/parser.cm + codegen/codegen.cm diff --git a/src/su4sml.mlb b/src/su4sml.mlb deleted file mode 100644 index 098f84b..0000000 --- a/src/su4sml.mlb +++ /dev/null @@ -1,85 +0,0 @@ -(***************************************************************************** - * su4sml --- a SML repository for managing (Secure)UML/OCL models - * http://projects.brucker.ch/su4sml/ - * - * su4sml.mlb --- - * This file is part of su4sml. - * - * Copyright (c) 2005-2007, ETH Zurich, Switzerland - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ******************************************************************************) -(* $Id$ *) - -ann - "warnMatch true" - "sequenceUnit true" -in - local - $(MLTON_ROOT)/basis/basis.mlb - $(MLTON_ROOT)/basis/mlton.mlb - $(MLTON_ROOT)/smlnj-lib/Util/smlnj-lib.mlb - ../lib/fxp/src/fxlib.mlb - in - compiler/compiler_ext.sig - compiler/mlton.sml - library.sml - xmi_ocl.sml - xmltree.sml - xmltree_hooks.sml - xmltree_helper.sml - xmltree_parser.sml - xmltree_writer.sml - xmi_datatypes.sml - xmi_extension_mechanisms.sml - xmi_state_machines.sml - xmi_activity_graphs.sml - xmi_core.sml - xmi.sml - rep_ocl.sml - rep_state_machines.sml - rep_activity_graphs.sml - rep_core.sml - ocl_library.sml - rep.sml - mds.sig - listeq.sml - component_uml.sml - secure_uml.sml - ocl2string.sml - xmi_idtable.sml - xmi_parser.sml - rep_parser.sml - rep_secure.sml - rep_su2holocl.sml - ocl2dresdenjava.sml - end -end diff --git a/src/su4sml_core.110.62.cm b/src/su4sml_core.110.62.cm deleted file mode 100644 index c1837d0..0000000 --- a/src/su4sml_core.110.62.cm +++ /dev/null @@ -1,81 +0,0 @@ -(***************************************************************************** - * su4sml --- a SML repository for managing (Secure)UML/OCL models - * http://projects.brucker.ch/su4sml/ - * - * su4sml_core.110.62.cm --- - * This file is part of su4sml. - * - * Copyright (c) 2005-2007, ETH Zurich, Switzerland - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ******************************************************************************) -(* $Id$ *) - -Group is -#if(defined(SMLNJ_VERSION)) - $smlnj/basis/basis.cm - $smlnj/compiler/current.cm - $smlnj/smlnj-lib/smlnj-lib.cm -#else -#endif - ../lib/fxp/src/fxlib.110.62.cm - compiler/compiler_ext.sig - compiler/smlnj.sml - library.sml - listeq.sml - rep_ocl.sml - rep_state_machines.sml - rep_activity_graphs.sml - rep_core.sml - mds.sig - secure_uml.sml - component_uml.sml - rep_secure.sml - ocl_library.sml - rep.sml - rep_parser.sml - rep_su2holocl.sml - xmi_ocl.sml - xmi_core.sml - xmi_datatypes.sml - xmi_extension_mechanisms.sml - xmi_state_machines.sml - xmi_activity_graphs.sml - xmi.sml - xmi_parser.sml - xmltree.sml - xmltree_hooks.sml - xmltree_helper.sml - xmltree_parser.sml - xmltree_writer.sml - xmi_idtable.sml - ocl2string.sml - ocl2dresdenjava.sml diff --git a/src/su4sml_core.cm b/src/su4sml_core.cm index 968f592..6e2d4f9 100644 --- a/src/su4sml_core.cm +++ b/src/su4sml_core.cm @@ -40,42 +40,52 @@ (* $Id$ *) Group is +#if(defined(SMLNJ_VERSION) && (SMLNJ_MINOR_VERSION < 60)) + $/basis.cm + $smlnj/compiler/current.cm + $/smlnj-lib.cm +#endif +#if(defined(SMLNJ_VERSION) && (SMLNJ_MINOR_VERSION >= 60)) + $smlnj/basis/basis.cm + $smlnj/compiler/compiler.cm + $smlnj/compiler/current.cm + $smlnj/smlnj-lib/smlnj-lib.cm +#endif + compiler/compiler_ext.sig #if(defined(SMLNJ_VERSION)) - $/basis.cm - $smlnj/compiler/current.cm - $/smlnj-lib.cm + compiler/smlnj.sml #else + compiler/mlton.sml + contrib/HashTable.sml #endif ../lib/fxp/src/fxlib.cm - compiler/compiler_ext.sig - compiler/smlnj.sml - library.sml - listeq.sml - rep_ocl.sml - rep_state_machines.sml - rep_activity_graphs.sml - rep_core.sml - mds.sig - secure_uml.sml - component_uml.sml - rep_secure.sml - ocl_library.sml - rep.sml - rep_parser.sml - rep_su2holocl.sml - xmi_ocl.sml - xmi_core.sml - xmi_datatypes.sml - xmi_extension_mechanisms.sml - xmi_state_machines.sml - xmi_activity_graphs.sml - xmi.sml - xmi_parser.sml - xmltree.sml - xmltree_hooks.sml - xmltree_helper.sml - xmltree_parser.sml - xmltree_writer.sml - xmi_idtable.sml - ocl2string.sml - ocl2dresdenjava.sml + library.sml + listeq.sml + xmi_ocl.sml + xmi_datatypes.sml + xmi_extension_mechanisms.sml + xmi_state_machines.sml + xmi_activity_graphs.sml + xmi_core.sml + xmi.sml + rep_ocl.sml + rep_state_machines.sml + rep_activity_graphs.sml + rep_core.sml + ocl_library.sml + rep.sml + xmltree.sml + xmltree_hooks.sml + xmltree_helper.sml + xmltree_parser.sml + xmltree_writer.sml + xmi_parser.sml + xmi_idtable.sml + ocl2string.sml + rep_parser.sml + mds.sig + component_uml.sml + secure_uml.sml + rep_secure.sml + rep_su2holocl.sml + ocl2dresdenjava.sml