Skip to content

Commit 312b08e

Browse files
psuzzipsuzzi
authored
Merge pull request #811 from IETS3/bugfix/702
Add interpreter for makeTime
2 parents 7961b38 + be75732 commit 312b08e

File tree

2 files changed

+202
-0
lines changed
  • code/languages/org.iets3.opensource

2 files changed

+202
-0
lines changed

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.interpreter/models/plugin.mps‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3313,6 +3313,94 @@
33133313
</node>
33143314
</node>
33153315
</node>
3316+
<node concept="qq9P1" id="2upbyyo12sC" role="qq9xR">
3317+
<property role="2TnfIJ" value="true" />
3318+
<ref role="qq9wM" to="mi3w:3HiHZey9lU5" resolve="MakeTime" />
3319+
<node concept="3dA_Gj" id="2upbyyo1eAZ" role="3vQZUl">
3320+
<node concept="9aQIb" id="2upbyyo1eB1" role="3vcmbn">
3321+
<node concept="3clFbS" id="2upbyyo1eB3" role="9aQI4">
3322+
<node concept="3cpWs8" id="2upbyyo1wC3" role="3cqZAp">
3323+
<node concept="3cpWsn" id="2upbyyo1wC4" role="3cpWs9">
3324+
<property role="TrG5h" value="h" />
3325+
<node concept="3uibUv" id="2upbyyo1uA8" role="1tU5fm">
3326+
<ref role="3uigEE" to="xlxw:~BigInteger" resolve="BigInteger" />
3327+
</node>
3328+
<node concept="10QFUN" id="2upbyyo1NfX" role="33vP2m">
3329+
<node concept="3uibUv" id="2upbyyo1NfZ" role="10QFUM">
3330+
<ref role="3uigEE" to="xlxw:~BigInteger" resolve="BigInteger" />
3331+
</node>
3332+
<node concept="rqRoa" id="2upbyyo1Wuz" role="10QFUP">
3333+
<ref role="rqRob" to="mi3w:3HiHZey9lU6" resolve="hourExpr" />
3334+
</node>
3335+
</node>
3336+
</node>
3337+
</node>
3338+
<node concept="3cpWs8" id="2upbyyo1CYU" role="3cqZAp">
3339+
<node concept="3cpWsn" id="2upbyyo1CYV" role="3cpWs9">
3340+
<property role="TrG5h" value="m" />
3341+
<node concept="3uibUv" id="2upbyyo1CYW" role="1tU5fm">
3342+
<ref role="3uigEE" to="xlxw:~BigInteger" resolve="BigInteger" />
3343+
</node>
3344+
<node concept="10QFUN" id="2upbyyo1QkA" role="33vP2m">
3345+
<node concept="rqRoa" id="2upbyyo1WHP" role="10QFUP">
3346+
<ref role="rqRob" to="mi3w:3HiHZey9lU7" resolve="minutesExpr" />
3347+
</node>
3348+
<node concept="3uibUv" id="2upbyyo1QkC" role="10QFUM">
3349+
<ref role="3uigEE" to="xlxw:~BigInteger" resolve="BigInteger" />
3350+
</node>
3351+
</node>
3352+
</node>
3353+
</node>
3354+
<node concept="3cpWs8" id="2upbyyo1JlU" role="3cqZAp">
3355+
<node concept="3cpWsn" id="2upbyyo1JlV" role="3cpWs9">
3356+
<property role="TrG5h" value="s" />
3357+
<node concept="3uibUv" id="2upbyyo1JlW" role="1tU5fm">
3358+
<ref role="3uigEE" to="xlxw:~BigInteger" resolve="BigInteger" />
3359+
</node>
3360+
<node concept="10QFUN" id="2upbyyo1ToS" role="33vP2m">
3361+
<node concept="rqRoa" id="2upbyyo1WWp" role="10QFUP">
3362+
<ref role="rqRob" to="mi3w:3HiHZeybRMz" resolve="secondsExpr" />
3363+
</node>
3364+
<node concept="3uibUv" id="2upbyyo1ToU" role="10QFUM">
3365+
<ref role="3uigEE" to="xlxw:~BigInteger" resolve="BigInteger" />
3366+
</node>
3367+
</node>
3368+
</node>
3369+
</node>
3370+
<node concept="3cpWs6" id="2upbyyo1u$X" role="3cqZAp">
3371+
<node concept="2YIFZM" id="2upbyyo1rye" role="3cqZAk">
3372+
<ref role="1Pybhc" to="28m1:~LocalTime" resolve="LocalTime" />
3373+
<ref role="37wK5l" to="28m1:~LocalTime.of(int,int,int)" resolve="of" />
3374+
<node concept="2OqwBi" id="2upbyyo1XrZ" role="37wK5m">
3375+
<node concept="37vLTw" id="2upbyyo1wC6" role="2Oq$k0">
3376+
<ref role="3cqZAo" node="2upbyyo1wC4" resolve="h" />
3377+
</node>
3378+
<node concept="liA8E" id="2upbyyo1Yeu" role="2OqNvi">
3379+
<ref role="37wK5l" to="xlxw:~BigInteger.intValue()" resolve="intValue" />
3380+
</node>
3381+
</node>
3382+
<node concept="2OqwBi" id="2upbyyo21$T" role="37wK5m">
3383+
<node concept="37vLTw" id="2upbyyo21jn" role="2Oq$k0">
3384+
<ref role="3cqZAo" node="2upbyyo1CYV" resolve="m" />
3385+
</node>
3386+
<node concept="liA8E" id="2upbyyo22nM" role="2OqNvi">
3387+
<ref role="37wK5l" to="xlxw:~BigInteger.intValue()" resolve="intValue" />
3388+
</node>
3389+
</node>
3390+
<node concept="2OqwBi" id="2upbyyo25MO" role="37wK5m">
3391+
<node concept="37vLTw" id="2upbyyo25x0" role="2Oq$k0">
3392+
<ref role="3cqZAo" node="2upbyyo1JlV" resolve="s" />
3393+
</node>
3394+
<node concept="liA8E" id="2upbyyo2662" role="2OqNvi">
3395+
<ref role="37wK5l" to="xlxw:~BigInteger.intValue()" resolve="intValue" />
3396+
</node>
3397+
</node>
3398+
</node>
3399+
</node>
3400+
</node>
3401+
</node>
3402+
</node>
3403+
</node>
33163404
<node concept="qq9P1" id="64dkh69UXvQ" role="qq9xR">
33173405
<property role="2TnfIJ" value="true" />
33183406
<ref role="qq9wM" to="mi3w:1RwPUjzgIEp" resolve="EarliestExpression" />

‎code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8048,6 +8048,120 @@
80488048
</node>
80498049
</node>
80508050
</node>
8051+
<node concept="2zPypq" id="3XIe3ZPnQvf" role="_iOnB">
8052+
<property role="TrG5h" value="madeTime2" />
8053+
<property role="0Rz4W" value="-1376704304" />
8054+
<node concept="2ptY_Q" id="3XIe3ZPnQvg" role="2zPyp_">
8055+
<node concept="30bXRB" id="3XIe3ZPnQvh" role="2ptY_P">
8056+
<property role="30bXRw" value="23" />
8057+
</node>
8058+
<node concept="30bXRB" id="3XIe3ZPnQvi" role="2ptY_O">
8059+
<property role="30bXRw" value="00" />
8060+
</node>
8061+
<node concept="30bXRB" id="3XIe3ZPnQvj" role="2pvsHg">
8062+
<property role="30bXRw" value="30" />
8063+
</node>
8064+
</node>
8065+
</node>
8066+
<node concept="_fkuM" id="3XIe3ZPk7t_" role="_iOnB">
8067+
<property role="TrG5h" value="makeTime" />
8068+
<node concept="_fkuZ" id="3XIe3ZPlZeV" role="_fkp5">
8069+
<node concept="_fku$" id="3XIe3ZPlZeW" role="_fkur" />
8070+
<node concept="30cPrO" id="3XIe3ZPlZfK" role="_fkuY">
8071+
<node concept="_emDc" id="3XIe3ZPlZjn" role="30dEs_">
8072+
<ref role="_emDf" node="3HiHZeyaf1r" resolve="typed" />
8073+
</node>
8074+
<node concept="_emDc" id="3XIe3ZPlZfv" role="30dEsF">
8075+
<ref role="_emDf" node="3HiHZeyanun" resolve="madeTime" />
8076+
</node>
8077+
</node>
8078+
<node concept="2vmpnb" id="3XIe3ZPlZn1" role="_fkuS" />
8079+
</node>
8080+
<node concept="_fkuZ" id="3XIe3ZPnQQk" role="_fkp5">
8081+
<node concept="_fku$" id="3XIe3ZPnQQl" role="_fkur" />
8082+
<node concept="30cPrR" id="3XIe3ZPnQW3" role="_fkuY">
8083+
<node concept="_emDc" id="3XIe3ZPnQQo" role="30dEsF">
8084+
<ref role="_emDf" node="3HiHZeyanun" resolve="madeTime" />
8085+
</node>
8086+
<node concept="_emDc" id="3XIe3ZPnQQn" role="30dEs_">
8087+
<ref role="_emDf" node="3XIe3ZPnQvf" resolve="madeTime2" />
8088+
</node>
8089+
</node>
8090+
<node concept="2vmpnb" id="3XIe3ZPnQQp" role="_fkuS" />
8091+
</node>
8092+
<node concept="_fkuZ" id="3XIe3ZPrLRi" role="_fkp5">
8093+
<node concept="_fku$" id="3XIe3ZPrLRj" role="_fkur" />
8094+
<node concept="30cPrO" id="3XIe3ZPrLSo" role="_fkuY">
8095+
<node concept="_emDc" id="3XIe3ZPrLRl" role="30dEsF">
8096+
<ref role="_emDf" node="3HiHZeyanun" resolve="madeTime" />
8097+
</node>
8098+
<node concept="_emDc" id="3XIe3ZPrLRm" role="30dEs_">
8099+
<ref role="_emDf" node="3XIe3ZPnQvf" resolve="madeTime2" />
8100+
</node>
8101+
</node>
8102+
<node concept="2vmpn$" id="3XIe3ZPrLY$" role="_fkuS" />
8103+
</node>
8104+
<node concept="_fkuZ" id="3XIe3ZPpIqN" role="_fkp5">
8105+
<node concept="_fku$" id="3XIe3ZPpIqO" role="_fkur" />
8106+
<node concept="30d6GJ" id="3XIe3ZPpIrJ" role="_fkuY">
8107+
<node concept="_emDc" id="3XIe3ZPpIwQ" role="30dEs_">
8108+
<ref role="_emDf" node="3XIe3ZPnQvf" resolve="madeTime2" />
8109+
</node>
8110+
<node concept="_emDc" id="3XIe3ZPpIrx" role="30dEsF">
8111+
<ref role="_emDf" node="3HiHZeyanun" resolve="madeTime" />
8112+
</node>
8113+
</node>
8114+
<node concept="2vmpnb" id="3XIe3ZPpI_Y" role="_fkuS" />
8115+
</node>
8116+
<node concept="_fkuZ" id="3XIe3ZPk7R_" role="_fkp5">
8117+
<node concept="_fku$" id="3XIe3ZPk7RA" role="_fkur" />
8118+
<node concept="1QScDb" id="3XIe3ZPk7S7" role="_fkuY">
8119+
<node concept="2poLz3" id="3XIe3ZPk7Tt" role="1QScD9" />
8120+
<node concept="_emDc" id="3XIe3ZPk7RS" role="30czhm">
8121+
<ref role="_emDf" node="3HiHZeyanun" resolve="madeTime" />
8122+
</node>
8123+
</node>
8124+
<node concept="30bXRB" id="3XIe3ZPk7VA" role="_fkuS">
8125+
<property role="30bXRw" value="23" />
8126+
</node>
8127+
</node>
8128+
<node concept="_fkuZ" id="3XIe3ZPk7VX" role="_fkp5">
8129+
<node concept="_fku$" id="3XIe3ZPk7VY" role="_fkur" />
8130+
<node concept="1QScDb" id="3XIe3ZPk7Wy" role="_fkuY">
8131+
<node concept="2poMIs" id="3XIe3ZPk7YR" role="1QScD9" />
8132+
<node concept="_emDc" id="3XIe3ZPk7Wj" role="30czhm">
8133+
<ref role="_emDf" node="3HiHZeyanun" resolve="madeTime" />
8134+
</node>
8135+
</node>
8136+
<node concept="30bXRB" id="3XIe3ZPk81N" role="_fkuS">
8137+
<property role="30bXRw" value="00" />
8138+
</node>
8139+
</node>
8140+
<node concept="_fkuZ" id="3XIe3ZPk82g" role="_fkp5">
8141+
<node concept="_fku$" id="3XIe3ZPk82h" role="_fkur" />
8142+
<node concept="1QScDb" id="3XIe3ZPk82V" role="_fkuY">
8143+
<node concept="2poLxH" id="3XIe3ZPk863" role="1QScD9" />
8144+
<node concept="_emDc" id="3XIe3ZPk82G" role="30czhm">
8145+
<ref role="_emDf" node="3HiHZeyanun" resolve="madeTime" />
8146+
</node>
8147+
</node>
8148+
<node concept="30bXRB" id="3XIe3ZPk89y" role="_fkuS">
8149+
<property role="30bXRw" value="00" />
8150+
</node>
8151+
</node>
8152+
<node concept="_fkuZ" id="3XIe3ZPrLNu" role="_fkp5">
8153+
<node concept="_fku$" id="3XIe3ZPrLNv" role="_fkur" />
8154+
<node concept="1QScDb" id="3XIe3ZPrLNw" role="_fkuY">
8155+
<node concept="2poLxH" id="3XIe3ZPrLNx" role="1QScD9" />
8156+
<node concept="_emDc" id="3XIe3ZPrLNy" role="30czhm">
8157+
<ref role="_emDf" node="3XIe3ZPnQvf" resolve="madeTime2" />
8158+
</node>
8159+
</node>
8160+
<node concept="30bXRB" id="3XIe3ZPrLNz" role="_fkuS">
8161+
<property role="30bXRw" value="30" />
8162+
</node>
8163+
</node>
8164+
</node>
80518165
<node concept="_fkuM" id="3HiHZey9Yyz" role="_iOnB">
80528166
<property role="TrG5h" value="valuOps" />
80538167
<node concept="_fkuZ" id="3HiHZeycr_X" role="_fkp5">

0 commit comments

Comments
 (0)