Merge pull request #13 from gerking/main

Adjust namespace URIs
uppaal-emf · Jan 6, 2025 · 1928026 · 1928026
2 parents f7af1bf + 5453ed4
commit 1928026
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 47 deletions.
diff --git a/org.uppaal.model/model/stdlib.xmi b/org.uppaal.model/model/stdlib.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<types:Library xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:types="http://www.uppaal.org/types/1.0.0" xsi:schemaLocation="http://www.uppaal.org/types/1.0.0 uppaal.ecore#//types">
+<types:Library xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:types="http://www.uppaal.org/1.0.0/types" xsi:schemaLocation="http://www.uppaal.org/1.0.0/types uppaal.ecore#//types">
   <types name="int"/>
   <types name="bool" type="bool"/>
   <types name="clock" type="clock"/>

diff --git a/org.uppaal.model/model/uppaal.ecore b/org.uppaal.model/model/uppaal.ecore
@@ -64,7 +64,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eSubpackages name="core" nsURI="http://www.uppaal.org/core/1.0.0" nsPrefix="core">
+  <eSubpackages name="core" nsURI="http://www.uppaal.org/1.0.0/core" nsPrefix="core">
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
       <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
       <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
@@ -73,7 +73,20 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Contains abstract general purpose classes."/>
     </eAnnotations>
-    <eClassifiers xsi:type="ecore:EClass" name="CallableElement" abstract="true" eSuperTypes="#//core/NamedElement"/>
+    <eClassifiers xsi:type="ecore:EClass" name="CallableElement" abstract="true" eSuperTypes="#//core/NamedElement">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL">
+        <details key="UniqueParameterNames" value="self.parameter->collect(elements)->select(e | e.oclIsKindOf(uppaal::core::NamedElement))->collect(oclAsType(uppaal::core::NamedElement))->isUnique(name)"/>
+      </eAnnotations>
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
+        <details key="constraints" value="UniqueParameterNames"/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" upperBound="-1"
+          eType="#//declarations/ParameterContainer" containment="true">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The function's parameters."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="NamedElement" abstract="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Abstract base class for named model elements."/>
@@ -129,7 +142,7 @@
           iD="true"/>
     </eClassifiers>
   </eSubpackages>
-  <eSubpackages name="types" nsURI="http://www.uppaal.org/types/1.0.0" nsPrefix="types">
+  <eSubpackages name="types" nsURI="http://www.uppaal.org/1.0.0/types" nsPrefix="types">
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
       <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
       <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
@@ -261,7 +274,7 @@
           eType="#//types/PredefinedType" containment="true"/>
     </eClassifiers>
   </eSubpackages>
-  <eSubpackages name="declarations" nsURI="http://www.uppaal.org/declarations/1.0.0"
+  <eSubpackages name="declarations" nsURI="http://www.uppaal.org/1.0.0/declarations"
       nsPrefix="declarations">
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
       <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
@@ -360,26 +373,19 @@
     <eClassifiers xsi:type="ecore:EClass" name="Function" eSuperTypes="#//core/CallableElement #//core/TypedElement">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL">
         <details key="ValidReturnType" value="(not typeDefinition.oclIsUndefined())&#xD;&#xA;implies&#xD;&#xA;(&#xD;&#xA;&#x9;(&#xD;&#xA;&#x9;&#x9;typeDefinition.oclIsKindOf(uppaal::expressions::IdentifierExpression) and&#xD;&#xA;&#x9;&#x9;typeDefinition.oclAsType(uppaal::expressions::IdentifierExpression).identifier.oclIsKindOf(uppaal::types::Type) and&#xD;&#xA;&#x9;&#x9;(&#xD;&#xA;&#x9;&#x9;&#x9;typeDefinition.oclAsType(uppaal::expressions::IdentifierExpression).identifier.oclAsType(uppaal::types::Type).baseType = uppaal::types::BuiltInType::VOID or&#xD;&#xA;&#x9;&#x9;&#x9;typeDefinition.oclAsType(uppaal::expressions::IdentifierExpression).identifier.oclAsType(uppaal::types::Type).baseType = uppaal::types::BuiltInType::INT or&#xD;&#xA;&#x9;&#x9;&#x9;typeDefinition.oclAsType(uppaal::expressions::IdentifierExpression).identifier.oclAsType(uppaal::types::Type).baseType = uppaal::types::BuiltInType::BOOL&#xD;&#xA;&#x9;&#x9;)&#xD;&#xA;&#x9;)&#xD;&#xA;&#x9;or&#xD;&#xA;&#x9;&#x9;typeDefinition.oclIsKindOf(uppaal::types::RangeTypeSpecification)&#xD;&#xA;)"/>
-        <details key="UniqueParameterNames" value="self.parameter->collect(elements)->select(e | e.oclIsKindOf(uppaal::core::NamedElement))->collect(oclAsType(uppaal::core::NamedElement))->isUnique(name)"/>
       </eAnnotations>
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="A function with a return type and optional parameters."/>
       </eAnnotations>
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-        <details key="constraints" value="ValidReturnType UniqueParameterNames"/>
+        <details key="constraints" value="ValidReturnType"/>
       </eAnnotations>
       <eStructuralFeatures xsi:type="ecore:EReference" name="block" lowerBound="1"
           eType="#//statements/Block" containment="true">
         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
           <details key="documentation" value="The block of statements representing the function body."/>
         </eAnnotations>
       </eStructuralFeatures>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" upperBound="-1"
-          eType="#//declarations/ParameterContainer" containment="true">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The function's parameters."/>
-        </eAnnotations>
-      </eStructuralFeatures>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="TypeDeclaration" eSuperTypes="#//declarations/Declaration">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -522,7 +528,7 @@
         <details key="constraints" value="SingleParameter ParametersOnly"/>
       </eAnnotations>
     </eClassifiers>
-    <eSubpackages name="global" nsURI="http://www.uppaal.org/declarations/global"
+    <eSubpackages name="global" nsURI="http://www.uppaal.org/1.0.0/declarations/global"
         nsPrefix="global">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
         <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
@@ -585,7 +591,7 @@
         </eAnnotations>
       </eClassifiers>
     </eSubpackages>
-    <eSubpackages name="system" nsURI="http://www.uppaal.org/declarations/system"
+    <eSubpackages name="system" nsURI="http://www.uppaal.org/1.0.0/declarations/system"
         nsPrefix="system">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
         <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
@@ -664,7 +670,7 @@
       </eClassifiers>
     </eSubpackages>
   </eSubpackages>
-  <eSubpackages name="templates" nsURI="http://www.uppaal.org/templates/1.0.0" nsPrefix="templates">
+  <eSubpackages name="templates" nsURI="http://www.uppaal.org/1.0.0/templates" nsPrefix="templates">
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
       <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
       <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
@@ -678,18 +684,6 @@
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Abstract base class for ordinary timed automata templates as well as redefined templates."/>
       </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL">
-        <details key="UniqueParameterNames" value="self.parameter->collect(elements)->collect(oclAsType(core::NamedElement))->isUnique(name)"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-        <details key="constraints" value="UniqueParameterNames"/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" upperBound="-1"
-          eType="#//declarations/ParameterContainer" containment="true">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The parameter declarations of the template."/>
-        </eAnnotations>
-      </eStructuralFeatures>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="Template" eSuperTypes="#//templates/AbstractTemplate">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -909,7 +903,7 @@
       </eAnnotations>
     </eClassifiers>
   </eSubpackages>
-  <eSubpackages name="statements" nsURI="http://www.uppaal.org/statements/1.0.0" nsPrefix="statements">
+  <eSubpackages name="statements" nsURI="http://www.uppaal.org/1.0.0/statements" nsPrefix="statements">
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
       <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
       <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
@@ -1071,7 +1065,7 @@
       </eStructuralFeatures>
     </eClassifiers>
   </eSubpackages>
-  <eSubpackages name="expressions" nsURI="http://www.uppaal.org/expressions/1.0.0"
+  <eSubpackages name="expressions" nsURI="http://www.uppaal.org/1.0.0/expressions"
       nsPrefix="expressions">
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
       <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
@@ -1242,18 +1236,18 @@
       <eLiterals name="OR" value="1" literal="or"/>
       <eLiterals name="IMPLY" value="2" literal="imply"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="FunctionCallExpression" eSuperTypes="#//expressions/Expression">
+    <eClassifiers xsi:type="ecore:EClass" name="CallExpression" eSuperTypes="#//expressions/Expression">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="An expression representing a call to a function."/>
+        <details key="documentation" value="An expression representing a call (e.g., to a function or template)."/>
       </eAnnotations>
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL">
-        <details key="NumberOfArgumentsMatchesDeclaration" value="(not self.function.oclIsUndefined())&#xD;&#xA;implies&#xD;&#xA;self.argument->size() = self.function.parameter->size()"/>
+        <details key="NumberOfArgumentsMatchesDeclaration" value="(not self.callee.oclIsUndefined())&#xA;implies&#xA;self.argument->size() = self.callee.parameter->size()"/>
       </eAnnotations>
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
         <details key="constraints" value="NumberOfArgumentsMatchesDeclaration"/>
       </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="function" lowerBound="1"
-          eType="#//declarations/Function">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="callee" lowerBound="1"
+          eType="#//core/CallableElement">
         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
           <details key="documentation" value="The function to be called."/>
         </eAnnotations>
@@ -1477,7 +1471,7 @@
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="Deadlock" eSuperTypes="#//expressions/Expression"/>
   </eSubpackages>
-  <eSubpackages name="visuals" nsURI="http://www.uppaal.org/visuals/1.0.0" nsPrefix="visuals">
+  <eSubpackages name="visuals" nsURI="http://www.uppaal.org/1.0.0/visuals" nsPrefix="visuals">
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
       <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
       <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
@@ -1536,7 +1530,7 @@
       </eStructuralFeatures>
     </eClassifiers>
   </eSubpackages>
-  <eSubpackages name="queries" nsURI="http://www.uppaal.org/queries/1.0.0" nsPrefix="queries">
+  <eSubpackages name="queries" nsURI="http://www.uppaal.org/1.0.0/queries" nsPrefix="queries">
     <eClassifiers xsi:type="ecore:EClass" name="UnaryQuery" eSuperTypes="#//queries/Query"/>
     <eClassifiers xsi:type="ecore:EClass" name="QuantifiedTemporalQuery" eSuperTypes="#//queries/UnaryQuery">
       <eStructuralFeatures xsi:type="ecore:EReference" name="expression" lowerBound="1"

diff --git a/org.uppaal.model/plugin.xml b/org.uppaal.model/plugin.xml
@@ -24,15 +24,15 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated uppaal -->
       <package
-            uri="http://www.uppaal.org/core/1.0.0"
+            uri="http://www.uppaal.org/1.0.0/core"
             class="org.uppaal.core.CorePackage"
             genModel="model/uppaal.genmodel"/>
    </extension>
 
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated uppaal -->
       <package
-            uri="http://www.uppaal.org/types/1.0.0"
+            uri="http://www.uppaal.org/1.0.0/types"
             class="org.uppaal.types.TypesPackage"
             genModel="model/uppaal.genmodel"/>
    </extension>
@@ -47,7 +47,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated uppaal -->
       <package
-            uri="http://www.uppaal.org/declarations/1.0.0"
+            uri="http://www.uppaal.org/1.0.0/declarations"
             class="org.uppaal.declarations.DeclarationsPackage"
             genModel="model/uppaal.genmodel"/>
    </extension>
@@ -62,7 +62,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated uppaal -->
       <package
-            uri="http://www.uppaal.org/declarations/global"
+            uri="http://www.uppaal.org/1.0.0/declarations/global"
             class="org.uppaal.declarations.global.GlobalPackage"
             genModel="model/uppaal.genmodel"/>
    </extension>
@@ -77,7 +77,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated uppaal -->
       <package
-            uri="http://www.uppaal.org/declarations/system"
+            uri="http://www.uppaal.org/1.0.0/declarations/system"
             class="org.uppaal.declarations.system.SystemPackage"
             genModel="model/uppaal.genmodel"/>
    </extension>
@@ -92,7 +92,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated uppaal -->
       <package
-            uri="http://www.uppaal.org/templates/1.0.0"
+            uri="http://www.uppaal.org/1.0.0/templates"
             class="org.uppaal.templates.TemplatesPackage"
             genModel="model/uppaal.genmodel"/>
    </extension>
@@ -107,7 +107,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated uppaal -->
       <package
-            uri="http://www.uppaal.org/statements/1.0.0"
+            uri="http://www.uppaal.org/1.0.0/statements"
             class="org.uppaal.statements.StatementsPackage"
             genModel="model/uppaal.genmodel"/>
    </extension>
@@ -122,7 +122,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated uppaal -->
       <package
-            uri="http://www.uppaal.org/expressions/1.0.0"
+            uri="http://www.uppaal.org/1.0.0/expressions"
             class="org.uppaal.expressions.ExpressionsPackage"
             genModel="model/uppaal.genmodel"/>
    </extension>
@@ -137,15 +137,15 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated uppaal -->
       <package
-            uri="http://www.uppaal.org/visuals/1.0.0"
+            uri="http://www.uppaal.org/1.0.0/visuals"
             class="org.uppaal.visuals.VisualsPackage"
             genModel="model/uppaal.genmodel"/>
    </extension>
 
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated uppaal -->
       <package
-            uri="http://www.uppaal.org/queries/1.0.0"
+            uri="http://www.uppaal.org/1.0.0/queries"
             class="org.uppaal.queries.QueriesPackage"
             genModel="model/uppaal.genmodel"/>
    </extension>