First complete scope grammar

2 files changed, 86 insertions, 12 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore
index 094e78ae..24cd9148 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore
@@ -121,13 +121,30 @@
         eType="#//TypeScope" containment="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="TypeScope">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//TypeReference"

-        containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="setsNew" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="setsSum" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="min" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxUnlimited" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="max" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="number" eType="#//NumberSpecification"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ClassTypeScope" eSuperTypes="#//TypeScope">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//ClassReference"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ObjectTypeScope" eSuperTypes="#//TypeScope">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//ObjectReference"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="IntegerTypeScope" eSuperTypes="#//TypeScope">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//IntegerReference"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="RealTypeScope" eSuperTypes="#//TypeScope">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//RealReference"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="StringTypeScope" eSuperTypes="#//TypeScope">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//StringReference"

+        containment="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="TypeReference"/>

   <eClassifiers xsi:type="ecore:EClass" name="ClassReference" eSuperTypes="#//TypeReference">

@@ -138,6 +155,28 @@
   <eClassifiers xsi:type="ecore:EClass" name="IntegerReference" eSuperTypes="#//TypeReference"/>

   <eClassifiers xsi:type="ecore:EClass" name="RealReference" eSuperTypes="#//TypeReference"/>

   <eClassifiers xsi:type="ecore:EClass" name="StringReference" eSuperTypes="#//TypeReference"/>

+  <eClassifiers xsi:type="ecore:EClass" name="NumberSpecification"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ExactNumber" eSuperTypes="#//NumberSpecification">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="exactNumber" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="exactUnlimited" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="IntervallNumber" eSuperTypes="#//NumberSpecification">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="min" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxNumber" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxUnlimited" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="IntEnumberation" eSuperTypes="#//NumberSpecification">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="entry" unique="false" upperBound="-1"

+        eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="RealEnumeration" eSuperTypes="#//NumberSpecification">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="entry" unique="false" upperBound="-1"

+        eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="StringEnumeration" eSuperTypes="#//NumberSpecification">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="entry" unique="false" upperBound="-1"

+        eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="ScopeDeclaration" eSuperTypes="#//Declaration">

     <eStructuralFeatures xsi:type="ecore:EReference" name="specification" eType="#//ScopeSpecification"

         containment="true"/>

@@ -156,19 +195,21 @@
         containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="scope" eType="#//Scope"

         containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="numberSpecified" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="number" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="runSpecified" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="runs" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="solver" eType="#//Solver"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="config" eType="#//Config"

         containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="tagetFolder" eType="#//File"

-        containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="debugFolder" eType="#//File"

         containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="targetLogFile" eType="#//File"

         containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="targetStatisticsFile" eType="#//File"

         containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="tagetFolder" eType="#//File"

+        containment="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="IntegerScope" eSuperTypes="#//IntegerReference"/>

   <eClassifiers xsi:type="ecore:EClass" name="RealScope" eSuperTypes="#//RealReference"/>

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel
index 70944294..2b575c63 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel
@@ -110,12 +110,24 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//ScopeSpecification/scopes"/>

     </genClasses>

     <genClasses ecoreClass="ApplicationConfiguration.ecore#//TypeScope">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//TypeScope/type"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//TypeScope/setsNew"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//TypeScope/setsSum"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//TypeScope/min"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//TypeScope/maxUnlimited"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//TypeScope/max"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//TypeScope/number"/>

+    </genClasses>

+    <genClasses ecoreClass="ApplicationConfiguration.ecore#//ClassTypeScope">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//ClassTypeScope/type"/>

+    </genClasses>

+    <genClasses ecoreClass="ApplicationConfiguration.ecore#//ObjectTypeScope">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//ObjectTypeScope/type"/>

+    </genClasses>

+    <genClasses ecoreClass="ApplicationConfiguration.ecore#//IntegerTypeScope">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//IntegerTypeScope/type"/>

+    </genClasses>

+    <genClasses ecoreClass="ApplicationConfiguration.ecore#//RealTypeScope">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//RealTypeScope/type"/>

+    </genClasses>

+    <genClasses ecoreClass="ApplicationConfiguration.ecore#//StringTypeScope">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//StringTypeScope/type"/>

     </genClasses>

     <genClasses ecoreClass="ApplicationConfiguration.ecore#//TypeReference"/>

     <genClasses ecoreClass="ApplicationConfiguration.ecore#//ClassReference">

@@ -125,6 +137,25 @@
     <genClasses ecoreClass="ApplicationConfiguration.ecore#//IntegerReference"/>

     <genClasses ecoreClass="ApplicationConfiguration.ecore#//RealReference"/>

     <genClasses ecoreClass="ApplicationConfiguration.ecore#//StringReference"/>

+    <genClasses ecoreClass="ApplicationConfiguration.ecore#//NumberSpecification"/>

+    <genClasses ecoreClass="ApplicationConfiguration.ecore#//ExactNumber">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//ExactNumber/exactNumber"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//ExactNumber/exactUnlimited"/>

+    </genClasses>

+    <genClasses ecoreClass="ApplicationConfiguration.ecore#//IntervallNumber">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//IntervallNumber/min"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//IntervallNumber/maxNumber"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//IntervallNumber/maxUnlimited"/>

+    </genClasses>

+    <genClasses ecoreClass="ApplicationConfiguration.ecore#//IntEnumberation">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//IntEnumberation/entry"/>

+    </genClasses>

+    <genClasses ecoreClass="ApplicationConfiguration.ecore#//RealEnumeration">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//RealEnumeration/entry"/>

+    </genClasses>

+    <genClasses ecoreClass="ApplicationConfiguration.ecore#//StringEnumeration">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//StringEnumeration/entry"/>

+    </genClasses>

     <genClasses ecoreClass="ApplicationConfiguration.ecore#//ScopeDeclaration">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//ScopeDeclaration/specification"/>

     </genClasses>

@@ -138,14 +169,16 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//GenerationTask/partialModel"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//GenerationTask/patterns"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//GenerationTask/scope"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//GenerationTask/numberSpecified"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//GenerationTask/number"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//GenerationTask/runSpecified"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//GenerationTask/runs"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//GenerationTask/solver"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//GenerationTask/config"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//GenerationTask/tagetFolder"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//GenerationTask/debugFolder"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//GenerationTask/targetLogFile"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//GenerationTask/targetStatisticsFile"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//GenerationTask/tagetFolder"/>

     </genClasses>

     <genClasses ecoreClass="ApplicationConfiguration.ecore#//IntegerScope"/>

     <genClasses ecoreClass="ApplicationConfiguration.ecore#//RealScope"/>