Skip to content

Commit ee2d723

Browse files
mgronovermgronover
committed
fixed type inference of FieldSetter to allow override
1 parent 684a820 commit ee2d723

File tree

2 files changed

+66
-40
lines changed
  • code/languages/org.iets3.opensource/languages

2 files changed

+66
-40
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/typesystem.mps‎

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,9 @@
256256
<child id="1180636770616" name="createdType" index="3zrR0E" />
257257
</concept>
258258
<concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
259-
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
259+
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
260+
<property id="1238684351431" name="asCast" index="1BlNFB" />
261+
</concept>
260262
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
261263
<reference id="1138405853777" name="concept" index="ehGHo" />
262264
</concept>
@@ -1116,26 +1118,50 @@
11161118
<property role="TrG5h" value="typeof_IFunctionCall" />
11171119
<property role="3GE5qa" value="function" />
11181120
<node concept="3clFbS" id="49WTic8gvz4" role="18ibNy">
1119-
<node concept="1Z5TYs" id="49WTic8gv_C" role="3cqZAp">
1120-
<node concept="mw_s8" id="49WTic8gv_T" role="1ZfhKB">
1121-
<node concept="1Z2H0r" id="49WTic8gv_P" role="mwGJk">
1122-
<node concept="2OqwBi" id="49WTic8gvBy" role="1Z2MuG">
1123-
<node concept="1YBJjd" id="49WTic8gvAd" role="2Oq$k0">
1124-
<ref role="1YBMHb" node="49WTic8gvz6" resolve="ifc" />
1121+
<node concept="nvevp" id="2hrkfft7i1p" role="3cqZAp">
1122+
<node concept="3clFbS" id="2hrkfft7i1r" role="nvhr_">
1123+
<node concept="1Z5TYs" id="2hrkfft7jFT" role="3cqZAp">
1124+
<node concept="mw_s8" id="2hrkfft7jGa" role="1ZfhKB">
1125+
<node concept="2YIFZM" id="2hrkfft7jHT" role="mwGJk">
1126+
<ref role="37wK5l" to="oq0c:4$QBvTqTZCM" resolve="override" />
1127+
<ref role="1Pybhc" to="oq0c:4$QBvTqTPch" resolve="TOF" />
1128+
<node concept="1YBJjd" id="2hrkfft7jJ7" role="37wK5m">
1129+
<ref role="1YBMHb" node="49WTic8gvz6" resolve="ifc" />
1130+
</node>
1131+
<node concept="1PxgMI" id="2hrkfft7lqZ" role="37wK5m">
1132+
<property role="1BlNFB" value="true" />
1133+
<node concept="chp4Y" id="2hrkfft7lx3" role="3oSUPX">
1134+
<ref role="cht4Q" to="hm2y:6sdnDbSlaok" resolve="Type" />
1135+
</node>
1136+
<node concept="2X3wrD" id="2hrkfft7ksj" role="1m5AlR">
1137+
<ref role="2X3Bk0" node="2hrkfft7i1v" resolve="type" />
1138+
</node>
1139+
</node>
11251140
</node>
1126-
<node concept="3TrEf2" id="49WTic8gvEq" role="2OqNvi">
1127-
<ref role="3Tt5mk" to="zzzn:49WTic8gvyC" resolve="function" />
1141+
</node>
1142+
<node concept="mw_s8" id="2hrkfft7jFW" role="1ZfhK$">
1143+
<node concept="1Z2H0r" id="2hrkfft7ju$" role="mwGJk">
1144+
<node concept="1YBJjd" id="2hrkfft7jwu" role="1Z2MuG">
1145+
<ref role="1YBMHb" node="49WTic8gvz6" resolve="ifc" />
1146+
</node>
11281147
</node>
11291148
</node>
11301149
</node>
11311150
</node>
1132-
<node concept="mw_s8" id="49WTic8gv_F" role="1ZfhK$">
1133-
<node concept="1Z2H0r" id="49WTic8gvzg" role="mwGJk">
1134-
<node concept="1YBJjd" id="49WTic8gvzG" role="1Z2MuG">
1151+
<node concept="1Z2H0r" id="2hrkfft7i34" role="nvjzm">
1152+
<node concept="2OqwBi" id="2hrkfft7ieh" role="1Z2MuG">
1153+
<node concept="1YBJjd" id="2hrkfft7i3w" role="2Oq$k0">
11351154
<ref role="1YBMHb" node="49WTic8gvz6" resolve="ifc" />
11361155
</node>
1156+
<node concept="3TrEf2" id="2hrkfft7jle" role="2OqNvi">
1157+
<ref role="3Tt5mk" to="zzzn:49WTic8gvyC" resolve="function" />
1158+
</node>
11371159
</node>
11381160
</node>
1161+
<node concept="2X1qdy" id="2hrkfft7i1v" role="2X0Ygz">
1162+
<property role="TrG5h" value="type" />
1163+
<node concept="2jxLKc" id="2hrkfft7i1w" role="1tU5fm" />
1164+
</node>
11391165
</node>
11401166
<node concept="3clFbJ" id="49WTic8gvFK" role="3cqZAp">
11411167
<node concept="3clFbS" id="49WTic8gvFM" role="3clFbx">

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/typesystem.mps‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,9 +1686,6 @@
16861686
<node concept="Xl_RD" id="3Y6fbK16uBK" role="2MkJ7o">
16871687
<property role="Xl_RC" value="non-valued enums cannot have values" />
16881688
</node>
1689-
<node concept="1YBJjd" id="3Y6fbK16uBL" role="1urrMF">
1690-
<ref role="1YBMHb" node="3Y6fbK16s$S" resolve="enumLiteral" />
1691-
</node>
16921689
<node concept="3Cnw8n" id="7Xf3oOM1CAA" role="1urrFz">
16931690
<ref role="QpYPw" node="7Xf3oOM1$AS" resolve="specifyValueType" />
16941691
<node concept="3CnSsL" id="7Xf3oOM1CDL" role="3Coj4f">
@@ -1703,6 +1700,9 @@
17031700
</node>
17041701
</node>
17051702
</node>
1703+
<node concept="1YBJjd" id="3Y6fbK16uBL" role="1urrMF">
1704+
<ref role="1YBMHb" node="3Y6fbK16s$S" resolve="enumLiteral" />
1705+
</node>
17061706
</node>
17071707
</node>
17081708
</node>
@@ -1900,6 +1900,14 @@
19001900
</node>
19011901
<node concept="3clFbF" id="TcaAhOKEh1" role="3cqZAp">
19021902
<node concept="37vLTI" id="TcaAhOKFoD" role="3clFbG">
1903+
<node concept="2OqwBi" id="7Xf3oOLUxLR" role="37vLTJ">
1904+
<node concept="QwW4i" id="7Xf3oOM1AHa" role="2Oq$k0">
1905+
<ref role="QwW4h" node="7Xf3oOM1AEM" resolve="enumDeclaration" />
1906+
</node>
1907+
<node concept="3TrEf2" id="7Xf3oOM1Bb9" role="2OqNvi">
1908+
<ref role="3Tt5mk" to="yv47:2MpPNJw_h8y" resolve="type" />
1909+
</node>
1910+
</node>
19031911
<node concept="3K4zz7" id="TcaAhOKGcY" role="37vLTx">
19041912
<node concept="37vLTw" id="TcaAhOKGln" role="3K4E3e">
19051913
<ref role="3cqZAo" node="TcaAhOKhYS" resolve="superType" />
@@ -1918,14 +1926,6 @@
19181926
<node concept="3x8VRR" id="TcaAhOKFNH" role="2OqNvi" />
19191927
</node>
19201928
</node>
1921-
<node concept="2OqwBi" id="7Xf3oOLUxLR" role="37vLTJ">
1922-
<node concept="QwW4i" id="7Xf3oOM1AHa" role="2Oq$k0">
1923-
<ref role="QwW4h" node="7Xf3oOM1AEM" resolve="enumDeclaration" />
1924-
</node>
1925-
<node concept="3TrEf2" id="7Xf3oOM1Bb9" role="2OqNvi">
1926-
<ref role="3Tt5mk" to="yv47:2MpPNJw_h8y" resolve="type" />
1927-
</node>
1928-
</node>
19291929
</node>
19301930
</node>
19311931
<node concept="3clFbH" id="TcaAhOKEgt" role="3cqZAp" />
@@ -3675,20 +3675,6 @@
36753675
<node concept="3clFbS" id="4ptnK4jiabS" role="18ibNy">
36763676
<node concept="nvevp" id="3N0gPb2kZ3u" role="3cqZAp">
36773677
<node concept="3clFbS" id="3N0gPb2kZ3w" role="nvhr_">
3678-
<node concept="1Z5TYs" id="6gVedWjb_78" role="3cqZAp">
3679-
<node concept="mw_s8" id="6gVedWjb_fi" role="1ZfhKB">
3680-
<node concept="2X3wrD" id="6gVedWjb_fg" role="mwGJk">
3681-
<ref role="2X3Bk0" node="3N0gPb2kZ3$" resolve="orgFieldType" />
3682-
</node>
3683-
</node>
3684-
<node concept="mw_s8" id="6gVedWjb_7b" role="1ZfhK$">
3685-
<node concept="1Z2H0r" id="6gVedWjb$Yl" role="mwGJk">
3686-
<node concept="1YBJjd" id="6gVedWjb_06" role="1Z2MuG">
3687-
<ref role="1YBMHb" node="4ptnK4jiabU" resolve="fs" />
3688-
</node>
3689-
</node>
3690-
</node>
3691-
</node>
36923678
<node concept="1ZxtTE" id="kxHAhaMUEK" role="3cqZAp">
36933679
<property role="TrG5h" value="realFieldType" />
36943680
</node>
@@ -3716,6 +3702,20 @@
37163702
</node>
37173703
</node>
37183704
</node>
3705+
<node concept="1Z5TYs" id="2hrkfft7f_W" role="3cqZAp">
3706+
<node concept="mw_s8" id="2hrkfft7hbs" role="1ZfhKB">
3707+
<node concept="1Z$b5t" id="2hrkfft7hbq" role="mwGJk">
3708+
<ref role="1Z$eMM" node="kxHAhaMUEK" resolve="realFieldType" />
3709+
</node>
3710+
</node>
3711+
<node concept="mw_s8" id="2hrkfft7f_Z" role="1ZfhK$">
3712+
<node concept="1Z2H0r" id="2hrkfft7f5i" role="mwGJk">
3713+
<node concept="1YBJjd" id="2hrkfft7fge" role="1Z2MuG">
3714+
<ref role="1YBMHb" node="4ptnK4jiabU" resolve="fs" />
3715+
</node>
3716+
</node>
3717+
</node>
3718+
</node>
37193719
<node concept="1ZobV4" id="4ptnK4jiaV0" role="3cqZAp">
37203720
<node concept="mw_s8" id="3N0gPb2kZPF" role="1ZfhKB">
37213721
<node concept="1Z$b5t" id="3N0gPb2kZP_" role="mwGJk">
@@ -4097,6 +4097,9 @@
40974097
<property role="3GE5qa" value="enum" />
40984098
<node concept="3clFbS" id="bAwKVX3rBk" role="18ibNy">
40994099
<node concept="3clFbJ" id="bAwKVX3sq$" role="3cqZAp">
4100+
<node concept="3clFbS" id="bAwKVX3sqA" role="3clFbx">
4101+
<node concept="3cpWs6" id="bAwKVX3tpW" role="3cqZAp" />
4102+
</node>
41004103
<node concept="22lmx$" id="1WjCak8S51q" role="3clFbw">
41014104
<node concept="3fqX7Q" id="1WjCak8S6Da" role="3uHU7w">
41024105
<node concept="2OqwBi" id="1WjCak8S6Dc" role="3fr31v">
@@ -4119,9 +4122,6 @@
41194122
</node>
41204123
</node>
41214124
</node>
4122-
<node concept="3clFbS" id="bAwKVX3sqA" role="3clFbx">
4123-
<node concept="3cpWs6" id="bAwKVX3tpW" role="3cqZAp" />
4124-
</node>
41254125
</node>
41264126
<node concept="3clFbH" id="Y$AzCx89nj" role="3cqZAp" />
41274127
<node concept="3cpWs8" id="Y$AzCx8F15" role="3cqZAp">

0 commit comments

Comments
 (0)