Alloy support for string literals

2 files changed, 11 insertions, 1 deletions

diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.ecore b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.ecore
index a825966e..3e88c460 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.ecore
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.ecore
@@ -91,6 +91,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//ALSSignatureDeclaration"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="ALSIntScope" eSuperTypes="#//ALSTypeScope"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ALSStringScope" eSuperTypes="#//ALSTypeScope"/>

   <eClassifiers xsi:type="ecore:EClass" name="ALSQuantifiedEx" eSuperTypes="#//ALSTerm">

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

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="disj" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

@@ -258,10 +259,14 @@
   <eClassifiers xsi:type="ecore:EClass" name="ALSIden" eSuperTypes="#//ALSTerm"/>

   <eClassifiers xsi:type="ecore:EClass" name="ALSUniv" eSuperTypes="#//ALSTerm"/>

   <eClassifiers xsi:type="ecore:EClass" name="ALSInt" eSuperTypes="#//ALSTerm"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ALSString" eSuperTypes="#//ALSTerm"/>

   <eClassifiers xsi:type="ecore:EClass" name="ALSReference" eSuperTypes="#//ALSTerm">

     <eStructuralFeatures xsi:type="ecore:EReference" name="referred" eType="#//ALSRelationDeclaration"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="ALSNumberLiteral" eSuperTypes="#//ALSTerm">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ALSStringLiteral" eSuperTypes="#//ALSTerm">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

 </ecore:EPackage>

diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.genmodel b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.genmodel
index 97c59724..f8505d33 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.genmodel
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.genmodel
@@ -5,7 +5,7 @@
     modelPluginID="hu.bme.mit.inf.dslreasoner.alloy.language" forceOverwrite="true"

     modelName="AlloyLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

     complianceLevel="6.0" copyrightFields="false" editPluginID="hu.bme.mit.inf.dslreasoner.alloy.language.edit"

-    editorPluginID="hu.bme.mit.inf.dslreasoner.alloy.language.editor" runtimeVersion="2.12">

+    editorPluginID="hu.bme.mit.inf.dslreasoner.alloy.language.editor" runtimeVersion="2.13">

   <genPackages prefix="AlloyLanguage" basePackage="hu.bme.mit.inf.dslreasoner" disposableProviderFactory="true"

       fileExtensions="als" ecorePackage="AlloyLanguage.ecore#/">

     <genEnums typeSafeEnumCompatible="false" ecoreEnum="AlloyLanguage.ecore#//ALSMultiplicity">

@@ -80,6 +80,7 @@
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference AlloyLanguage.ecore#//ALSSigScope/type"/>

     </genClasses>

     <genClasses ecoreClass="AlloyLanguage.ecore#//ALSIntScope"/>

+    <genClasses ecoreClass="AlloyLanguage.ecore#//ALSStringScope"/>

     <genClasses ecoreClass="AlloyLanguage.ecore#//ALSQuantifiedEx">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute AlloyLanguage.ecore#//ALSQuantifiedEx/type"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute AlloyLanguage.ecore#//ALSQuantifiedEx/disj"/>

@@ -196,11 +197,15 @@
     <genClasses ecoreClass="AlloyLanguage.ecore#//ALSIden"/>

     <genClasses ecoreClass="AlloyLanguage.ecore#//ALSUniv"/>

     <genClasses ecoreClass="AlloyLanguage.ecore#//ALSInt"/>

+    <genClasses ecoreClass="AlloyLanguage.ecore#//ALSString"/>

     <genClasses ecoreClass="AlloyLanguage.ecore#//ALSReference">

       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference AlloyLanguage.ecore#//ALSReference/referred"/>

     </genClasses>

     <genClasses ecoreClass="AlloyLanguage.ecore#//ALSNumberLiteral">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute AlloyLanguage.ecore#//ALSNumberLiteral/value"/>

     </genClasses>

+    <genClasses ecoreClass="AlloyLanguage.ecore#//ALSStringLiteral">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute AlloyLanguage.ecore#//ALSStringLiteral/value"/>

+    </genClasses>

   </genPackages>

 </genmodel:GenModel>