Skip to content

Commit 8836e53

Browse files
committed
made the type calculation for the FieldSetter in the BuilderAdapter cuzstomizable through the BuilderAdapter itself
1 parent 61e92cd commit 8836e53

File tree

2 files changed

+80
-7
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel

2 files changed

+80
-7
lines changed

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8578,6 +8578,25 @@
85788578
</node>
85798579
</node>
85808580
</node>
8581+
<node concept="13i0hz" id="7SszixhZVRp" role="13h7CS">
8582+
<property role="TrG5h" value="nodeForTypingFieldSetter" />
8583+
<property role="13i0it" value="true" />
8584+
<node concept="3Tm1VV" id="7SszixhZVRq" role="1B3o_S" />
8585+
<node concept="3Tqbb2" id="7SszixhZWjX" role="3clF45" />
8586+
<node concept="3clFbS" id="7SszixhZVRs" role="3clF47">
8587+
<node concept="3clFbF" id="7SszixhZWys" role="3cqZAp">
8588+
<node concept="37vLTw" id="7SszixhZWyr" role="3clFbG">
8589+
<ref role="3cqZAo" node="7SszixhZWr_" resolve="setter" />
8590+
</node>
8591+
</node>
8592+
</node>
8593+
<node concept="37vLTG" id="7SszixhZWr_" role="3clF46">
8594+
<property role="TrG5h" value="setter" />
8595+
<node concept="3Tqbb2" id="7SszixhZWr$" role="1tU5fm">
8596+
<ref role="ehGHo" to="yv47:4ptnK4jbqZG" resolve="FieldSetter" />
8597+
</node>
8598+
</node>
8599+
</node>
85818600
<node concept="13hLZK" id="4ptnK4jbra5" role="13h7CW">
85828601
<node concept="3clFbS" id="4ptnK4jbra6" role="2VODD2" />
85838602
</node>

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

Lines changed: 61 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<import index="5qo5" ref="r:6d93ddb1-b0b0-4eee-8079-51303666672a(org.iets3.core.expr.simpleTypes.structure)" />
2525
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
2626
<import index="hwgx" ref="r:fd2980c8-676c-4b19-b524-18c70e02f8b7(com.mbeddr.core.base.behavior)" implicit="true" />
27+
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
2728
</imports>
2829
<registry>
2930
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -59,6 +60,9 @@
5960
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
6061
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
6162
</concept>
63+
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
64+
<reference id="1144433057691" name="classifier" index="1PxDUh" />
65+
</concept>
6266
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
6367
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
6468
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
@@ -3673,6 +3677,61 @@
36733677
<property role="TrG5h" value="typeof_FieldSetter" />
36743678
<property role="3GE5qa" value="record.builder" />
36753679
<node concept="3clFbS" id="4ptnK4jiabS" role="18ibNy">
3680+
<node concept="3clFbF" id="7Sszixi6bNb" role="3cqZAp">
3681+
<node concept="2OqwBi" id="7Sszixi6bN8" role="3clFbG">
3682+
<node concept="10M0yZ" id="7Sszixi6bN9" role="2Oq$k0">
3683+
<ref role="1PxDUh" to="wyt6:~System" />
3684+
<ref role="3cqZAo" to="wyt6:~System.err" />
3685+
</node>
3686+
<node concept="liA8E" id="7Sszixi6bNa" role="2OqNvi">
3687+
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
3688+
<node concept="Xl_RD" id="7Sszixi6c2s" role="37wK5m">
3689+
<property role="Xl_RC" value="okj" />
3690+
</node>
3691+
</node>
3692+
</node>
3693+
</node>
3694+
<node concept="3cpWs8" id="7SszixhZU64" role="3cqZAp">
3695+
<node concept="3cpWsn" id="7SszixhZU65" role="3cpWs9">
3696+
<property role="TrG5h" value="ba" />
3697+
<node concept="3Tqbb2" id="7SszixhZU1K" role="1tU5fm">
3698+
<ref role="ehGHo" to="yv47:4ptnK4jbr8C" resolve="BuilderAdapter" />
3699+
</node>
3700+
<node concept="2OqwBi" id="7SszixhZU66" role="33vP2m">
3701+
<node concept="1PxgMI" id="7SszixhZU67" role="2Oq$k0">
3702+
<node concept="chp4Y" id="7SszixhZU68" role="3oSUPX">
3703+
<ref role="cht4Q" to="yv47:4ptnK4jbqZj" resolve="BuilderExpression" />
3704+
</node>
3705+
<node concept="2OqwBi" id="7SszixhZU69" role="1m5AlR">
3706+
<node concept="1YBJjd" id="7SszixhZU6a" role="2Oq$k0">
3707+
<ref role="1YBMHb" node="4ptnK4jiabU" resolve="fs" />
3708+
</node>
3709+
<node concept="1mfA1w" id="7SszixhZU6b" role="2OqNvi" />
3710+
</node>
3711+
</node>
3712+
<node concept="3TrEf2" id="7SszixhZU6c" role="2OqNvi">
3713+
<ref role="3Tt5mk" to="yv47:4ptnK4jbqZt" resolve="adapted" />
3714+
</node>
3715+
</node>
3716+
</node>
3717+
</node>
3718+
<node concept="3cpWs8" id="7SszixhZUrv" role="3cqZAp">
3719+
<node concept="3cpWsn" id="7SszixhZUry" role="3cpWs9">
3720+
<property role="TrG5h" value="nodeForTyping" />
3721+
<node concept="3Tqbb2" id="7SszixhZUrt" role="1tU5fm" />
3722+
<node concept="2OqwBi" id="7SszixhZXcU" role="33vP2m">
3723+
<node concept="37vLTw" id="7SszixhZX0U" role="2Oq$k0">
3724+
<ref role="3cqZAo" node="7SszixhZU65" resolve="ba" />
3725+
</node>
3726+
<node concept="2qgKlT" id="7SszixhZXtX" role="2OqNvi">
3727+
<ref role="37wK5l" to="nu60:7SszixhZVRp" resolve="nodeForTypingFieldSetter" />
3728+
<node concept="1YBJjd" id="7SszixhZXH5" role="37wK5m">
3729+
<ref role="1YBMHb" node="4ptnK4jiabU" resolve="fs" />
3730+
</node>
3731+
</node>
3732+
</node>
3733+
</node>
3734+
</node>
36763735
<node concept="nvevp" id="3N0gPb2kZ3u" role="3cqZAp">
36773736
<node concept="3clFbS" id="3N0gPb2kZ3w" role="nvhr_">
36783737
<node concept="1Z5TYs" id="6gVedWjb_78" role="3cqZAp">
@@ -3737,13 +3796,8 @@
37373796
</node>
37383797
</node>
37393798
<node concept="1Z2H0r" id="3N0gPb2kZ4J" role="nvjzm">
3740-
<node concept="2OqwBi" id="3N0gPb2kZdp" role="1Z2MuG">
3741-
<node concept="1YBJjd" id="3N0gPb2kZ5d" role="2Oq$k0">
3742-
<ref role="1YBMHb" node="4ptnK4jiabU" resolve="fs" />
3743-
</node>
3744-
<node concept="3TrEf2" id="3N0gPb2kZwR" role="2OqNvi">
3745-
<ref role="3Tt5mk" to="yv47:4ptnK4jbqZQ" resolve="field" />
3746-
</node>
3799+
<node concept="37vLTw" id="7SszixhZY2j" role="1Z2MuG">
3800+
<ref role="3cqZAo" node="7SszixhZUry" resolve="nodeForTyping" />
37473801
</node>
37483802
</node>
37493803
<node concept="2X1qdy" id="3N0gPb2kZ3$" role="2X0Ygz">

0 commit comments

Comments
 (0)