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

Optimize BL types and queries 

Make expectType optional (auxiliary).
Drop checkDecls from typeof query (unnecessary).
This commit is contained in:
Fedor Isakov 2021-04-23 11:28:51 +02:00
parent dbbb37384f
commit a204df222a
5 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
View File

@ -25667,6 +25667,7 @@
<ref role="2YbDB9" to="kqnc:2J$kxDHIJYU" resolve="ExpectType" />
<node concept="1nLNMY" id="3CulEO3elcx" role="1nK1Vg">
<property role="TrG5h" value="expect_typeOf_multiForEachVariable" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="3CulEO3elcy" role="1nLNMH">
<node concept="1nLNNL" id="12QmIo_7sf0" role="3cqZAp">
<node concept="1nLNMm" id="12QmIo_7sf1" role="1nLNNK">
@ -25730,6 +25731,7 @@
</node>
<node concept="1nLNMY" id="3CulEO3elv7" role="1nK1Vg">
<property role="TrG5h" value="typeOf_multiForEachVariable" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="3CulEO3elv8" role="1nLNMH">
<node concept="1nLNNL" id="14oWJ2Nxubl" role="3cqZAp">
<node concept="1nLNMm" id="14oWJ2Nxubm" role="1nLNNK">

23
samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
View File

@ -36995,6 +36995,7 @@
</node>
<node concept="1nLNMY" id="12QmIo_7seY" role="1nK1Vg">
<property role="TrG5h" value="expect_typeOf_expression" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="12QmIo_7seZ" role="1nLNMH">
<node concept="1nLNNL" id="12QmIo_7sf0" role="3cqZAp">
<node concept="1nLNMm" id="12QmIo_7sf1" role="1nLNNK">
@ -37058,6 +37059,7 @@
</node>
<node concept="1nLNMY" id="12QmIo_7sf2" role="1nK1Vg">
<property role="TrG5h" value="expect_typeOf_operation" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="12QmIo_7sf3" role="1nLNMH">
<node concept="1nLNNL" id="12QmIo_7sf4" role="3cqZAp">
<node concept="1nLNMm" id="12QmIo_7sf5" role="1nLNNK">
@ -37121,6 +37123,7 @@
</node>
<node concept="1nLNMY" id="12QmIo_7sf6" role="1nK1Vg">
<property role="TrG5h" value="expect_typeOf_variableDeclaration" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="12QmIo_7sf7" role="1nLNMH">
<node concept="1nLNNL" id="12QmIo_7sf8" role="3cqZAp">
<node concept="1nLNMm" id="12QmIo_7sf9" role="1nLNNK">
@ -37184,6 +37187,7 @@
</node>
<node concept="1nLNMY" id="12QmIo_7sfa" role="1nK1Vg">
<property role="TrG5h" value="expect_typeOf_abstractCreator" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="12QmIo_7sfb" role="1nLNMH">
<node concept="1nLNNL" id="12QmIo_7sfc" role="3cqZAp">
<node concept="1nLNMm" id="12QmIo_7sfd" role="1nLNNK">
@ -37247,6 +37251,7 @@
</node>
<node concept="1nLNMY" id="3rrtTcSpvWZ" role="1nK1Vg">
<property role="TrG5h" value="expect_typeOf_conceptFunction" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="3rrtTcSpvX0" role="1nLNMH">
<node concept="1nLNNL" id="3rrtTcSpxoS" role="3cqZAp">
<node concept="1nLNMm" id="3rrtTcSpxoT" role="1nLNNK">
@ -37341,6 +37346,7 @@
</node>
<node concept="1nLNMY" id="77mpfA3Ir$v" role="1nK1Vg">
<property role="TrG5h" value="typeOf_expression" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="77mpfA3Ir$w" role="1nLNMH">
<node concept="1nLNNL" id="77mpfA3Ir$x" role="3cqZAp">
<node concept="1nLNMm" id="77mpfA3Ir$y" role="1nLNNK">
@ -37456,6 +37462,7 @@
</node>
<node concept="1nLNMY" id="77mpfA3Ir$4" role="1nK1Vg">
<property role="TrG5h" value="typeOf_operation" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="77mpfA3Ir$5" role="1nLNMH">
<node concept="1nLNNL" id="77mpfA3IuPF" role="3cqZAp">
<node concept="1nLNMm" id="77mpfA3IuPG" role="1nLNNK">
@ -37571,6 +37578,7 @@
</node>
<node concept="1nLNMY" id="77mpfA3IrzD" role="1nK1Vg">
<property role="TrG5h" value="typeOf_variableDeclaration" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="77mpfA3IrzE" role="1nLNMH">
<node concept="1nLNNL" id="77mpfA3IvRN" role="3cqZAp">
<node concept="1nLNMm" id="77mpfA3IvRO" role="1nLNNK">
@ -37686,6 +37694,7 @@
</node>
<node concept="1nLNMY" id="77mpfA3Irze" role="1nK1Vg">
<property role="TrG5h" value="typeOf_abstractCreator" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="77mpfA3Irzf" role="1nLNMH">
<node concept="1nLNNL" id="77mpfA3IyqW" role="3cqZAp">
<node concept="1nLNMm" id="77mpfA3IyqX" role="1nLNNK">
@ -37801,6 +37810,7 @@
</node>
<node concept="1nLNMY" id="3rrtTcSpy_1" role="1nK1Vg">
<property role="TrG5h" value="typeOf_conceptFunction" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="3rrtTcSpy_2" role="1nLNMH">
<node concept="1nLNNL" id="3rrtTcSp$Y$" role="3cqZAp">
<node concept="1nLNMm" id="3rrtTcSp$Y_" role="1nLNNK">
@ -42447,11 +42457,6 @@
<node concept="3xSepi" id="1T5MAgP_ids" role="3xSepv">
<node concept="3Aq9E8" id="1T5MAgP_idt" role="3xSepj">
<node concept="3I6sU6" id="1T5MAgP_idu" role="3Ip0Jz">
<node concept="3I6s7M" id="1T5MAgP_idv" role="3I6sU7">
<node concept="3Aqt3T" id="1T5MAgP_idw" role="3I6s78">
<ref role="3AqCNq" node="4btN1w5Ki4T" resolve="checkDecls" />
</node>
</node>
<node concept="3I6s7M" id="1T5MAgP_idx" role="3I6sU7">
<node concept="3Aqt3T" id="1T5MAgP_idy" role="3I6s78">
<ref role="3AqCNq" node="34$A1MfabR$" resolve="checkAll" />
@ -42634,7 +42639,7 @@
<ref role="37wK5l" to="tj24:5EDW3XDYO27" resolve="getTargetNode" />
</node>
</node>
<node concept="a7P8L" id="1RYTbd7J6Mx" role="3jbY8V">
<node concept="a7P8L" id="BiC39hIVsZ" role="3jbY8V">
<ref role="a7OzE" node="tbauFybkiD" resolve="B" />
</node>
</node>
@ -42644,10 +42649,10 @@
<node concept="3y3z36" id="1RYTbd7J6zN" role="3clFbw">
<node concept="10Nm6u" id="1RYTbd7J6Dg" role="3uHU7w" />
<node concept="2OqwBi" id="1RYTbd7J6is" role="3uHU7B">
<node concept="KwDlU" id="1RYTbd7J68b" role="2Oq$k0" />
<node concept="liA8E" id="1RYTbd7J6rf" role="2OqNvi">
<ref role="37wK5l" to="tj24:5EDW3XDYO27" resolve="getTargetNode" />
</node>
<node concept="KwDlU" id="1RYTbd7J68b" role="2Oq$k0" />
</node>
</node>
<node concept="9aQIb" id="1RYTbd7J6Th" role="9aQIa">
@ -42661,7 +42666,7 @@
<ref role="37wK5l" to="tj24:5EDW3XEtgZU" resolve="getTargetConcept" />
</node>
</node>
<node concept="a7P8L" id="tbauFybkiW" role="3jbY8V">
<node concept="a7P8L" id="BiC39hIVt5" role="3jbY8V">
<ref role="a7OzE" node="tbauFybkiD" resolve="B" />
</node>
</node>
@ -42693,7 +42698,7 @@
<ref role="37wK5l" node="4O7HczOeR2N" resolve="getNew" />
<ref role="1Pybhc" node="4O7HczOeKN2" resolve="ConvertsContext" />
</node>
<node concept="liA8E" id="6GOqnFkCDWX" role="2OqNvi">
<node concept="liA8E" id="7iSgJB03ili" role="2OqNvi">
<ref role="37wK5l" node="3vTJNooZCTc" resolve="infer" />
</node>
</node>

7
samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
View File

@ -257,6 +257,7 @@
<child id="7674753015762572651" name="body" index="3xSepv" />
</concept>
<concept id="3575255234174969615" name="jetbrains.mps.lang.coderules.structure.RuleTemplate" flags="ng" index="1nLNMY">
<property id="597338001513854136" name="auxiliary" index="1nmhW7" />
<child id="3575255234174969633" name="input" index="1nLNMg" />
<child id="3575255234174969628" name="code" index="1nLNMH" />
</concept>
@ -2901,6 +2902,7 @@
<ref role="2YbDB9" to="kqnc:2J$kxDHIJYU" resolve="ExpectType" />
<node concept="1nLNMY" id="51ek2rSbOY0" role="1nK1Vg">
<property role="TrG5h" value="expect_typeOf_CallMacroParameterDeclaration" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="51ek2rSbOY1" role="1nLNMH">
<node concept="1nLNNL" id="12QmIo_7sf0" role="3cqZAp">
<node concept="1nLNMm" id="12QmIo_7sf1" role="1nLNNK">
@ -2964,6 +2966,7 @@
</node>
<node concept="1nLNMY" id="51ek2rSbOTG" role="1nK1Vg">
<property role="TrG5h" value="expect_typeOf_ExpandMacroInputDeclaration" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="51ek2rSbOTH" role="1nLNMH">
<node concept="1nLNNL" id="51ek2rSbOTI" role="3cqZAp">
<node concept="1nLNMm" id="51ek2rSbOTJ" role="1nLNNK">
@ -3027,6 +3030,7 @@
</node>
<node concept="1nLNMY" id="6zber0NTBxI" role="1nK1Vg">
<property role="TrG5h" value="expect_typeOf_expandMacroParameterDeclaration" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="6zber0NTBxJ" role="1nLNMH">
<node concept="1nLNNL" id="6zber0NTBEh" role="3cqZAp">
<node concept="1nLNMm" id="6zber0NTBEi" role="1nLNNK">
@ -3090,6 +3094,7 @@
</node>
<node concept="1nLNMY" id="51ek2rSbWAp" role="1nK1Vg">
<property role="TrG5h" value="typeOf_CallMacroParameterDeclaration" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="51ek2rSbWAq" role="1nLNMH">
<node concept="1nLNNL" id="14oWJ2Nxubl" role="3cqZAp">
<node concept="1nLNMm" id="14oWJ2Nxubm" role="1nLNNK">
@ -3205,6 +3210,7 @@
</node>
<node concept="1nLNMY" id="51ek2rSbW_Y" role="1nK1Vg">
<property role="TrG5h" value="typeOf_ExpandMacroInputDeclaration" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="51ek2rSbW_Z" role="1nLNMH">
<node concept="1nLNNL" id="51ek2rSbXfc" role="3cqZAp">
<node concept="1nLNMm" id="51ek2rSbXfd" role="1nLNNK">
@ -3320,6 +3326,7 @@
</node>
<node concept="1nLNMY" id="6zber0NTCjg" role="1nK1Vg">
<property role="TrG5h" value="typeOf_expandMacroParameterDeclaration" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="6zber0NTCjh" role="1nLNMH">
<node concept="1nLNNL" id="6zber0NTCse" role="3cqZAp">
<node concept="1nLNMm" id="6zber0NTCsf" role="1nLNNK">

3
samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.types.mps
View File

@ -267,6 +267,7 @@
<child id="7674753015762572651" name="body" index="3xSepv" />
</concept>
<concept id="3575255234174969615" name="jetbrains.mps.lang.coderules.structure.RuleTemplate" flags="ng" index="1nLNMY">
<property id="597338001513854136" name="auxiliary" index="1nmhW7" />
<child id="3575255234174969633" name="input" index="1nLNMg" />
<child id="3575255234174969628" name="code" index="1nLNMH" />
</concept>
@ -2698,6 +2699,7 @@
<ref role="2YbDB9" to="kqnc:2J$kxDHIJYU" resolve="ExpectType" />
<node concept="1nLNMY" id="3rrtTcSrt6E" role="1nK1Vg">
<property role="TrG5h" value="expect_typeOf_varDeclaration" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="3rrtTcSrt6F" role="1nLNMH">
<node concept="1nLNNL" id="12QmIo_7sf0" role="3cqZAp">
<node concept="1nLNMm" id="12QmIo_7sf1" role="1nLNNK">
@ -2761,6 +2763,7 @@
</node>
<node concept="1nLNMY" id="3rrtTcSrrWM" role="1nK1Vg">
<property role="TrG5h" value="typeOf_varDeclaration" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="3rrtTcSrrWN" role="1nLNMH">
<node concept="1nLNNL" id="77mpfA3IyqW" role="3cqZAp">
<node concept="1nLNMm" id="77mpfA3IyqX" role="1nLNNK">

7
samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
View File

@ -244,6 +244,7 @@
<child id="7674753015762572651" name="body" index="3xSepv" />
</concept>
<concept id="3575255234174969615" name="jetbrains.mps.lang.coderules.structure.RuleTemplate" flags="ng" index="1nLNMY">
<property id="597338001513854136" name="auxiliary" index="1nmhW7" />
<child id="3575255234174969633" name="input" index="1nLNMg" />
<child id="3575255234174969628" name="code" index="1nLNMH" />
</concept>
@ -2541,6 +2542,7 @@
<ref role="2YbDB9" to="kqnc:2J$kxDHIJYU" resolve="ExpectType" />
<node concept="1nLNMY" id="12QmIo_7seY" role="1nK1Vg">
<property role="TrG5h" value="expect_typeOf_logicalItem" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="12QmIo_7seZ" role="1nLNMH">
<node concept="1nLNNL" id="12QmIo_7sf0" role="3cqZAp">
<node concept="1nLNMm" id="12QmIo_7sf1" role="1nLNNK">
@ -2604,6 +2606,7 @@
</node>
<node concept="1nLNMY" id="5X1yxJH__SD" role="1nK1Vg">
<property role="TrG5h" value="expect_typeOf_logicalVarDecl" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="5X1yxJH__SE" role="1nLNMH">
<node concept="1nLNNL" id="5X1yxJH__SF" role="3cqZAp">
<node concept="1nLNMm" id="5X1yxJH__SG" role="1nLNNK">
@ -2667,6 +2670,7 @@
</node>
<node concept="1nLNMY" id="5X1yxJH_Ayi" role="1nK1Vg">
<property role="TrG5h" value="expect_typeOf_logicalVar" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="5X1yxJH_Ayj" role="1nLNMH">
<node concept="1nLNNL" id="5X1yxJH_Ayk" role="3cqZAp">
<node concept="1nLNMm" id="5X1yxJH_Ayl" role="1nLNNK">
@ -2730,6 +2734,7 @@
</node>
<node concept="1nLNMY" id="35YJGAJTRFo" role="1nK1Vg">
<property role="TrG5h" value="typeOf_logicalItem" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="35YJGAJTRFp" role="1nLNMH">
<node concept="1nLNNL" id="35YJGAJTRFq" role="3cqZAp">
<node concept="1nLNMm" id="35YJGAJTRFr" role="1nLNNK">
@ -2846,6 +2851,7 @@
</node>
<node concept="1nLNMY" id="14oWJ2Nxubj" role="1nK1Vg">
<property role="TrG5h" value="typeOf_logicalVarDecl" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="14oWJ2Nxubk" role="1nLNMH">
<node concept="1nLNNL" id="14oWJ2Nxubl" role="3cqZAp">
<node concept="1nLNMm" id="14oWJ2Nxubm" role="1nLNNK">
@ -2961,6 +2967,7 @@
</node>
<node concept="1nLNMY" id="14oWJ2NxwyB" role="1nK1Vg">
<property role="TrG5h" value="typeOf_logicalVar" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="14oWJ2NxwyC" role="1nLNMH">
<node concept="1nLNNL" id="14oWJ2NxwyD" role="3cqZAp">
<node concept="1nLNMm" id="14oWJ2NxwyE" role="1nLNNK">