Commit e961a976 authored by André Pacak's avatar André Pacak
Browse files

change lookup function (has ITerm as toplevel to distinguish between cases and...

change lookup function (has ITerm as toplevel to distinguish between cases and other parts of the language (ExpTerm)
parent c2722538
This diff is collapsed.
......@@ -16,7 +16,9 @@
<child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
<child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
</concept>
<concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ" />
<concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ">
<child id="1169127546356" name="extends" index="PrDN$" />
</concept>
<concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
<reference id="1169127628841" name="intfc" index="PrY4T" />
</concept>
......@@ -48,8 +50,11 @@
</registry>
<node concept="PlHQZ" id="1Da9ityUTbh">
<property role="EcuMT" value="1894367444356272849" />
<property role="TrG5h" value="Term" />
<property role="TrG5h" value="ExpTerm" />
<property role="3GE5qa" value="term" />
<node concept="PrWs8" id="csIA0xsqB6" role="PrDN$">
<ref role="PrY4T" node="csIA0xsqB1" resolve="ITerm" />
</node>
</node>
<node concept="1TIwiD" id="1Da9ityUTbi">
<property role="EcuMT" value="1894367444356272850" />
......@@ -58,7 +63,7 @@
<property role="3GE5qa" value="term" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="1Da9ityUTbj" role="PzmwI">
<ref role="PrY4T" node="1Da9ityUTbh" resolve="Term" />
<ref role="PrY4T" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
</node>
<node concept="1TIwiD" id="1Da9ityUTbn">
......@@ -68,14 +73,14 @@
<property role="3GE5qa" value="term" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="1Da9ityUTbo" role="PzmwI">
<ref role="PrY4T" node="1Da9ityUTbh" resolve="Term" />
<ref role="PrY4T" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="1TJgyj" id="1Da9ityUTbs" role="1TKVEi">
<property role="IQ2ns" value="1894367444356272860" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="t" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
</node>
<node concept="1TIwiD" id="1Da9ityUTbw">
......@@ -87,7 +92,7 @@
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
<node concept="PrWs8" id="1Da9ityUTbU" role="PzmwI">
<ref role="PrY4T" node="1Da9ityUTbh" resolve="Term" />
<ref role="PrY4T" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
</node>
<node concept="1TIwiD" id="1Da9ityUTc2">
......@@ -97,21 +102,21 @@
<property role="3GE5qa" value="term" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="1Da9ityUTc3" role="PzmwI">
<ref role="PrY4T" node="1Da9ityUTbh" resolve="Term" />
<ref role="PrY4T" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="1TJgyj" id="1Da9ityUTc7" role="1TKVEi">
<property role="IQ2ns" value="1894367444356272903" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="t1" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="1TJgyj" id="1Da9ityUTcb" role="1TKVEi">
<property role="IQ2ns" value="1894367444356272907" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="t2" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
</node>
<node concept="1TIwiD" id="1Da9ityUTci">
......@@ -121,21 +126,21 @@
<property role="3GE5qa" value="term" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="1Da9ityUTcj" role="PzmwI">
<ref role="PrY4T" node="1Da9ityUTbh" resolve="Term" />
<ref role="PrY4T" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="1TJgyj" id="1Da9ityUTcn" role="1TKVEi">
<property role="IQ2ns" value="1894367444356272919" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="t1" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="1TJgyj" id="1Da9ityUTcr" role="1TKVEi">
<property role="IQ2ns" value="1894367444356272923" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="t2" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
</node>
<node concept="1TIwiD" id="1Da9ityUTcy">
......@@ -148,14 +153,14 @@
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
<node concept="PrWs8" id="1Da9ityUTcI" role="PzmwI">
<ref role="PrY4T" node="1Da9ityUTbh" resolve="Term" />
<ref role="PrY4T" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="1TJgyj" id="1Da9ityUTcQ" role="1TKVEi">
<property role="IQ2ns" value="1894367444356272950" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="t" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
</node>
<node concept="1TIwiD" id="1Da9ityUTcU">
......@@ -168,21 +173,21 @@
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
<node concept="PrWs8" id="1Da9ityUTd6" role="PzmwI">
<ref role="PrY4T" node="1Da9ityUTbh" resolve="Term" />
<ref role="PrY4T" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="1TJgyj" id="1Da9ityUTde" role="1TKVEi">
<property role="IQ2ns" value="1894367444356272974" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="bound" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="1TJgyj" id="1Da9ityUTdi" role="1TKVEi">
<property role="IQ2ns" value="1894367444356272978" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="body" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
</node>
<node concept="1TIwiD" id="1Da9ityUTdF">
......@@ -191,21 +196,21 @@
<property role="3GE5qa" value="term" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="1Da9ityUTdG" role="PzmwI">
<ref role="PrY4T" node="1Da9ityUTbh" resolve="Term" />
<ref role="PrY4T" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="1TJgyj" id="1Da9ityUTdO" role="1TKVEi">
<property role="IQ2ns" value="1894367444356273012" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="t1" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="1TJgyj" id="1Da9ityUTdS" role="1TKVEi">
<property role="IQ2ns" value="1894367444356273016" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="t2" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
</node>
<node concept="1TIwiD" id="1Da9ityUTdZ">
......@@ -215,14 +220,14 @@
<property role="3GE5qa" value="term" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="1Da9ityUTe0" role="PzmwI">
<ref role="PrY4T" node="1Da9ityUTbh" resolve="Term" />
<ref role="PrY4T" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="1TJgyj" id="1Da9ityUTe4" role="1TKVEi">
<property role="IQ2ns" value="1894367444356273028" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="t" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="1TJgyj" id="1Da9ityUTfl" role="1TKVEi">
<property role="IQ2ns" value="1894367444356273109" />
......@@ -277,14 +282,14 @@
<property role="TrG5h" value="ParensTerm" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="1Da9ityUTfM" role="PzmwI">
<ref role="PrY4T" node="1Da9ityUTbh" resolve="Term" />
<ref role="PrY4T" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="1TJgyj" id="1Da9ityUTfQ" role="1TKVEi">
<property role="IQ2ns" value="1894367444356273142" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="t" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
</node>
<node concept="1TIwiD" id="1Da9ityUTfU">
......@@ -346,7 +351,7 @@
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="term" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
</node>
<node concept="1TIwiD" id="6VVZNB97NER">
......@@ -373,7 +378,7 @@
<property role="34LRSv" value="tag" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="$yAo6zIflO" role="PzmwI">
<ref role="PrY4T" node="1Da9ityUTbh" resolve="Term" />
<ref role="PrY4T" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="PrWs8" id="$yAo6zIfm3" role="PzmwI">
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
......@@ -383,7 +388,7 @@
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="t" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
</node>
<node concept="1TIwiD" id="$yAo6zIfos">
......@@ -392,14 +397,14 @@
<property role="TrG5h" value="Match" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="$yAo6zIfot" role="PzmwI">
<ref role="PrY4T" node="1Da9ityUTbh" resolve="Term" />
<ref role="PrY4T" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="1TJgyj" id="$yAo6zIfox" role="1TKVEi">
<property role="IQ2ns" value="658257277626152481" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="matchee" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="1TJgyj" id="$yAo6zIfoJ" role="1TKVEi">
<property role="IQ2ns" value="658257277626152495" />
......@@ -429,7 +434,10 @@
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="t" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="Term" />
<ref role="20lvS9" node="1Da9ityUTbh" resolve="ExpTerm" />
</node>
<node concept="PrWs8" id="csIA0xsqBa" role="PzmwI">
<ref role="PrY4T" node="csIA0xsqB1" resolve="ITerm" />
</node>
</node>
<node concept="1TIwiD" id="1ZoSGYtY0b6">
......@@ -464,5 +472,10 @@
<ref role="20lvS9" node="1Da9ityUTef" resolve="Type" />
</node>
</node>
<node concept="PlHQZ" id="csIA0xsqB1">
<property role="EcuMT" value="224259003502406081" />
<property role="3GE5qa" value="term" />
<property role="TrG5h" value="ITerm" />
</node>
</model>
......@@ -169,8 +169,10 @@
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_Anno" />
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_App" />
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_Case" />
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_ExpTerm" />
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_Fun" />
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_IModuleElem" />
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_ITerm" />
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_Lam" />
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_Let" />
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_Match" />
......@@ -184,7 +186,6 @@
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_ParensType" />
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_Succ" />
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_Tag" />
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_Term" />
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_Type" />
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_Var" />
<classNode dependClassName="VariantTypes.editor.GrammarCellsSubstituteMenu_VariantType" />
......@@ -398,6 +399,23 @@
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_ExpTerm">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
<classNode dependClassName="java.util.ArrayList" />
<classNode dependClassName="java.util.List" />
<classNode dependClassName="jetbrains.mps.lang.editor.menus.EditorMenuDescriptorBase" />
<classNode dependClassName="jetbrains.mps.lang.editor.menus.MenuPart" />
<classNode dependClassName="jetbrains.mps.openapi.editor.menus.substitute.SubstituteMenuContext" />
<classNode dependClassName="jetbrains.mps.openapi.editor.menus.substitute.SubstituteMenuItem" />
<classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
<classNode dependClassName="org.jetbrains.annotations.NotNull" />
<classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
<classNode dependClassName="org.jetbrains.mps.openapi.module.SModule" />
<classNode dependClassName="org.jetbrains.mps.openapi.module.SRepository" />
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Fun">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
......@@ -432,7 +450,7 @@
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Lam">
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_ITerm">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
<classNode dependClassName="java.util.ArrayList" />
......@@ -449,7 +467,7 @@
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Let">
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Lam">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
<classNode dependClassName="java.util.ArrayList" />
......@@ -466,7 +484,7 @@
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Match">
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Let">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
<classNode dependClassName="java.util.ArrayList" />
......@@ -483,7 +501,7 @@
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Module">
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Match">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
<classNode dependClassName="java.util.ArrayList" />
......@@ -500,7 +518,7 @@
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_ModuleElemDef">
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Module">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
<classNode dependClassName="java.util.ArrayList" />
......@@ -517,7 +535,7 @@
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_ModuleElemEmpty">
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_ModuleElemDef">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
<classNode dependClassName="java.util.ArrayList" />
......@@ -534,7 +552,7 @@
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_ModuleImport">
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_ModuleElemEmpty">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
<classNode dependClassName="java.util.ArrayList" />
......@@ -551,7 +569,7 @@
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Mult">
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_ModuleImport">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
<classNode dependClassName="java.util.ArrayList" />
......@@ -568,7 +586,7 @@
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Nat">
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Mult">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
<classNode dependClassName="java.util.ArrayList" />
......@@ -585,7 +603,7 @@
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_ParensTerm">
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Nat">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
<classNode dependClassName="java.util.ArrayList" />
......@@ -602,7 +620,7 @@
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_ParensType">
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_ParensTerm">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
<classNode dependClassName="java.util.ArrayList" />
......@@ -619,7 +637,7 @@
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Succ">
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_ParensType">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
<classNode dependClassName="java.util.ArrayList" />
......@@ -636,7 +654,7 @@
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Tag">
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Succ">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
<classNode dependClassName="java.util.ArrayList" />
......@@ -653,7 +671,7 @@
<classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
<classNode extendsClassName="jetbrains.mps.nodeEditor.menus.substitute.SubstituteMenuBase" />
</dependency>
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Term">
<dependency className="VariantTypes.editor.GrammarCellsSubstituteMenu_Tag">
<classNode dependClassName="com.mbeddr.mpsutil.grammarcells.runtime.menu.GrammarCellsSubstituteMenuPart" />
<classNode dependClassName="java.lang.Override" />
<classNode dependClassName="java.util.ArrayList" />
......
<?xml version="1.0" encoding="UTF-8"?>
<product version="3" modelHash="blbyt4hgxxxrflg62dw7kdj2k4yu9ai">
<files names="Add_Editor.java:Add_EditorBuilder_a.java:Anno_Editor.java:Anno_EditorBuilder_a.java:App_Editor.java:App_EditorBuilder_a.java:Case_Editor.java:Case_EditorBuilder_a.java:EditorAspectDescriptorImpl.java:Fun_Editor.java:Fun_EditorBuilder_a.java:GrammarActionsDescriptor.java:GrammarCellsSubstituteMenu_Add.java:GrammarCellsSubstituteMenu_Anno.java:GrammarCellsSubstituteMenu_App.java:GrammarCellsSubstituteMenu_Case.java:GrammarCellsSubstituteMenu_Fun.java:GrammarCellsSubstituteMenu_IModuleElem.java:GrammarCellsSubstituteMenu_Lam.java:GrammarCellsSubstituteMenu_Let.java:GrammarCellsSubstituteMenu_Match.java:GrammarCellsSubstituteMenu_Module.java:GrammarCellsSubstituteMenu_ModuleElemDef.java:GrammarCellsSubstituteMenu_ModuleElemEmpty.java:GrammarCellsSubstituteMenu_ModuleImport.java:GrammarCellsSubstituteMenu_Mult.java:GrammarCellsSubstituteMenu_Nat.java:GrammarCellsSubstituteMenu_ParensTerm.java:GrammarCellsSubstituteMenu_ParensType.java:GrammarCellsSubstituteMenu_Succ.java:GrammarCellsSubstituteMenu_Tag.java:GrammarCellsSubstituteMenu_Term.java:GrammarCellsSubstituteMenu_Type.java:GrammarCellsSubstituteMenu_Var.java:GrammarCellsSubstituteMenu_VariantType.java:GrammarCellsSubstituteMenu_VariantTypeEntry.java:GrammarCellsSubstituteMenu_Zero.java:Lam_Editor.java:Lam_EditorBuilder_a.java:Let_Editor.java:Let_EditorBuilder_a.java:Match_Editor.java:Match_EditorBuilder_a.java:ModuleElemDef_Editor.java:ModuleElemDef_EditorBuilder_a.java:ModuleElemEmpty_SubstituteMenu.java:ModuleImport_Editor.java:ModuleImport_EditorBuilder_a.java:Module_Editor.java:Module_EditorBuilder_a.java:Mult_Editor.java:Mult_EditorBuilder_a.java:Nat_Editor.java:Nat_EditorBuilder_a.java:ParensTerm_Editor.java:ParensTerm_EditorBuilder_a.java:ParensType_Editor.java:ParensType_EditorBuilder_a.java:Succ_Editor.java:Succ_EditorBuilder_a.java:Tag_Editor.java:Tag_EditorBuilder_a.java:Var_Editor.java:Var_EditorBuilder_a.java:VariantTypeEntry_Editor.java:VariantTypeEntry_EditorBuilder_a.java:VariantType_Editor.java:VariantType_EditorBuilder_a.java:Zero_Editor.java:Zero_EditorBuilder_a.java:template_GrammarCellsSideTransformationsMenu.java" />
<files names="Add_Editor.java:Add_EditorBuilder_a.java:Anno_Editor.java:Anno_EditorBuilder_a.java:App_Editor.java:App_EditorBuilder_a.java:Case_Editor.java:Case_EditorBuilder_a.java:EditorAspectDescriptorImpl.java:Fun_Editor.java:Fun_EditorBuilder_a.java:GrammarActionsDescriptor.java:GrammarCellsSubstituteMenu_Add.java:GrammarCellsSubstituteMenu_Anno.java:GrammarCellsSubstituteMenu_App.java:GrammarCellsSubstituteMenu_Case.java:GrammarCellsSubstituteMenu_ExpTerm.java:GrammarCellsSubstituteMenu_Fun.java:GrammarCellsSubstituteMenu_IModuleElem.java:GrammarCellsSubstituteMenu_ITerm.java:GrammarCellsSubstituteMenu_Lam.java:GrammarCellsSubstituteMenu_Let.java:GrammarCellsSubstituteMenu_Match.java:GrammarCellsSubstituteMenu_Module.java:GrammarCellsSubstituteMenu_ModuleElemDef.java:GrammarCellsSubstituteMenu_ModuleElemEmpty.java:GrammarCellsSubstituteMenu_ModuleImport.java:GrammarCellsSubstituteMenu_Mult.java:GrammarCellsSubstituteMenu_Nat.java:GrammarCellsSubstituteMenu_ParensTerm.java:GrammarCellsSubstituteMenu_ParensType.java:GrammarCellsSubstituteMenu_Succ.java:GrammarCellsSubstituteMenu_Tag.java:GrammarCellsSubstituteMenu_Type.java:GrammarCellsSubstituteMenu_Var.java:GrammarCellsSubstituteMenu_VariantType.java:GrammarCellsSubstituteMenu_VariantTypeEntry.java:GrammarCellsSubstituteMenu_Zero.java:Lam_Editor.java:Lam_EditorBuilder_a.java:Let_Editor.java:Let_EditorBuilder_a.java:Match_Editor.java:Match_EditorBuilder_a.java:ModuleElemDef_Editor.java:ModuleElemDef_EditorBuilder_a.java:ModuleElemEmpty_SubstituteMenu.java:ModuleImport_Editor.java:ModuleImport_EditorBuilder_a.java:Module_Editor.java:Module_EditorBuilder_a.java:Mult_Editor.java:Mult_EditorBuilder_a.java:Nat_Editor.java:Nat_EditorBuilder_a.java:ParensTerm_Editor.java:ParensTerm_EditorBuilder_a.java:ParensType_Editor.java:ParensType_EditorBuilder_a.java:Succ_Editor.java:Succ_EditorBuilder_a.java:Tag_Editor.java:Tag_EditorBuilder_a.java:Var_Editor.java:Var_EditorBuilder_a.java:VariantTypeEntry_Editor.java:VariantTypeEntry_EditorBuilder_a.java:VariantType_Editor.java:VariantType_EditorBuilder_a.java:Zero_Editor.java:Zero_EditorBuilder_a.java:template_GrammarCellsSideTransformationsMenu.java" />
</product>
<?xml version="1.0" encoding="UTF-8"?>
<product version="3" modelHash="-8l3cf6htglh2dj9mb7olfl2mb0ih90i">
<product version="3" modelHash="9udpqb6sbjx1pekxqloxps847fxr1if">
<files names="Language.java" />
</product>
<?xml version="1.0" encoding="UTF-8"?>
<product version="3" modelHash="c3ck0f250bdxvkwibpshxv6ia6n3lso">
<product version="3" modelHash="-ea5ajeiv7fit12u2h4kt0hnwzjmhnrz">
<files names="ConceptPresentationAspectImpl.java:LanguageConceptSwitch.java:StructureAspectDescriptor.java" />
</product>
......@@ -71,7 +71,7 @@ import jetbrains.mps.nodeEditor.cells.EditorCell_Constant;
// replace with placeholder
SNode child = SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb9302L, 0x1a4a252762eb9307L, "t1"));
SAbstractConcept childConcept = SNodeOperations.getConcept(child);
if (!(GrammarCellsUtil.isExactly(childConcept, MetaAdapterFactory.getInterfaceConcept(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb92d1L, "VariantTypes.structure.Term")))) {
if (!(GrammarCellsUtil.isExactly(childConcept, MetaAdapterFactory.getInterfaceConcept(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb92d1L, "VariantTypes.structure.ExpTerm")))) {
SNodeFactoryOperations.setNewChild(node, MetaAdapterFactory.getContainmentLink(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb9302L, 0x1a4a252762eb9307L, "t1"), null);
return;
}
......@@ -102,7 +102,7 @@ import jetbrains.mps.nodeEditor.cells.EditorCell_Constant;
// replace with placeholder
SNode child = SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb9302L, 0x1a4a252762eb9307L, "t1"));
SAbstractConcept childConcept = SNodeOperations.getConcept(child);
if (!(GrammarCellsUtil.isExactly(childConcept, MetaAdapterFactory.getInterfaceConcept(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb92d1L, "VariantTypes.structure.Term")))) {
if (!(GrammarCellsUtil.isExactly(childConcept, MetaAdapterFactory.getInterfaceConcept(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb92d1L, "VariantTypes.structure.ExpTerm")))) {
SNodeFactoryOperations.setNewChild(node, MetaAdapterFactory.getContainmentLink(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb9302L, 0x1a4a252762eb9307L, "t1"), null);
return;
}
......@@ -266,7 +266,7 @@ import jetbrains.mps.nodeEditor.cells.EditorCell_Constant;
// replace with placeholder
SNode child = SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb9302L, 0x1a4a252762eb930bL, "t2"));
SAbstractConcept childConcept = SNodeOperations.getConcept(child);
if (!(GrammarCellsUtil.isExactly(childConcept, MetaAdapterFactory.getInterfaceConcept(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb92d1L, "VariantTypes.structure.Term")))) {
if (!(GrammarCellsUtil.isExactly(childConcept, MetaAdapterFactory.getInterfaceConcept(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb92d1L, "VariantTypes.structure.ExpTerm")))) {
SNodeFactoryOperations.setNewChild(node, MetaAdapterFactory.getContainmentLink(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb9302L, 0x1a4a252762eb930bL, "t2"), null);
return;
}
......@@ -297,7 +297,7 @@ import jetbrains.mps.nodeEditor.cells.EditorCell_Constant;
// replace with placeholder
SNode child = SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb9302L, 0x1a4a252762eb930bL, "t2"));
SAbstractConcept childConcept = SNodeOperations.getConcept(child);
if (!(GrammarCellsUtil.isExactly(childConcept, MetaAdapterFactory.getInterfaceConcept(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb92d1L, "VariantTypes.structure.Term")))) {
if (!(GrammarCellsUtil.isExactly(childConcept, MetaAdapterFactory.getInterfaceConcept(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb92d1L, "VariantTypes.structure.ExpTerm")))) {
SNodeFactoryOperations.setNewChild(node, MetaAdapterFactory.getContainmentLink(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb9302L, 0x1a4a252762eb930bL, "t2"), null);
return;
}
......
......@@ -191,7 +191,7 @@ import jetbrains.mps.smodel.action.SNodeFactoryOperations;
// replace with placeholder
SNode child = SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb936bL, 0x1a4a252762eb9378L, "t2"));
SAbstractConcept childConcept = SNodeOperations.getConcept(child);
if (!(GrammarCellsUtil.isExactly(childConcept, MetaAdapterFactory.getInterfaceConcept(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb92d1L, "VariantTypes.structure.Term")))) {
if (!(GrammarCellsUtil.isExactly(childConcept, MetaAdapterFactory.getInterfaceConcept(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb92d1L, "VariantTypes.structure.ExpTerm")))) {
SNodeFactoryOperations.setNewChild(node, MetaAdapterFactory.getContainmentLink(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb936bL, 0x1a4a252762eb9378L, "t2"), null);
return;
}
......@@ -222,7 +222,7 @@ import jetbrains.mps.smodel.action.SNodeFactoryOperations;
// replace with placeholder
SNode child = SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb936bL, 0x1a4a252762eb9378L, "t2"));
SAbstractConcept childConcept = SNodeOperations.getConcept(child);
if (!(GrammarCellsUtil.isExactly(childConcept, MetaAdapterFactory.getInterfaceConcept(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb92d1L, "VariantTypes.structure.Term")))) {
if (!(GrammarCellsUtil.isExactly(childConcept, MetaAdapterFactory.getInterfaceConcept(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb92d1L, "VariantTypes.structure.ExpTerm")))) {
SNodeFactoryOperations.setNewChild(node, MetaAdapterFactory.getContainmentLink(0x3ace5b6c22d54933L, 0x9217595f2ebf8d6aL, 0x1a4a252762eb936bL, 0x1a4a252762eb9378L, "t2"), null);
return;
}
......
......@@ -17,15 +17,15 @@ import org.jetbrains.mps.openapi.persistence.PersistenceFacade;
import org.jetbrains.mps.openapi.language.SAbstractConcept;
import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
public class GrammarCellsSubstituteMenu_Term extends SubstituteMenuBase {
public GrammarCellsSubstituteMenu_Term() {
public class GrammarCellsSubstituteMenu_ExpTerm extends SubstituteMenuBase {
public GrammarCellsSubstituteMenu_ExpTerm() {
super(true);
}
@NotNull
@Override
protected List<MenuPart<SubstituteMenuItem, SubstituteMenuContext>> getParts(final SubstituteMenuContext _context) {
List<MenuPart<SubstituteMenuItem, SubstituteMenuContext>> result = new ArrayList<MenuPart<SubstituteMenuItem, SubstituteMenuContext>>();
result.add(new GrammarCellsSubstituteMenu_Term.GrammarCellsSubstituteMenuPart_8ham6c_a());
result.add(new GrammarCellsSubstituteMenu_ExpTerm.GrammarCellsSubstituteMenuPart_jitps6_a());
return result;
}
......@@ -33,7 +33,7 @@ public class GrammarCellsSubstituteMenu_Term extends SubstituteMenuBase {
@Override
public List<SubstituteMenuItem> createMenuItems(@NotNull SubstituteMenuContext context) {
context.getEditorMenuTrace().pushTraceInfo();
context.getEditorMenuTrace().setDescriptor(new EditorMenuDescriptorBase("contribution to the " + "default substitute menu for " + "Term", null));
context.getEditorMenuTrace().setDescriptor(new EditorMenuDescriptorBase("contribution to the " + "default substitute menu for " + "ExpTerm", null));
try {
return super.createMenuItems(context);
} finally {
......@@ -42,14 +42,14 @@ public class GrammarCellsSubstituteMenu_Term extends SubstituteMenuBase {
}
private class GrammarCellsSubstituteMenuPart_8ham6c_a extends GrammarCellsSubstituteMenuPart {
private class GrammarCellsSubstituteMenuPart_jitps6_a extends GrammarCellsSubstituteMenuPart {
@Override
public SModule getModule(SRepository repository) {
return PersistenceFacade.getInstance().createModuleReference("3ace5b6c-22d5-4933-9217-595f2ebf8d6a(VariantTypes)").resolve(repository);
}
@Override
public SAbstractConcept getExpectedOutputConcept() {