natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduce extends clause in macro table. Drop name from expand macro. 

Macro table can extend another macro table. All prototype template
declarations are imported automatically.
The editor now substitutes default values when entering new
expand macro/constraint filling the slots provided by the prototype.
Expand macro does not require name.
Minor editor improvements.
This commit is contained in:
Fedor Isakov 2020-03-28 14:20:50 +01:00
parent a2b369b9c3
commit f261002feb
5 changed files with 1356 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
View File

@ -19114,8 +19114,8 @@
<node concept="3clFbF" id="5itBwM6VInh" role="3cqZAp">
<node concept="2OqwBi" id="5itBwM6VIni" role="3clFbG">
<node concept="30H73N" id="5itBwM6VInj" role="2Oq$k0" />
<node concept="2qgKlT" id="5itBwM6VInk" role="2OqNvi">
<ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
<node concept="2qgKlT" id="5itBwMafU3k" role="2OqNvi">
<ref role="37wK5l" to="x5bw:5itBwMafQKm" resolve="getGenFqName" />
</node>
</node>
</node>
@ -19291,8 +19291,8 @@
<node concept="3zGtF$" id="5itBwM70tPR" role="3uHU7w" />
<node concept="2OqwBi" id="5itBwM70sfp" role="3uHU7B">
<node concept="30H73N" id="5itBwM70rXX" role="2Oq$k0" />
<node concept="3TrcHB" id="5itBwM70t0j" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
<node concept="2qgKlT" id="5itBwMafQ31" role="2OqNvi">
<ref role="37wK5l" to="x5bw:5itBwMafHM1" resolve="getGenName" />
</node>
</node>
</node>

150
coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
View File

@ -42,11 +42,13 @@
<concept id="1225194691553" name="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" flags="nn" index="13iPFW" />
</language>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
<concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
<concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
<child id="1068498886297" name="rValue" index="37vLTx" />
<child id="1068498886295" name="lValue" index="37vLTJ" />
</concept>
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
</concept>
@ -89,6 +91,7 @@
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
<child id="1068580123156" name="expression" index="3clFbG" />
</concept>
<concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
<concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
<child id="1068580123160" name="condition" index="3clFbw" />
<child id="1068580123161" name="ifTrue" index="3clFbx" />
@ -100,6 +103,9 @@
<property id="1068580123138" name="value" index="3clFbU" />
</concept>
<concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
<concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
<child id="1068581517676" name="expression" index="3cqZAk" />
</concept>
<concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
</concept>
@ -124,6 +130,9 @@
</concept>
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
<concept id="1200397529627" name="jetbrains.mps.baseLanguage.structure.CharConstant" flags="nn" index="1Xhbcc">
<property id="1200397540847" name="charConstant" index="1XhdNS" />
</concept>
</language>
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
<concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@ -151,10 +160,14 @@
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
</concept>
<concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
<concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
<reference id="1145383142433" name="elementConcept" index="2I9WkF" />
</concept>
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
</concept>
<concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
<concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
@ -1625,6 +1638,143 @@
</node>
</node>
</node>
<node concept="13i0hz" id="5itBwMafHM1" role="13h7CS">
<property role="TrG5h" value="getGenName" />
<node concept="3Tm1VV" id="5itBwMafHM2" role="1B3o_S" />
<node concept="17QB3L" id="5itBwMafI5m" role="3clF45" />
<node concept="3clFbS" id="5itBwMafHM4" role="3clF47">
<node concept="3clFbF" id="5itBwMafLVK" role="3cqZAp">
<node concept="3cpWs3" id="5itBwMafOMy" role="3clFbG">
<node concept="3cpWs3" id="5itBwMafO36" role="3uHU7B">
<node concept="2OqwBi" id="5itBwMafMUg" role="3uHU7B">
<node concept="2OqwBi" id="5itBwMafMpZ" role="2Oq$k0">
<node concept="2OqwBi" id="5itBwMafLYF" role="2Oq$k0">
<node concept="13iPFW" id="5itBwMafLVI" role="2Oq$k0" />
<node concept="3TrEf2" id="5itBwMafM4q" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5itBwM67n1U" resolve="inputSpec" />
</node>
</node>
<node concept="3TrEf2" id="5itBwMafMD9" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5itBwM66ULm" resolve="applicableConcept" />
</node>
</node>
<node concept="3TrcHB" id="5itBwMafNk7" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
<node concept="Xl_RD" id="5itBwMafOnk" role="3uHU7w">
<property role="Xl_RC" value="_" />
</node>
</node>
<node concept="2OqwBi" id="5itBwMafOZl" role="3uHU7w">
<node concept="2JrnkZ" id="5itBwMafOZm" role="2Oq$k0">
<node concept="13iPFW" id="5itBwMafOZn" role="2JrQYb" />
</node>
<node concept="liA8E" id="5itBwMafOZo" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="13i0hz" id="5itBwMafQKm" role="13h7CS">
<property role="TrG5h" value="getGenFqName" />
<node concept="3Tm1VV" id="5itBwMafQKn" role="1B3o_S" />
<node concept="17QB3L" id="5itBwMafRfR" role="3clF45" />
<node concept="3clFbS" id="5itBwMafQKp" role="3clF47">
<node concept="3cpWs8" id="7_a$FDO3m2l" role="3cqZAp">
<node concept="3cpWsn" id="7_a$FDO3m2m" role="3cpWs9">
<property role="TrG5h" value="model" />
<node concept="H_c77" id="7_a$FDO3m2i" role="1tU5fm" />
<node concept="2OqwBi" id="7_a$FDO3m2n" role="33vP2m">
<node concept="13iPFW" id="7_a$FDO3m2o" role="2Oq$k0" />
<node concept="I4A8Y" id="7_a$FDO3m2p" role="2OqNvi" />
</node>
</node>
</node>
<node concept="3clFbJ" id="7_a$FDO3nGr" role="3cqZAp">
<node concept="3clFbS" id="7_a$FDO3nGu" role="3clFbx">
<node concept="3cpWs6" id="7_a$FDO3nYg" role="3cqZAp">
<node concept="2OqwBi" id="7_a$FDO3olz" role="3cqZAk">
<node concept="13iPFW" id="7_a$FDO3o9B" role="2Oq$k0" />
<node concept="2qgKlT" id="5itBwMafSte" role="2OqNvi">
<ref role="37wK5l" node="5itBwMafHM1" resolve="getGenName" />
</node>
</node>
</node>
</node>
<node concept="3clFbC" id="7_a$FDO3nVa" role="3clFbw">
<node concept="10Nm6u" id="7_a$FDO3nXF" role="3uHU7w" />
<node concept="37vLTw" id="7_a$FDO3nSe" role="3uHU7B">
<ref role="3cqZAo" node="7_a$FDO3m2m" resolve="model" />
</node>
</node>
</node>
<node concept="3clFbH" id="7_a$FDO3oMt" role="3cqZAp" />
<node concept="3cpWs8" id="hEwIO9_" role="3cqZAp">
<node concept="3cpWsn" id="hEwIO9A" role="3cpWs9">
<property role="TrG5h" value="longName" />
<node concept="2OqwBi" id="5dE_lK2q3OX" role="33vP2m">
<node concept="37vLTw" id="5dE_lK2q3Dm" role="2Oq$k0">
<ref role="3cqZAo" node="7_a$FDO3m2m" resolve="model" />
</node>
<node concept="LkI2h" id="5dE_lK2q41q" role="2OqNvi" />
</node>
<node concept="17QB3L" id="4druX3VZQ6e" role="1tU5fm" />
</node>
</node>
<node concept="3clFbJ" id="hEwIO9I" role="3cqZAp">
<node concept="3clFbS" id="hEwIO9J" role="3clFbx">
<node concept="3cpWs6" id="hEwIO9K" role="3cqZAp">
<node concept="2OqwBi" id="hEwIO9L" role="3cqZAk">
<node concept="13iPFW" id="hEwIO9M" role="2Oq$k0" />
<node concept="2qgKlT" id="5itBwMafTfX" role="2OqNvi">
<ref role="37wK5l" node="5itBwMafHM1" resolve="getGenName" />
</node>
</node>
</node>
</node>
<node concept="22lmx$" id="5dE_lK2q9vh" role="3clFbw">
<node concept="3clFbC" id="5dE_lK2q9S2" role="3uHU7B">
<node concept="10Nm6u" id="5dE_lK2q9TJ" role="3uHU7w" />
<node concept="37vLTw" id="5dE_lK2q9DG" role="3uHU7B">
<ref role="3cqZAo" node="hEwIO9A" resolve="longName" />
</node>
</node>
<node concept="2OqwBi" id="hEwIO9O" role="3uHU7w">
<node concept="37vLTw" id="3GM_nagTtU$" role="2Oq$k0">
<ref role="3cqZAo" node="hEwIO9A" resolve="longName" />
</node>
<node concept="liA8E" id="hEwIO9Q" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="Xl_RD" id="hEwIO9R" role="37wK5m">
<property role="Xl_RC" value="" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs6" id="hEwIO9S" role="3cqZAp">
<node concept="3cpWs3" id="hEwIO9U" role="3cqZAk">
<node concept="2OqwBi" id="hEwIO9V" role="3uHU7w">
<node concept="13iPFW" id="hEwIO9W" role="2Oq$k0" />
<node concept="2qgKlT" id="5itBwMafTv7" role="2OqNvi">
<ref role="37wK5l" node="5itBwMafHM1" resolve="getGenName" />
</node>
</node>
<node concept="3cpWs3" id="hEwIO9T" role="3uHU7B">
<node concept="37vLTw" id="3GM_nagTBRM" role="3uHU7B">
<ref role="3cqZAo" node="hEwIO9A" resolve="longName" />
</node>
<node concept="1Xhbcc" id="5dE_lK2q9Vs" role="3uHU7w">
<property role="1XhdNS" value="." />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="13h7C7" id="5itBwM6_y5u">
<property role="3GE5qa" value="macro.decl" />

401
coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
View File

@ -33,12 +33,19 @@
<child id="1068498886295" name="lValue" index="37vLTJ" />
</concept>
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
<concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
<concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
<child id="1076505808688" name="condition" index="2$JKZa" />
</concept>
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
</concept>
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
<child id="1188208488637" name="annotation" index="2AJF6D" />
</concept>
<concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
<child id="1154032183016" name="body" index="2LFqv$" />
</concept>
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
<child id="1197027771414" name="operand" index="2Oq$k0" />
<child id="1197027833540" name="operation" index="2OqNvi" />
@ -56,10 +63,12 @@
<concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
<child id="1182160096073" name="cls" index="YeSDq" />
</concept>
<concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
</concept>
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
<concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
<child id="1068431790190" name="initializer" index="33vP2m" />
</concept>
@ -67,6 +76,7 @@
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
</concept>
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
<child id="5680397130376446158" name="type" index="1tU5fm" />
@ -102,6 +112,7 @@
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
</concept>
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
<concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
@ -111,6 +122,7 @@
<property id="521412098689998745" name="nonStatic" index="2bfB8j" />
<child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
</concept>
<concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
<reference id="1107535924139" name="classifier" index="3uigEE" />
</concept>
@ -126,6 +138,7 @@
<child id="1350122676458893092" name="text" index="3ndbpf" />
</concept>
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
<concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
<reference id="1170346070688" name="classifier" index="1Y3XeK" />
</concept>
@ -172,6 +185,9 @@
<child id="1144104376918" name="parameter" index="1xVPHs" />
</concept>
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
<concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
<child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
</concept>
<concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@ -193,6 +209,9 @@
<concept id="1182511038748" name="jetbrains.mps.lang.smodel.structure.Model_NodesIncludingImportedOperation" flags="nn" index="1j9C0f">
<reference id="1182511038750" name="concept" index="1j9C0d" />
</concept>
<concept id="1176109685393" name="jetbrains.mps.lang.smodel.structure.Model_RootsIncludingImportedOperation" flags="nn" index="3lApI0">
<reference id="1176109685394" name="concept" index="3lApI3" />
</concept>
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
<concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
@ -234,6 +253,13 @@
<concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
<child id="1204796294226" name="closure" index="23t8la" />
</concept>
<concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
<child id="540871147943773366" name="argument" index="25WWJ7" />
</concept>
<concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
<child id="1151688676805" name="elementType" index="_ZDj9" />
</concept>
<concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
<concept id="1235573135402" name="jetbrains.mps.baseLanguage.collections.structure.SingletonSequenceCreator" flags="nn" index="2HTt$P">
<child id="1235573175711" name="elementType" index="2HTBi0" />
<child id="1235573187520" name="singletonValue" index="2HTEbv" />
@ -244,6 +270,8 @@
</concept>
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
<concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
<concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
</language>
@ -1807,5 +1835,378 @@
</node>
</node>
</node>
<node concept="1M2fIO" id="5itBwM9SvUX">
<property role="3GE5qa" value="macro.decl" />
<ref role="1M2myG" to="wq2x:5itBwM65AQ4" resolve="ExpandMacroTemplate" />
<node concept="1N5Pfh" id="5itBwM9Sw2u" role="1Mr941">
<ref role="1N5Vy1" to="wq2x:5itBwM6gb4P" resolve="prototype" />
<node concept="3dgokm" id="5itBwM9SwdM" role="1N6uqs">
<node concept="3clFbS" id="5itBwM9SwdN" role="2VODD2">
<node concept="3clFbF" id="5itBwM9SHkG" role="3cqZAp">
<node concept="2ShNRf" id="5itBwM9SHkC" role="3clFbG">
<node concept="YeOm9" id="5itBwM9SI3G" role="2ShVmc">
<node concept="1Y3b0j" id="5itBwM9SI3J" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
<ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
<node concept="2YIFZM" id="5itBwM9UAe5" role="37wK5m">
<ref role="37wK5l" node="5itBwM9UyR1" resolve="prototypesScope" />
<ref role="1Pybhc" node="5itBwM9UyB4" resolve="ScopeUtil" />
<node concept="2rP1CM" id="5itBwM9UAEU" role="37wK5m" />
</node>
<node concept="3Tm1VV" id="5itBwM9SI3K" role="1B3o_S" />
<node concept="3clFb_" id="5itBwM9SIj2" role="jymVt">
<property role="TrG5h" value="getName" />
<node concept="17QB3L" id="5itBwM9SIj3" role="3clF45" />
<node concept="3Tm1VV" id="5itBwM9SIj4" role="1B3o_S" />
<node concept="37vLTG" id="5itBwM9SIj6" role="3clF46">
<property role="TrG5h" value="child" />
<node concept="3Tqbb2" id="5itBwM9SIj7" role="1tU5fm" />
</node>
<node concept="3clFbS" id="5itBwM9SIj9" role="3clF47">
<node concept="3clFbF" id="5itBwM9SJQE" role="3cqZAp">
<node concept="2OqwBi" id="5itBwM9SKnJ" role="3clFbG">
<node concept="1PxgMI" id="5itBwM9SK8h" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="5itBwM9SKeQ" role="3oSUPX">
<ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
<node concept="37vLTw" id="5itBwM9SJQD" role="1m5AlR">
<ref role="3cqZAo" node="5itBwM9SIj6" resolve="child" />
</node>
</node>
<node concept="3TrcHB" id="5itBwM9SKGG" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="5itBwM9SIja" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="312cEu" id="5itBwM9UyB4">
<property role="3GE5qa" value="macro.decl" />
<property role="TrG5h" value="ScopeUtil" />
<node concept="2tJIrI" id="5itBwM9UyN0" role="jymVt" />
<node concept="2YIFZL" id="5itBwMaugU5" role="jymVt">
<property role="TrG5h" value="callTemplatesScope" />
<node concept="37vLTG" id="5itBwMauh5R" role="3clF46">
<property role="TrG5h" value="contextNode" />
<node concept="3Tqbb2" id="5itBwMauh7k" role="1tU5fm" />
</node>
<node concept="2I9FWS" id="5itBwMaugXE" role="3clF45">
<ref role="2I9WkF" to="wq2x:5itBwM578SV" resolve="CallMacroTemplate" />
</node>
<node concept="3Tm1VV" id="5itBwMaugU8" role="1B3o_S" />
<node concept="3clFbS" id="5itBwMaugU9" role="3clF47">
<node concept="3cpWs8" id="5itBwMauhbs" role="3cqZAp">
<node concept="3cpWsn" id="5itBwMauhbt" role="3cpWs9">
<property role="TrG5h" value="mts" />
<node concept="_YKpA" id="5itBwMauhbu" role="1tU5fm">
<node concept="3Tqbb2" id="5itBwMauhbv" role="_ZDj9">
<ref role="ehGHo" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
</node>
</node>
<node concept="2ShNRf" id="5itBwMauhbw" role="33vP2m">
<node concept="Tc6Ow" id="5itBwMauhbx" role="2ShVmc">
<node concept="3Tqbb2" id="5itBwMauhby" role="HW$YZ">
<ref role="ehGHo" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="5itBwMauhcq" role="3cqZAp">
<node concept="2OqwBi" id="5itBwMauhcr" role="3clFbG">
<node concept="37vLTw" id="5itBwMauhcs" role="2Oq$k0">
<ref role="3cqZAo" node="5itBwMauhbt" resolve="mts" />
</node>
<node concept="X8dFx" id="5itBwMauhct" role="2OqNvi">
<node concept="2OqwBi" id="5itBwMauhcu" role="25WWJ7">
<node concept="2OqwBi" id="5itBwMauhcv" role="2Oq$k0">
<node concept="37vLTw" id="5itBwMauhcw" role="2Oq$k0">
<ref role="3cqZAo" node="5itBwMauh5R" resolve="contextNode" />
</node>
<node concept="I4A8Y" id="5itBwMauhcx" role="2OqNvi" />
</node>
<node concept="3lApI0" id="5itBwMauhcy" role="2OqNvi">
<ref role="3lApI3" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="5itBwMauia$" role="3cqZAp">
<node concept="2OqwBi" id="5itBwMauia_" role="3clFbG">
<node concept="2OqwBi" id="5itBwMauiaA" role="2Oq$k0">
<node concept="2OqwBi" id="5itBwMauiaB" role="2Oq$k0">
<node concept="37vLTw" id="5itBwMauiaC" role="2Oq$k0">
<ref role="3cqZAo" node="5itBwMauhbt" resolve="mts" />
</node>
<node concept="3goQfb" id="5itBwMauiaD" role="2OqNvi">
<node concept="1bVj0M" id="5itBwMauiaE" role="23t8la">
<node concept="3clFbS" id="5itBwMauiaF" role="1bW5cS">
<node concept="3clFbF" id="5itBwMauiaG" role="3cqZAp">
<node concept="2OqwBi" id="5itBwMauiaH" role="3clFbG">
<node concept="37vLTw" id="5itBwMauiaI" role="2Oq$k0">
<ref role="3cqZAo" node="5itBwMauiaK" resolve="it" />
</node>
<node concept="3Tsc0h" id="5itBwMaujeX" role="2OqNvi">
<ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
</node>
</node>
</node>
</node>
<node concept="Rh6nW" id="5itBwMauiaK" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="5itBwMauiaL" role="1tU5fm" />
</node>
</node>
</node>
</node>
<node concept="v3k3i" id="5itBwMauiaM" role="2OqNvi">
<node concept="chp4Y" id="5itBwMaujoc" role="v3oSu">
<ref role="cht4Q" to="wq2x:5itBwM578SV" resolve="CallMacroTemplate" />
</node>
</node>
</node>
<node concept="ANE8D" id="5itBwMauiaO" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="5itBwMaugQK" role="jymVt" />
<node concept="2YIFZL" id="5itBwM9UyR1" role="jymVt">
<property role="TrG5h" value="prototypesScope" />
<node concept="37vLTG" id="5itBwM9U$iC" role="3clF46">
<property role="TrG5h" value="contextNode" />
<node concept="3Tqbb2" id="5itBwM9U$mJ" role="1tU5fm" />
</node>
<node concept="2I9FWS" id="5itBwM9UzYf" role="3clF45">
<ref role="2I9WkF" to="wq2x:5itBwM6cWQh" resolve="ExpandMacroPrototype" />
</node>
<node concept="3Tm1VV" id="5itBwM9UyR4" role="1B3o_S" />
<node concept="3clFbS" id="5itBwM9UyR5" role="3clF47">
<node concept="3cpWs8" id="5itBwM9U$Ac" role="3cqZAp">
<node concept="3cpWsn" id="5itBwM9U$Ad" role="3cpWs9">
<property role="TrG5h" value="mts" />
<node concept="_YKpA" id="5itBwM9U$Ae" role="1tU5fm">
<node concept="3Tqbb2" id="5itBwM9U$Af" role="_ZDj9">
<ref role="ehGHo" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
</node>
</node>
<node concept="2ShNRf" id="5itBwM9U$Ag" role="33vP2m">
<node concept="Tc6Ow" id="5itBwM9U$Ah" role="2ShVmc">
<node concept="3Tqbb2" id="5itBwM9U$Ai" role="HW$YZ">
<ref role="ehGHo" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="5itBwM9U$Aj" role="3cqZAp">
<node concept="3cpWsn" id="5itBwM9U$Ak" role="3cpWs9">
<property role="TrG5h" value="mt" />
<node concept="3Tqbb2" id="5itBwM9U$Al" role="1tU5fm">
<ref role="ehGHo" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
</node>
<node concept="2OqwBi" id="5itBwM9U$Am" role="33vP2m">
<node concept="37vLTw" id="5itBwM9UfMh" role="2Oq$k0">
<ref role="3cqZAo" node="5itBwM9U$iC" resolve="contextNode" />
</node>
<node concept="2Xjw5R" id="5itBwM9U$An" role="2OqNvi">
<node concept="1xMEDy" id="5itBwM9U$Ao" role="1xVPHs">
<node concept="chp4Y" id="5itBwM9U$Ap" role="ri$Ld">
<ref role="cht4Q" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
</node>
</node>
<node concept="1xIGOp" id="5itBwM9U$Aq" role="1xVPHs" />
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="5itBwM9YAD6" role="3cqZAp">
<node concept="3clFbS" id="5itBwM9YADn" role="3clFbx">
<node concept="3clFbF" id="5itBwM9YG_i" role="3cqZAp">
<node concept="1rXfSq" id="5itBwM9YG_g" role="3clFbG">
<ref role="37wK5l" node="5itBwM9YBAG" resolve="populateExtended" />
<node concept="37vLTw" id="5itBwM9YGFU" role="37wK5m">
<ref role="3cqZAo" node="5itBwM9U$Ak" resolve="mt" />
</node>
<node concept="37vLTw" id="5itBwM9YGT4" role="37wK5m">
<ref role="3cqZAo" node="5itBwM9U$Ad" resolve="mts" />
</node>
</node>
</node>
<node concept="3clFbH" id="5itBwM9YAXN" role="3cqZAp" />
</node>
<node concept="2OqwBi" id="5itBwM9YAh_" role="3clFbw">
<node concept="37vLTw" id="5itBwM9Y_VU" role="2Oq$k0">
<ref role="3cqZAo" node="5itBwM9U$Ak" resolve="mt" />
</node>
<node concept="3x8VRR" id="5itBwM9YAt9" role="2OqNvi" />
</node>
<node concept="9aQIb" id="5itBwM9YATB" role="9aQIa">
<node concept="3clFbS" id="5itBwM9YATC" role="9aQI4">
<node concept="3clFbF" id="5itBwM9YOXb" role="3cqZAp">
<node concept="2OqwBi" id="5itBwM9YQgw" role="3clFbG">
<node concept="37vLTw" id="5itBwM9YOX9" role="2Oq$k0">
<ref role="3cqZAo" node="5itBwM9U$Ad" resolve="mts" />
</node>
<node concept="X8dFx" id="5itBwM9YRMh" role="2OqNvi">
<node concept="2OqwBi" id="5itBwM9YSiO" role="25WWJ7">
<node concept="2OqwBi" id="5itBwM9YSiP" role="2Oq$k0">
<node concept="37vLTw" id="5itBwM9YSiQ" role="2Oq$k0">
<ref role="3cqZAo" node="5itBwM9U$iC" resolve="contextNode" />
</node>
<node concept="I4A8Y" id="5itBwM9YSiR" role="2OqNvi" />
</node>
<node concept="3lApI0" id="5itBwM9YSiS" role="2OqNvi">
<ref role="3lApI3" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="5itBwM9YS$m" role="3cqZAp" />
</node>
</node>
</node>
<node concept="3clFbF" id="5itBwM9Ugxd" role="3cqZAp">
<node concept="2OqwBi" id="5itBwM9UnR5" role="3clFbG">
<node concept="2OqwBi" id="5itBwM9UpTm" role="2Oq$k0">
<node concept="2OqwBi" id="5itBwM9UkXR" role="2Oq$k0">
<node concept="37vLTw" id="5itBwM9Ugxb" role="2Oq$k0">
<ref role="3cqZAo" node="5itBwM9U$Ad" resolve="mts" />
</node>
<node concept="3goQfb" id="5itBwM9UmTO" role="2OqNvi">
<node concept="1bVj0M" id="5itBwM9UmTQ" role="23t8la">
<node concept="3clFbS" id="5itBwM9UmTR" role="1bW5cS">
<node concept="3clFbF" id="5itBwM9Un4k" role="3cqZAp">
<node concept="2OqwBi" id="5itBwM9Unlq" role="3clFbG">
<node concept="37vLTw" id="5itBwM9Un4j" role="2Oq$k0">
<ref role="3cqZAo" node="5itBwM9UmTS" resolve="it" />
</node>
<node concept="3Tsc0h" id="5itBwM9UnsK" role="2OqNvi">
<ref role="3TtcxE" to="wq2x:5itBwM6ukmz" resolve="prototype" />
</node>
</node>
</node>
</node>
<node concept="Rh6nW" id="5itBwM9UmTS" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="5itBwM9UmTT" role="1tU5fm" />
</node>
</node>
</node>
</node>
<node concept="v3k3i" id="5itBwM9UqAv" role="2OqNvi">
<node concept="chp4Y" id="5itBwM9UqQU" role="v3oSu">
<ref role="cht4Q" to="wq2x:5itBwM6cWQh" resolve="ExpandMacroPrototype" />
</node>
</node>
</node>
<node concept="ANE8D" id="5itBwM9UoDm" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="5itBwM9YBkE" role="jymVt" />
<node concept="2YIFZL" id="5itBwM9YBAG" role="jymVt">
<property role="TrG5h" value="populateExtended" />
<node concept="37vLTG" id="5itBwM9YD67" role="3clF46">
<property role="TrG5h" value="from" />
<node concept="3Tqbb2" id="5itBwM9YDep" role="1tU5fm">
<ref role="ehGHo" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
</node>
</node>
<node concept="37vLTG" id="5itBwM9YCbh" role="3clF46">
<property role="TrG5h" value="mts" />
<node concept="2I9FWS" id="5itBwM9YCjf" role="1tU5fm">
<ref role="2I9WkF" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
</node>
</node>
<node concept="3cqZAl" id="5itBwM9YCrp" role="3clF45" />
<node concept="3Tm6S6" id="5itBwM9Zl24" role="1B3o_S" />
<node concept="3clFbS" id="5itBwM9YBAK" role="3clF47">
<node concept="3cpWs8" id="5itBwM9YEMf" role="3cqZAp">
<node concept="3cpWsn" id="5itBwM9YEMg" role="3cpWs9">
<property role="TrG5h" value="mt" />
<node concept="3Tqbb2" id="5itBwM9YEJo" role="1tU5fm">
<ref role="ehGHo" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
</node>
<node concept="37vLTw" id="5itBwM9YEMh" role="33vP2m">
<ref role="3cqZAo" node="5itBwM9YD67" resolve="from" />
</node>
</node>
</node>
<node concept="3clFbF" id="5itBwM9YFtm" role="3cqZAp">
<node concept="2OqwBi" id="5itBwM9YFtn" role="3clFbG">
<node concept="37vLTw" id="5itBwM9YFto" role="2Oq$k0">
<ref role="3cqZAo" node="5itBwM9YCbh" resolve="mts" />
</node>
<node concept="TSZUe" id="5itBwM9YFtp" role="2OqNvi">
<node concept="37vLTw" id="5itBwM9YFtq" role="25WWJ7">
<ref role="3cqZAo" node="5itBwM9YEMg" resolve="mt" />
</node>
</node>
</node>
</node>
<node concept="2$JKZl" id="5itBwM9YFN5" role="3cqZAp">
<node concept="3clFbS" id="5itBwM9YFN6" role="2LFqv$">
<node concept="3clFbF" id="5itBwM9YFN7" role="3cqZAp">
<node concept="37vLTI" id="5itBwM9YFN8" role="3clFbG">
<node concept="2OqwBi" id="5itBwM9YFN9" role="37vLTx">
<node concept="37vLTw" id="5itBwM9YFNa" role="2Oq$k0">
<ref role="3cqZAo" node="5itBwM9YEMg" resolve="mt" />
</node>
<node concept="3TrEf2" id="5itBwM9YFNb" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5itBwM9Rt6C" resolve="extends" />
</node>
</node>
<node concept="37vLTw" id="5itBwM9YFNc" role="37vLTJ">
<ref role="3cqZAo" node="5itBwM9YEMg" resolve="mt" />
</node>
</node>
</node>
<node concept="3clFbF" id="5itBwM9YFNd" role="3cqZAp">
<node concept="2OqwBi" id="5itBwM9YFNe" role="3clFbG">
<node concept="37vLTw" id="5itBwM9YFNf" role="2Oq$k0">
<ref role="3cqZAo" node="5itBwM9YCbh" resolve="mts" />
</node>
<node concept="TSZUe" id="5itBwM9YFNg" role="2OqNvi">
<node concept="37vLTw" id="5itBwM9YFNh" role="25WWJ7">
<ref role="3cqZAo" node="5itBwM9YEMg" resolve="mt" />
</node>
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="5itBwM9YFNi" role="2$JKZa">
<node concept="2OqwBi" id="5itBwM9YFNj" role="2Oq$k0">
<node concept="37vLTw" id="5itBwM9YFNk" role="2Oq$k0">
<ref role="3cqZAo" node="5itBwM9YEMg" resolve="mt" />
</node>
<node concept="3TrEf2" id="5itBwM9YFNl" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5itBwM9Rt6C" resolve="extends" />
</node>
</node>
<node concept="3x8VRR" id="5itBwM9YFNm" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="5itBwM9UyZe" role="jymVt" />
<node concept="3Tm1VV" id="5itBwM9UyB5" role="1B3o_S" />
</node>
</model>

924
coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
View File

File diff suppressed because it is too large Load Diff

15
coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
View File

@ -433,6 +433,11 @@
<property role="34LRSv" value="macro table" />
<property role="EcuMT" value="1618328391714763069" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="5itBwM9Rt6C" role="1TKVEi">
<property role="IQ2ns" value="6097203247219331496" />
<property role="20kJfa" value="extends" />
<ref role="20lvS9" node="1pPth$m5B4X" resolve="MacroTable" />
</node>
<node concept="1TJgyj" id="5itBwM6ukmz" role="1TKVEi">
<property role="IQ2ns" value="6097203247162410403" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
@ -494,6 +499,9 @@
<node concept="PrWs8" id="b5g$pBzjW6" role="PzmwI">
<ref role="PrY4T" node="1CgWc1Tyjkz" resolve="Commentable" />
</node>
<node concept="PrWs8" id="5itBwMaaWLe" role="PzmwI">
<ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
</node>
</node>
<node concept="1TIwiD" id="PB1R3Y7Ed7">
<property role="3GE5qa" value="constraint.variable" />
@ -1457,9 +1465,6 @@
<property role="EcuMT" value="6097203247139390521" />
<property role="3GE5qa" value="macro" />
<property role="TrG5h" value="MacroTemplate" />
<node concept="PrWs8" id="5itBwM56xRq" role="PrDN$">
<ref role="PrY4T" node="6OXbTDyHcuD" resolve="Template" />
</node>
</node>
<node concept="1TIwiD" id="5itBwM578SV">
<property role="EcuMT" value="6097203247139556923" />
@ -1481,6 +1486,9 @@
<node concept="PrWs8" id="5itBwM57bFv" role="PzmwI">
<ref role="PrY4T" node="1CgWc1Tyjkz" resolve="Commentable" />
</node>
<node concept="PrWs8" id="5itBwMaaWqd" role="PzmwI">
<ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
</node>
<node concept="1TJgyj" id="5itBwM5$rCX" role="1TKVEi">
<property role="IQ2ns" value="6097203247147235901" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
@ -1777,6 +1785,7 @@
<property role="EcuMT" value="6097203247184206287" />
<property role="3GE5qa" value="constraint" />
<property role="TrG5h" value="CallMacroConstraint" />
<property role="34LRSv" value="call" />
<ref role="1TJDcQ" node="18kNIl0mxXI" resolve="PseudoConstraint" />
<node concept="1TJgyj" id="5itBwM7Lv0S" role="1TKVEi">
<property role="IQ2ns" value="6097203247184212024" />