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

Introduce memo expression to enable memoization of values. 

During template application memo can be used to store results
of a computation in the session. The memo will be automatically
cleared on an event that invalidates the caches.
This commit is contained in:
Fedor Isakov 2020-07-28 09:15:28 +02:00
parent 4f74f192b4
commit 32b11c0c7f
10 changed files with 1159 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.xml
View File

@ -424,6 +424,7 @@
<module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="cl" />
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
<module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
<module ref="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" kind="cl" />
<module ref="96ee7a94-411d-4cf8-9b94-96cad7e52411(jetbrains.mps.baseLanguage.jdk7)" kind="cl" />
<module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
<module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
@ -662,6 +663,7 @@
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
<module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
<module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
<module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="cl" />
@ -2425,6 +2427,7 @@
<module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="cl" />
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
<module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
<module ref="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" kind="cl" />
<module ref="96ee7a94-411d-4cf8-9b94-96cad7e52411(jetbrains.mps.baseLanguage.jdk7)" kind="cl" />
<module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
<module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
@ -2663,6 +2666,7 @@
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
<module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
<module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
<module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="cl" />
@ -5311,7 +5315,7 @@
</javac>
</target>
<target name="java.compile.jetbrains.mps.lang.coderules.template" depends="java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
<target name="java.compile.jetbrains.mps.lang.coderules.template" depends="java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
<mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" />
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@ -5324,20 +5328,21 @@
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
<fileset file="${artifacts.mps}/lib/mps-context.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
<fileset file="${artifacts.mps}/lib/mps-generator.jar" />
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
<fileset file="${artifacts.mps}/lib/mps-references.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
<fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
<fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
<fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />

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

@ -1680,6 +1680,95 @@
<ref role="2VPoh2" node="5EDW3XF62FH" resolve="Manifest" />
<ref role="2sBCQV" node="5EDW3XF64MJ" resolve="manifest" />
</node>
<node concept="3aamgX" id="5HVB6JR7JqW" role="3acgRq">
<ref role="30HIoZ" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
<node concept="1Koe21" id="5HVB6JR7KJv" role="1lVwrX">
<node concept="3clFb_" id="5HVB6JR7KJw" role="1Koe22">
<property role="TrG5h" value="context" />
<node concept="37vLTG" id="5HVB6JR7KJx" role="3clF46">
<property role="TrG5h" value="session" />
<node concept="3uibUv" id="5HVB6JR7KJy" role="1tU5fm">
<ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
</node>
</node>
<node concept="3Tm6S6" id="5HVB6JR7KJz" role="1B3o_S" />
<node concept="3cqZAl" id="5HVB6JR7KJ$" role="3clF45" />
<node concept="3clFbS" id="5HVB6JR7KJ_" role="3clF47">
<node concept="3clFbH" id="5HVB6JR7KJA" role="3cqZAp" />
<node concept="3clFbF" id="5HVB6JR7KJB" role="3cqZAp">
<node concept="2OqwBi" id="5HVB6JR7KJC" role="3clFbG">
<node concept="liA8E" id="5HVB6JR7KJD" role="2OqNvi">
<ref role="37wK5l" to="i348:5HVB6JR7NAD" resolve="memoize" />
<node concept="10Nm6u" id="5HVB6JR8u3o" role="37wK5m">
<node concept="29HgVG" id="5HVB6JR8u8z" role="lGtFl">
<node concept="3NFfHV" id="5HVB6JR8u8$" role="3NFExx">
<node concept="3clFbS" id="5HVB6JR8u8_" role="2VODD2">
<node concept="3clFbF" id="5HVB6JR8u8F" role="3cqZAp">
<node concept="2OqwBi" id="5HVB6JR8u8A" role="3clFbG">
<node concept="3TrEf2" id="5HVB6JR8u8D" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:6PWFJfGbjSW" resolve="key" />
</node>
<node concept="30H73N" id="5HVB6JR8u8E" role="2Oq$k0" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="10Nm6u" id="5HVB6JR8uvL" role="37wK5m">
<node concept="29HgVG" id="5HVB6JR8u$m" role="lGtFl">
<node concept="3NFfHV" id="5HVB6JR8u$n" role="3NFExx">
<node concept="3clFbS" id="5HVB6JR8u$o" role="2VODD2">
<node concept="3clFbF" id="5HVB6JR8u$u" role="3cqZAp">
<node concept="2OqwBi" id="5HVB6JR8u$p" role="3clFbG">
<node concept="3TrEf2" id="5HVB6JR8u$s" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:6PWFJfGbjSY" resolve="valueProvider" />
</node>
<node concept="30H73N" id="5HVB6JR8u$t" role="2Oq$k0" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="37vLTw" id="5HVB6JR7KJR" role="2Oq$k0">
<ref role="3cqZAo" node="5HVB6JR7KJx" resolve="session" />
<node concept="1ZhdrF" id="5HVB6JR7KJS" role="lGtFl">
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
<property role="2qtEX8" value="variableDeclaration" />
<node concept="3$xsQk" id="5HVB6JR7KJT" role="3$ytzL">
<node concept="3clFbS" id="5HVB6JR7KJU" role="2VODD2">
<node concept="3clFbF" id="5HVB6JR7KJV" role="3cqZAp">
<node concept="2OqwBi" id="5HVB6JR7KJW" role="3clFbG">
<node concept="1iwH7S" id="5HVB6JR7KJX" role="2Oq$k0" />
<node concept="1iwH70" id="5HVB6JR7KJY" role="2OqNvi">
<ref role="1iwH77" node="429xoypVg6q" resolve="apply_session_parameter" />
<node concept="2OqwBi" id="5HVB6JR7KJZ" role="1iwH7V">
<node concept="30H73N" id="5HVB6JR7KK0" role="2Oq$k0" />
<node concept="2Xjw5R" id="5HVB6JR7KK1" role="2OqNvi">
<node concept="1xMEDy" id="5HVB6JR7KK2" role="1xVPHs">
<node concept="chp4Y" id="5HVB6JR7KK3" role="ri$Ld">
<ref role="cht4Q" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="raruj" id="5HVB6JR7KK4" role="lGtFl" />
</node>
<node concept="3clFbH" id="5HVB6JR7KK5" role="3cqZAp" />
</node>
</node>
</node>
</node>
</node>
<node concept="1pmfR0" id="4vbeH84AvBw">
<property role="TrG5h" value="init_tracking" />
@ -16910,9 +16999,6 @@
<node concept="3clFb_" id="5EDW3XF62NQ" role="jymVt">
<property role="TrG5h" value="programSpecBuilder" />
<node concept="3Tm1VV" id="5EDW3XF62NS" role="1B3o_S" />
<node concept="3uibUv" id="5tAk4yVYcvv" role="3clF45">
<ref role="3uigEE" to="i348:5tAk4yVWROK" resolve="ProgramSpecBuilder" />
</node>
<node concept="3clFbS" id="5EDW3XF62NU" role="3clF47">
<node concept="3clFbF" id="5EDW3XF6$kS" role="3cqZAp">
<node concept="2OqwBi" id="5tAk4yVYcSe" role="3clFbG">
@ -16928,6 +17014,9 @@
<node concept="2AHcQZ" id="5EDW3XF62NV" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
<node concept="3uibUv" id="5tAk4yVYcvv" role="3clF45">
<ref role="3uigEE" to="i348:5tAk4yVWROK" resolve="ProgramSpecBuilder" />
</node>
</node>
<node concept="2tJIrI" id="5EDW3XF6frs" role="jymVt" />
<node concept="3clFb_" id="5EDW3XF6enC" role="jymVt">

1
coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
View File

@ -111,6 +111,7 @@
<dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
<dependency reexport="false">35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</dependency>
<dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
<dependency reexport="false">fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />

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

@ -28,6 +28,7 @@
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
<import index="tp2c" ref="r:00000000-0000-4000-0000-011c89590338(jetbrains.mps.baseLanguage.closures.structure)" />
<import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
<import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
</imports>
@ -78,6 +79,7 @@
<concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
<concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
<concept id="1233148810477" name="jetbrains.mps.lang.editor.structure.InlineStyleDeclaration" flags="ng" index="tppnM" />
<concept id="1177327274449" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_pattern" flags="nn" index="ub8z3" />
<concept id="1177327570013" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Substitute" flags="in" index="ucgPf" />
<concept id="7671875129586001610" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_IncludeSubstituteMenu" flags="ng" index="ulPW2">
<child id="6089045305656903122" name="menuReference" index="2ks2uz" />
@ -8320,5 +8322,172 @@
<node concept="3VyMlK" id="6mHZizzmuYs" role="3ft7WO" />
<node concept="22hDWj" id="6mHZizzmu_J" role="22hAXT" />
</node>
<node concept="24kQdi" id="6PWFJfGbjT1">
<ref role="1XX52x" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
<node concept="3EZMnI" id="6PWFJfGbjWm" role="2wV5jI">
<node concept="PMmxH" id="6PWFJfGbjWw" role="3EZMnx">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
<ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
</node>
<node concept="3F0ifn" id="6PWFJfGbjWV" role="3EZMnx">
<property role="3F0ifm" value="(" />
<ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
</node>
<node concept="3F1sOY" id="6PWFJfGbjWD" role="3EZMnx">
<ref role="1NtTu8" to="wq2x:6PWFJfGbjSW" resolve="key" />
</node>
<node concept="3F0ifn" id="6PWFJfGbjX7" role="3EZMnx">
<property role="3F0ifm" value=")" />
<ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
</node>
<node concept="3F1sOY" id="6PWFJfGbjWL" role="3EZMnx">
<ref role="1NtTu8" to="wq2x:6PWFJfGbjSY" resolve="valueProvider" />
</node>
<node concept="l2Vlx" id="6PWFJfGbjWp" role="2iSdaV" />
</node>
</node>
<node concept="3p309x" id="6PWFJfGbk0Y">
<property role="TrG5h" value="Memo" />
<node concept="1s_PAr" id="6PWFJfGbk64" role="3ft7WO">
<node concept="2kknPI" id="6PWFJfGbk67" role="1s_PAo">
<ref role="2kkw0f" node="6PWFJfGbk3L" resolve="MemoExpression_substitute" />
</node>
</node>
<node concept="2kknPJ" id="6PWFJfGbk3i" role="1IG6uw">
<ref role="2ZyFGn" to="tpee:fz3vP1J" resolve="Expression" />
</node>
</node>
<node concept="22mcaB" id="6PWFJfGbk3L">
<ref role="aqKnT" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
<node concept="22hDWg" id="6PWFJfGbk6_" role="22hAXT">
<property role="TrG5h" value="MemoExpression_substitute" />
</node>
<node concept="3eGOop" id="6PWFJfGbk91" role="3ft7WO">
<node concept="16NL3D" id="5HVB6JR6pQ3" role="upBLP">
<node concept="16Na2f" id="5HVB6JR6pQ5" role="16NL3A">
<node concept="3clFbS" id="5HVB6JR6pQ7" role="2VODD2">
<node concept="3clFbF" id="5HVB6JR6pUS" role="3cqZAp">
<node concept="1Wc70l" id="5HVB6JRb9MD" role="3clFbG">
<node concept="2OqwBi" id="5HVB6JRbaiR" role="3uHU7B">
<node concept="liA8E" id="5HVB6JRbaEr" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="ub8z3" id="5HVB6JRbaFG" role="37wK5m" />
</node>
<node concept="2OqwBi" id="5HVB6JRcnBc" role="2Oq$k0">
<node concept="35c_gC" id="5HVB6JRcnBd" role="2Oq$k0">
<ref role="35c_gD" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
</node>
<node concept="3n3YKJ" id="5HVB6JRcnBe" role="2OqNvi" />
</node>
</node>
<node concept="2OqwBi" id="5HVB6JR6v_K" role="3uHU7w">
<node concept="2OqwBi" id="5HVB6JR6q3s" role="2Oq$k0">
<node concept="3bvxqY" id="5HVB6JR6pUR" role="2Oq$k0" />
<node concept="2Xjw5R" id="5HVB6JR6vng" role="2OqNvi">
<node concept="1xMEDy" id="5HVB6JR6vni" role="1xVPHs">
<node concept="chp4Y" id="5HVB6JR6vnj" role="ri$Ld">
<ref role="cht4Q" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
</node>
</node>
<node concept="1xIGOp" id="5HVB6JR6vnk" role="1xVPHs" />
</node>
</node>
<node concept="3x8VRR" id="5HVB6JR6vJ6" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="ucgPf" id="6PWFJfGbk92" role="3aKz83">
<node concept="3clFbS" id="6PWFJfGbk93" role="2VODD2">
<node concept="3cpWs8" id="6PWFJfGbxJI" role="3cqZAp">
<node concept="3cpWsn" id="6PWFJfGbxJJ" role="3cpWs9">
<property role="TrG5h" value="me" />
<node concept="3Tqbb2" id="6PWFJfGbxJu" role="1tU5fm">
<ref role="ehGHo" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
</node>
<node concept="2ShNRf" id="6PWFJfGbxJK" role="33vP2m">
<node concept="3zrR0B" id="6PWFJfGbxJL" role="2ShVmc">
<node concept="3Tqbb2" id="6PWFJfGbxJM" role="3zrR0E">
<ref role="ehGHo" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="5HVB6JR9eX9" role="3cqZAp">
<node concept="3cpWsn" id="5HVB6JR9eXa" role="3cpWs9">
<property role="TrG5h" value="cl" />
<node concept="3Tqbb2" id="5HVB6JR9eTr" role="1tU5fm">
<ref role="ehGHo" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
</node>
<node concept="2OqwBi" id="5HVB6JR9eXb" role="33vP2m">
<node concept="2OqwBi" id="5HVB6JR9eXc" role="2Oq$k0">
<node concept="37vLTw" id="5HVB6JR9eXd" role="2Oq$k0">
<ref role="3cqZAo" node="6PWFJfGbxJJ" resolve="me" />
</node>
<node concept="3TrEf2" id="5HVB6JR9eXe" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:6PWFJfGbjSY" resolve="valueProvider" />
</node>
</node>
<node concept="zfrQC" id="5HVB6JR9eXf" role="2OqNvi">
<ref role="1A9B2P" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="6PWFJfGbwER" role="3cqZAp">
<node concept="2OqwBi" id="5HVB6JR9os$" role="3clFbG">
<node concept="2OqwBi" id="5HVB6JR9nMf" role="2Oq$k0">
<node concept="37vLTw" id="5HVB6JR9eXg" role="2Oq$k0">
<ref role="3cqZAo" node="5HVB6JR9eXa" resolve="cl" />
</node>
<node concept="3TrEf2" id="5HVB6JR9o8k" role="2OqNvi">
<ref role="3Tt5mk" to="tp2c:htbW58J" resolve="body" />
</node>
</node>
<node concept="zfrQC" id="5HVB6JR9oNH" role="2OqNvi" />
</node>
</node>
<node concept="3clFbF" id="6PWFJfGbyQb" role="3cqZAp">
<node concept="37vLTw" id="6PWFJfGbyQ9" role="3clFbG">
<ref role="3cqZAo" node="6PWFJfGbxJJ" resolve="me" />
</node>
</node>
</node>
</node>
<node concept="16NfWO" id="6PWFJfGb$1Z" role="upBLP">
<node concept="uGdhv" id="6PWFJfGb$3j" role="16NeZM">
<node concept="3clFbS" id="6PWFJfGb$3l" role="2VODD2">
<node concept="3clFbF" id="6PWFJfGb$7T" role="3cqZAp">
<node concept="2OqwBi" id="6PWFJfGb$7U" role="3clFbG">
<node concept="35c_gC" id="6PWFJfGb$7V" role="2Oq$k0">
<ref role="35c_gD" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
</node>
<node concept="3n3YKJ" id="6PWFJfGb$7W" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
<node concept="16NL0t" id="6PWFJfGbyRr" role="upBLP">
<node concept="uGdhv" id="6PWFJfGbyWB" role="16NL0q">
<node concept="3clFbS" id="6PWFJfGbyWD" role="2VODD2">
<node concept="3clFbF" id="6PWFJfGb$aV" role="3cqZAp">
<node concept="Xl_RD" id="6PWFJfGb$aU" role="3clFbG">
<property role="Xl_RC" value="store value by key in session" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3VyMlK" id="6PWFJfGbzVc" role="3ft7WO" />
</node>
<node concept="22mcaB" id="5HVB6JR3RPr">
<ref role="aqKnT" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
<node concept="22hDWj" id="5HVB6JR3RSJ" role="22hAXT" />
</node>
</model>

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

@ -1644,5 +1644,25 @@
<ref role="AX2Wp" node="3czCaDvmnMw" resolve="FeedbackSeverity" />
</node>
</node>
<node concept="1TIwiD" id="6PWFJfGbjLY">
<property role="EcuMT" value="7889373009908939902" />
<property role="TrG5h" value="MemoExpression" />
<property role="34LRSv" value="memo" />
<ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
<node concept="1TJgyj" id="6PWFJfGbjSW" role="1TKVEi">
<property role="IQ2ns" value="7889373009908940348" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="key" />
<property role="20lbJX" value="fLJekj4/_1" />
<ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
</node>
<node concept="1TJgyj" id="6PWFJfGbjSY" role="1TKVEi">
<property role="IQ2ns" value="7889373009908940350" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="valueProvider" />
<property role="20lbJX" value="fLJekj4/_1" />
<ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
</node>
</node>
</model>

32
coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
View File

@ -8677,6 +8677,7 @@
<property role="TrG5h" value="P" />
</node>
</node>
<node concept="2tJIrI" id="7vRcs5$YXnG" role="jymVt" />
<node concept="3clFb_" id="61G6TdDOcW_" role="jymVt">
<property role="TrG5h" value="forEachInvalidated" />
<node concept="37vLTG" id="61G6TdDOIKn" role="3clF46">
@ -9676,6 +9677,37 @@
</node>
</node>
<node concept="2tJIrI" id="7DvO2Ma0gpD" role="jymVt" />
<node concept="3clFb_" id="6PWFJfG6VOq" role="jymVt">
<property role="TrG5h" value="withMemo" />
<node concept="37vLTG" id="6PWFJfG6VOr" role="3clF46">
<property role="TrG5h" value="memo" />
<node concept="3uibUv" id="6PWFJfG6VOs" role="1tU5fm">
<ref role="3uigEE" to="i348:6PWFJfG5LMK" resolve="Memo" />
</node>
</node>
<node concept="3uibUv" id="6PWFJfG6Xbm" role="3clF45">
<ref role="3uigEE" node="7DvO2M9IiKB" resolve="MacroProcessing" />
</node>
<node concept="3Tm1VV" id="6PWFJfG6VOu" role="1B3o_S" />
<node concept="3clFbS" id="6PWFJfG6VOy" role="3clF47">
<node concept="3clFbF" id="6PWFJfG6VOA" role="3cqZAp">
<node concept="10QFUN" id="6PWFJfG6XPZ" role="3clFbG">
<node concept="3nyPlj" id="6PWFJfG6XPX" role="10QFUP">
<ref role="37wK5l" to="i348:6PWFJfG6OFJ" resolve="withMemo" />
<node concept="37vLTw" id="6PWFJfG6XPY" role="37wK5m">
<ref role="3cqZAo" node="6PWFJfG6VOr" resolve="memo" />
</node>
</node>
<node concept="3uibUv" id="6PWFJfG6YcN" role="10QFUM">
<ref role="3uigEE" node="7DvO2M9IiKB" resolve="MacroProcessing" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="6PWFJfG6VOz" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="5DUvKnrzdJ3" role="jymVt" />
<node concept="3clFb_" id="5itBwM7VEuy" role="jymVt">
<property role="TrG5h" value="expandMacro" />

10
coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
View File

@ -2424,6 +2424,11 @@
<ref role="3bR37D" node="7BVjoXzUxkQ" resolve="jetbrains.mps.logic" />
</node>
</node>
<node concept="1SiIV0" id="5HVB6JRnetC" role="3bR37C">
<node concept="3bR9La" id="5HVB6JRnetD" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6KZG" resolve="jetbrains.mps.baseLanguage.closures" />
</node>
</node>
</node>
<node concept="1E1JtA" id="7BVjoXzUx9d" role="2G$12L">
<property role="BnDLt" value="true" />
@ -2519,6 +2524,11 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="5HVB6JRneu0" role="3bR37C">
<node concept="3bR9La" id="5HVB6JRneu1" role="1SiIV1">
<ref role="3bR37D" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
</node>
</node>
</node>
<node concept="1E1JtA" id="7BVjoXzUxee" role="2G$12L">
<property role="BnDLt" value="true" />

778
coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
View File

File diff suppressed because it is too large Load Diff

2
coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
View File

@ -18,6 +18,7 @@
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
<dependency reexport="false">9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)</dependency>
<dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
@ -38,6 +39,7 @@
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
<module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
<module reference="9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)" version="0" />
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />

143
coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
View File

@ -29,6 +29,7 @@
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
<import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
<import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
<import index="lehm" ref="r:464fcc95-fddb-47d1-b620-592cbf6b8bf2(jetbrains.mps.coderules.runtime.memoizer)" />
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@ -1769,6 +1770,109 @@
</node>
</node>
<node concept="2tJIrI" id="5yr01fEdXuH" role="jymVt" />
<node concept="3clFb_" id="6PWFJfG6OFJ" role="jymVt">
<property role="TrG5h" value="withMemo" />
<node concept="37vLTG" id="6PWFJfG6SSy" role="3clF46">
<property role="TrG5h" value="memo" />
<node concept="3uibUv" id="6PWFJfG6Txt" role="1tU5fm">
<ref role="3uigEE" node="6PWFJfG5LMK" resolve="Memo" />
</node>
</node>
<node concept="3uibUv" id="6PWFJfG6Qok" role="3clF45">
<ref role="3uigEE" node="18kNIl1vDPZ" resolve="TemplateApplicationSession" />
</node>
<node concept="3Tm1VV" id="6PWFJfG6OFM" role="1B3o_S" />
<node concept="3clFbS" id="6PWFJfG6OFN" role="3clF47">
<node concept="3clFbF" id="5HVB6JRjdps" role="3cqZAp">
<node concept="37vLTI" id="5HVB6JRjdpu" role="3clFbG">
<node concept="2OqwBi" id="5HVB6JRjewh" role="37vLTJ">
<node concept="Xjq3P" id="5HVB6JRjexx" role="2Oq$k0" />
<node concept="2OwXpG" id="5HVB6JRjewk" role="2OqNvi">
<ref role="2Oxat5" node="5HVB6JRjdpo" resolve="memo" />
</node>
</node>
<node concept="37vLTw" id="5HVB6JRjdpy" role="37vLTx">
<ref role="3cqZAo" node="6PWFJfG6SSy" resolve="memo" />
</node>
</node>
</node>
<node concept="3clFbF" id="6PWFJfG6TPd" role="3cqZAp">
<node concept="Xjq3P" id="6PWFJfG6TPc" role="3clFbG" />
</node>
</node>
</node>
<node concept="2tJIrI" id="6PWFJfG6NeX" role="jymVt" />
<node concept="3clFb_" id="5HVB6JR7NAD" role="jymVt">
<property role="TrG5h" value="memoize" />
<node concept="37vLTG" id="5HVB6JR7RzF" role="3clF46">
<property role="TrG5h" value="key" />
<node concept="3uibUv" id="5HVB6JR7Y5Z" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
<node concept="37vLTG" id="5HVB6JR7ZtN" role="3clF46">
<property role="TrG5h" value="defaultValue" />
<node concept="3uibUv" id="5HVB6JR7ZtO" role="1tU5fm">
<ref role="3uigEE" to="18ew:~Computable" resolve="Computable" />
<node concept="16syzq" id="5HVB6JR7ZtP" role="11_B2D">
<ref role="16sUi3" node="5HVB6JR7X8i" resolve="T" />
</node>
</node>
</node>
<node concept="16syzq" id="5HVB6JRe6l7" role="3clF45">
<ref role="16sUi3" node="5HVB6JR7X8i" resolve="T" />
</node>
<node concept="3Tm1VV" id="5HVB6JR7NAG" role="1B3o_S" />
<node concept="3clFbS" id="5HVB6JR7NAH" role="3clF47">
<node concept="3clFbJ" id="5HVB6JRjeTa" role="3cqZAp">
<node concept="3clFbS" id="5HVB6JRjeTc" role="3clFbx">
<node concept="3cpWs6" id="5HVB6JRjfoR" role="3cqZAp">
<node concept="2OqwBi" id="5HVB6JRjgl5" role="3cqZAk">
<node concept="37vLTw" id="5HVB6JRjfqc" role="2Oq$k0">
<ref role="3cqZAo" node="5HVB6JRjdpo" resolve="memo" />
</node>
<node concept="liA8E" id="5HVB6JRjh93" role="2OqNvi">
<ref role="37wK5l" node="6PWFJfG5MGS" resolve="getOrSetValue" />
<node concept="37vLTw" id="5HVB6JRji4$" role="37wK5m">
<ref role="3cqZAo" node="5HVB6JR7RzF" resolve="key" />
</node>
<node concept="37vLTw" id="5HVB6JRjkfn" role="37wK5m">
<ref role="3cqZAo" node="5HVB6JR7ZtN" resolve="defaultValue" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="5HVB6JRjo0X" role="3cqZAp" />
</node>
<node concept="3y3z36" id="5HVB6JRjfbq" role="3clFbw">
<node concept="10Nm6u" id="5HVB6JRjfmS" role="3uHU7w" />
<node concept="37vLTw" id="5HVB6JRjeWk" role="3uHU7B">
<ref role="3cqZAo" node="5HVB6JRjdpo" resolve="memo" />
</node>
</node>
<node concept="9aQIb" id="5HVB6JRjlzf" role="9aQIa">
<node concept="3clFbS" id="5HVB6JRjlzg" role="9aQI4">
<node concept="3cpWs6" id="5HVB6JRjmhn" role="3cqZAp">
<node concept="2YIFZM" id="5HVB6JRjmho" role="3cqZAk">
<ref role="37wK5l" to="lehm:2tjs8VC2Blb" resolve="getOrPut" />
<ref role="1Pybhc" to="lehm:2tjs8VC0K0m" resolve="Memoizer" />
<node concept="37vLTw" id="5HVB6JRjmhp" role="37wK5m">
<ref role="3cqZAo" node="5HVB6JR7RzF" resolve="key" />
</node>
<node concept="37vLTw" id="5HVB6JRjmhq" role="37wK5m">
<ref role="3cqZAo" node="5HVB6JR7ZtN" resolve="defaultValue" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="16euLQ" id="5HVB6JR7X8i" role="16eVyc">
<property role="TrG5h" value="T" />
</node>
</node>
<node concept="2tJIrI" id="5HVB6JR7MA4" role="jymVt" />
<node concept="3clFb_" id="36tQV5BDE0Q" role="jymVt">
<property role="TrG5h" value="require" />
<property role="1EzhhJ" value="false" />
@ -2470,6 +2574,13 @@
</node>
</node>
<node concept="3Tm1VV" id="18kNIl1vDQ0" role="1B3o_S" />
<node concept="312cEg" id="5HVB6JRjdpo" role="jymVt">
<property role="TrG5h" value="memo" />
<node concept="3Tm6S6" id="5HVB6JRjdpp" role="1B3o_S" />
<node concept="3uibUv" id="5HVB6JRjdpr" role="1tU5fm">
<ref role="3uigEE" node="6PWFJfG5LMK" resolve="Memo" />
</node>
</node>
</node>
<node concept="312cEu" id="7nPD14OaO1O">
<property role="TrG5h" value="RuleEx" />
@ -7585,5 +7696,37 @@
</node>
<node concept="3Tm1VV" id="5tAk4yVWROV" role="1B3o_S" />
</node>
<node concept="3HP615" id="6PWFJfG5LMK">
<property role="TrG5h" value="Memo" />
<node concept="2tJIrI" id="6PWFJfG5LT0" role="jymVt" />
<node concept="3clFb_" id="6PWFJfG5MGS" role="jymVt">
<property role="TrG5h" value="getOrSetValue" />
<node concept="37vLTG" id="6PWFJfG5Nrn" role="3clF46">
<property role="TrG5h" value="key" />
<node concept="3uibUv" id="6PWFJfG5NBb" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
<node concept="37vLTG" id="6PWFJfG5NL_" role="3clF46">
<property role="TrG5h" value="defaultValue" />
<node concept="3uibUv" id="6PWFJfG5NZT" role="1tU5fm">
<ref role="3uigEE" to="18ew:~Computable" resolve="Computable" />
<node concept="16syzq" id="6PWFJfG5Olr" role="11_B2D">
<ref role="16sUi3" node="6PWFJfG5Oep" resolve="T" />
</node>
</node>
</node>
<node concept="16syzq" id="5HVB6JRjp3C" role="3clF45">
<ref role="16sUi3" node="6PWFJfG5Oep" resolve="T" />
</node>
<node concept="3Tm1VV" id="6PWFJfG5MGV" role="1B3o_S" />
<node concept="3clFbS" id="6PWFJfG5MGW" role="3clF47" />
<node concept="16euLQ" id="6PWFJfG5Oep" role="16eVyc">
<property role="TrG5h" value="T" />
</node>
</node>
<node concept="2tJIrI" id="6PWFJfG5LT5" role="jymVt" />
<node concept="3Tm1VV" id="6PWFJfG5LML" role="1B3o_S" />
</node>
</model>