Skip to content

Commit

Permalink
Merge pull request #652 from IETS3/bugfix/nixsupport_logicops
Browse files Browse the repository at this point in the history 
Update interpreter semantics of && and || logic operators to be consistent with other logic ops
  • Loading branch information
@arimer
arimer authored Jun 7, 2024
2 parents aae73d5 + 2e72b0f commit ac81826
Show file tree
Hide file tree
Showing 15 changed files with 2,077 additions and 515 deletions.
10 changes: 5 additions & 5 deletions code/languages/org.iets3.opensource/.mps/libraries.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<value>
<Library>
<option name="name" value="mbeddr.plattform" />
<option name='path' value='$PROJECT_DIR$/../../../build/dependencies/com.mbeddr.platform' />
</Library>
<option name="path" value="${iets3.github.opensource.home}/build/dependencies/com.mbeddr.platform" />
</Library>
</value>
</entry>
<entry key='org.mpsqa.allInOne'>
<entry key="org.mpsqa.allInOne">
<value>
<Library>
<option name='name' value='org.mpsqa.allInOne' />
<option name='path' value='$PROJECT_DIR$/../../../build/dependencies/org.mpsqa.allInOne' />
<option name="name" value="org.mpsqa.allInOne" />
<option name="path" value="${iets3.github.opensource.home}/build/dependencies/org.mpsqa.allInOne" />
</Library>
</value>
</entry>
Expand Down
1 change: 1 addition & 0 deletions code/languages/org.iets3.opensource/.mps/modules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
<modulePath path="$PROJECT_DIR$/solutions/playground/playground.msd" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/solutions/test.ex.core.expr.genjava/test.ex.core.expr.genjava.msd" folder="expr.genjava" />
<modulePath path="$PROJECT_DIR$/solutions/test.iets3.core.assessment/test.iets3.core.tracequery.msd" folder="trace" />
<modulePath path="$PROJECT_DIR$/solutions/test.nixHandlers.expr.os/test.nixHandlers.expr.os.msd" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/solutions/test.org.iets3.core.comments/test.org.iets3.core.comments.msd" folder="core" />
<modulePath path="$PROJECT_DIR$/solutions/test.ts.components.core/test.ts.components.core.msd" folder="comp" />
<modulePath path="$PROJECT_DIR$/tests/test.in.expr.os/test.in.expr.os.msd" folder="expr.tests" />
Expand Down
34 changes: 34 additions & 0 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14228,5 +14228,39 @@
</node>
</node>
</node>
<node concept="1lYeZD" id="6UwMN4NTt5T">
<property role="3GE5qa" value="primitiveTypes" />
<property role="TrG5h" value="DefaultNixHandlerExtension" />
<ref role="1lYe$Y" node="26cjRACVLVs" resolve="nixHandler" />
<node concept="3Tm1VV" id="6UwMN4NTt5U" role="1B3o_S" />
<node concept="2tJIrI" id="6UwMN4NTt5V" role="jymVt" />
<node concept="3tTeZs" id="6UwMN4NTt5W" role="jymVt">
<property role="3tTeZt" value="activate" />
<ref role="3tTeZr" to="90d:3zLwYDe0CPy" resolve="activate" />
</node>
<node concept="3tTeZs" id="6UwMN4NTt5X" role="jymVt">
<property role="3tTeZt" value="deactivate" />
<ref role="3tTeZr" to="90d:3zLwYDe0BDO" resolve="deactivate" />
</node>
<node concept="2tJIrI" id="6UwMN4NTt5Y" role="jymVt" />
<node concept="q3mfD" id="6UwMN4NTt5Z" role="jymVt">
<property role="TrG5h" value="get" />
<ref role="2VtyIY" to="90d:3zLwYDe0svr" resolve="get" />
<node concept="3Tm1VV" id="6UwMN4NTt61" role="1B3o_S" />
<node concept="3clFbS" id="6UwMN4NTt63" role="3clF47">
<node concept="3cpWs6" id="6UwMN4NTwWM" role="3cqZAp">
<node concept="2ShNRf" id="6UwMN4NTwZb" role="3cqZAk">
<node concept="HV5vD" id="6UwMN4NTUCx" role="2ShVmc">
<ref role="HV5vE" node="26cjRACVR5c" resolve="DefaultNixHandler" />
</node>
</node>
</node>
</node>
<node concept="q3mfm" id="6UwMN4NTt64" role="3clF45">
<ref role="q3mfh" to="90d:3zLwYDe0sv$" />
<ref role="1QQUv3" node="6UwMN4NTt5Z" resolve="get" />
</node>
</node>
</node>
</model>

176 changes: 88 additions & 88 deletions ...3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1873,6 +1873,19 @@
<node concept="3clFbS" id="2hbaSyAVW8v" role="3clF47">
<node concept="3clFbF" id="2hbaSyAVWQK" role="3cqZAp">
<node concept="22lmx$" id="1eut2uSUzlG" role="3clFbG">
<node concept="2OqwBi" id="1eut2uSUzB5" role="3uHU7w">
<node concept="2OqwBi" id="1eut2uSUzB6" role="2Oq$k0">
<node concept="13iPFW" id="1eut2uSUzB7" role="2Oq$k0" />
<node concept="3TrcHB" id="1eut2uSUzB8" role="2OqNvi">
<ref role="3TsBF5" to="i3ya:2hbaSyABN4s" resolve="scaling" />
</node>
</node>
<node concept="21noJN" id="1eut2uSUzB9" role="2OqNvi">
<node concept="21nZrQ" id="1eut2uSUzBa" role="21noJM">
<ref role="21nZrZ" to="i3ya:6DczoUSGcZl" resolve="binary_memory" />
</node>
</node>
</node>
<node concept="22lmx$" id="2hbaSyAVY1S" role="3uHU7B">
<node concept="2OqwBi" id="2hbaSyAVXpv" role="3uHU7B">
<node concept="2OqwBi" id="2hbaSyAVXeP" role="2Oq$k0">
Expand Down Expand Up @@ -1901,19 +1914,6 @@
</node>
</node>
</node>
<node concept="2OqwBi" id="1eut2uSUzB5" role="3uHU7w">
<node concept="2OqwBi" id="1eut2uSUzB6" role="2Oq$k0">
<node concept="13iPFW" id="1eut2uSUzB7" role="2Oq$k0" />
<node concept="3TrcHB" id="1eut2uSUzB8" role="2OqNvi">
<ref role="3TsBF5" to="i3ya:2hbaSyABN4s" resolve="scaling" />
</node>
</node>
<node concept="21noJN" id="1eut2uSUzB9" role="2OqNvi">
<node concept="21nZrQ" id="1eut2uSUzBa" role="21noJM">
<ref role="21nZrZ" to="i3ya:6DczoUSGcZl" resolve="binary_memory" />
</node>
</node>
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -20665,6 +20665,16 @@
</node>
</node>
</node>
<node concept="9aQIb" id="5nqK_jUahoq" role="9aQIa">
<node concept="3clFbS" id="5nqK_jUahor" role="9aQI4">
<node concept="3cpWs6" id="FMy9me2vpp" role="3cqZAp">
<node concept="2YIFZM" id="FMy9me2vpq" role="3cqZAk">
<ref role="37wK5l" node="6RONOaUhCcE" resolve="getInstance" />
<ref role="1Pybhc" node="6RONOaUhCcy" resolve="BinaryMemoryPrefixManager" />
</node>
</node>
</node>
</node>
<node concept="3eNFk2" id="FMy9me2us6" role="3eNLev">
<node concept="3clFbS" id="FMy9me2us8" role="3eOfB_">
<node concept="3cpWs6" id="5nqK_jUahtu" role="3cqZAp">
Expand All @@ -20685,16 +20695,6 @@
</node>
</node>
</node>
<node concept="9aQIb" id="5nqK_jUahoq" role="9aQIa">
<node concept="3clFbS" id="5nqK_jUahor" role="9aQI4">
<node concept="3cpWs6" id="FMy9me2vpp" role="3cqZAp">
<node concept="2YIFZM" id="FMy9me2vpq" role="3cqZAk">
<ref role="37wK5l" node="6RONOaUhCcE" resolve="getInstance" />
<ref role="1Pybhc" node="6RONOaUhCcy" resolve="BinaryMemoryPrefixManager" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3Tm1VV" id="5nqK_jUag0A" role="1B3o_S" />
Expand Down Expand Up @@ -21616,6 +21616,71 @@
</node>
</node>
</node>
<node concept="2fD8I5" id="FMy9me2jvW">
<property role="3GE5qa" value="definition.unit.prefixes" />
<property role="TrG5h" value="BinaryMemoryUnitPrefix" />
<node concept="3Tm1VV" id="FMy9me2jvX" role="1B3o_S" />
<node concept="3clFb_" id="FMy9me2jvY" role="3MN40a">
<property role="TrG5h" value="toString" />
<node concept="17QB3L" id="FMy9me2jvZ" role="3clF45" />
<node concept="3Tm1VV" id="FMy9me2jw0" role="1B3o_S" />
<node concept="3clFbS" id="FMy9me2jw1" role="3clF47">
<node concept="3clFbF" id="FMy9me2jw2" role="3cqZAp">
<node concept="3cpWs3" id="FMy9me2jw3" role="3clFbG">
<node concept="Xl_RD" id="FMy9me2jw4" role="3uHU7w">
<property role="Xl_RC" value=")" />
</node>
<node concept="3cpWs3" id="FMy9me2jw5" role="3uHU7B">
<node concept="3cpWs3" id="FMy9me2jw6" role="3uHU7B">
<node concept="3cpWs3" id="FMy9me2jw7" role="3uHU7B">
<node concept="3cpWs3" id="FMy9me2jw8" role="3uHU7B">
<node concept="2OqwBi" id="FMy9me2jw9" role="3uHU7B">
<node concept="Xjq3P" id="FMy9me2jwa" role="2Oq$k0" />
<node concept="2sxana" id="FMy9me2jwb" role="2OqNvi">
<ref role="2sxfKC" node="2hbaSyB0ITt" resolve="name" />
</node>
</node>
<node concept="Xl_RD" id="FMy9me2jwc" role="3uHU7w">
<property role="Xl_RC" value=" (" />
</node>
</node>
<node concept="2YIFZM" id="FMy9me2jwd" role="3uHU7w">
<ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="2OqwBi" id="FMy9me2jwe" role="37wK5m">
<node concept="2YIFZM" id="FMy9me2jwf" role="2Oq$k0">
<ref role="37wK5l" node="6RONOaUhCcE" resolve="getInstance" />
<ref role="1Pybhc" node="6RONOaUhCcy" resolve="BinaryMemoryPrefixManager" />
</node>
<node concept="liA8E" id="FMy9me2jwg" role="2OqNvi">
<ref role="37wK5l" node="6RONOaUhCcZ" resolve="getBase" />
</node>
</node>
</node>
</node>
<node concept="Xl_RD" id="FMy9me2jwh" role="3uHU7w">
<property role="Xl_RC" value="^" />
</node>
</node>
<node concept="2YIFZM" id="FMy9me2jwi" role="3uHU7w">
<ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="2OqwBi" id="FMy9me2jwj" role="37wK5m">
<node concept="Xjq3P" id="FMy9me2jwk" role="2Oq$k0" />
<node concept="2sxana" id="FMy9me2jwl" role="2OqNvi">
<ref role="2sxfKC" node="2hbaSyB0ITv" resolve="factor" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2pR195" id="FMy9me2jwm" role="2d5$Xr">
<ref role="3uigEE" node="2hbaSyB0HRN" resolve="AbstractUnitPrefix" />
</node>
</node>
<node concept="312cEu" id="FMy9me20la">
<property role="3GE5qa" value="definition.unit.prefixes" />
<property role="TrG5h" value="BinaryIECUnitPrefixManager" />
Expand Down Expand Up @@ -21923,70 +21988,5 @@
</node>
</node>
</node>
<node concept="2fD8I5" id="FMy9me2jvW">
<property role="3GE5qa" value="definition.unit.prefixes" />
<property role="TrG5h" value="BinaryMemoryUnitPrefix" />
<node concept="3Tm1VV" id="FMy9me2jvX" role="1B3o_S" />
<node concept="3clFb_" id="FMy9me2jvY" role="3MN40a">
<property role="TrG5h" value="toString" />
<node concept="17QB3L" id="FMy9me2jvZ" role="3clF45" />
<node concept="3Tm1VV" id="FMy9me2jw0" role="1B3o_S" />
<node concept="3clFbS" id="FMy9me2jw1" role="3clF47">
<node concept="3clFbF" id="FMy9me2jw2" role="3cqZAp">
<node concept="3cpWs3" id="FMy9me2jw3" role="3clFbG">
<node concept="Xl_RD" id="FMy9me2jw4" role="3uHU7w">
<property role="Xl_RC" value=")" />
</node>
<node concept="3cpWs3" id="FMy9me2jw5" role="3uHU7B">
<node concept="3cpWs3" id="FMy9me2jw6" role="3uHU7B">
<node concept="3cpWs3" id="FMy9me2jw7" role="3uHU7B">
<node concept="3cpWs3" id="FMy9me2jw8" role="3uHU7B">
<node concept="2OqwBi" id="FMy9me2jw9" role="3uHU7B">
<node concept="Xjq3P" id="FMy9me2jwa" role="2Oq$k0" />
<node concept="2sxana" id="FMy9me2jwb" role="2OqNvi">
<ref role="2sxfKC" node="2hbaSyB0ITt" resolve="name" />
</node>
</node>
<node concept="Xl_RD" id="FMy9me2jwc" role="3uHU7w">
<property role="Xl_RC" value=" (" />
</node>
</node>
<node concept="2YIFZM" id="FMy9me2jwd" role="3uHU7w">
<ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="2OqwBi" id="FMy9me2jwe" role="37wK5m">
<node concept="2YIFZM" id="FMy9me2jwf" role="2Oq$k0">
<ref role="37wK5l" node="6RONOaUhCcE" resolve="getInstance" />
<ref role="1Pybhc" node="6RONOaUhCcy" resolve="BinaryMemoryPrefixManager" />
</node>
<node concept="liA8E" id="FMy9me2jwg" role="2OqNvi">
<ref role="37wK5l" node="6RONOaUhCcZ" resolve="getBase" />
</node>
</node>
</node>
</node>
<node concept="Xl_RD" id="FMy9me2jwh" role="3uHU7w">
<property role="Xl_RC" value="^" />
</node>
</node>
<node concept="2YIFZM" id="FMy9me2jwi" role="3uHU7w">
<ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="2OqwBi" id="FMy9me2jwj" role="37wK5m">
<node concept="Xjq3P" id="FMy9me2jwk" role="2Oq$k0" />
<node concept="2sxana" id="FMy9me2jwl" role="2OqNvi">
<ref role="2sxfKC" node="2hbaSyB0ITv" resolve="factor" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2pR195" id="FMy9me2jwm" role="2d5$Xr">
<ref role="3uigEE" node="2hbaSyB0HRN" resolve="AbstractUnitPrefix" />
</node>
</node>
</model>

82 changes: 41 additions & 41 deletions ...core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.typesystem.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9544,12 +9544,12 @@
<property role="Xl_RC" value="This unit shadows the already defined unit " />
</node>
<node concept="2OqwBi" id="6b$yEOTmiRw" role="3uHU7w">
<node concept="2qgKlT" id="6b$yEOTmiRy" role="2OqNvi">
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
</node>
<node concept="37vLTw" id="6b$yEOTmiRx" role="2Oq$k0">
<ref role="3cqZAo" node="EsE2hyhvJ4" resolve="it" />
</node>
<node concept="2qgKlT" id="6b$yEOTmiRy" role="2OqNvi">
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
</node>
</node>
</node>
<node concept="1YBJjd" id="6b$yEOTmiR$" role="1urrMF">
Expand Down Expand Up @@ -11037,6 +11037,44 @@
<ref role="1YaFvo" to="i3ya:45a4DYZrLVu" resolve="QuantityExponentType" />
</node>
</node>
<node concept="Q5z_Y" id="3V2fk_c6GqN">
<property role="3GE5qa" value="definition.unit" />
<property role="TrG5h" value="fix_addAllowNameShadowingAnnotation" />
<node concept="Q6JDH" id="3V2fk_c6Gro" role="Q6Id_">
<property role="TrG5h" value="unit" />
<node concept="3Tqbb2" id="3V2fk_c6Gry" role="Q6QK4">
<ref role="ehGHo" to="i3ya:7eOyx9r3jsZ" resolve="Unit" />
</node>
</node>
<node concept="Q5ZZ6" id="3V2fk_c6GqO" role="Q6x$H">
<node concept="3clFbS" id="3V2fk_c6GqP" role="2VODD2">
<node concept="3clFbF" id="3V2fk_ca32d" role="3cqZAp">
<node concept="2OqwBi" id="3V2fk_ca4bB" role="3clFbG">
<node concept="2OqwBi" id="3V2fk_ca3oG" role="2Oq$k0">
<node concept="QwW4i" id="3V2fk_ca32c" role="2Oq$k0">
<ref role="QwW4h" node="3V2fk_c6Gro" resolve="unit" />
</node>
<node concept="3CFZ6_" id="3V2fk_ca3UP" role="2OqNvi">
<node concept="3CFYIy" id="3V2fk_ca3Zo" role="3CFYIz">
<ref role="3CFYIx" to="i3ya:3V2fk_c6FtV" resolve="AllowNameShadowingAnnotation" />
</node>
</node>
</node>
<node concept="2DeJnY" id="3V2fk_ca4qM" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="QznSV" id="4iGVAJE9IwK" role="QzAvj">
<node concept="3clFbS" id="4iGVAJE9IwL" role="2VODD2">
<node concept="3clFbF" id="4iGVAJE9IB2" role="3cqZAp">
<node concept="Xl_RD" id="4iGVAJE9IB1" role="3clFbG">
<property role="Xl_RC" value="Allow Name Shadowing" />
</node>
</node>
</node>
</node>
</node>
<node concept="1YbPZF" id="76ZhK6XYufT">
<property role="TrG5h" value="typeof_TaggedExpression" />
<node concept="3clFbS" id="76ZhK6XYufU" role="18ibNy">
Expand Down Expand Up @@ -11431,43 +11469,5 @@
</node>
</node>
</node>
<node concept="Q5z_Y" id="3V2fk_c6GqN">
<property role="3GE5qa" value="definition.unit" />
<property role="TrG5h" value="fix_addAllowNameShadowingAnnotation" />
<node concept="Q6JDH" id="3V2fk_c6Gro" role="Q6Id_">
<property role="TrG5h" value="unit" />
<node concept="3Tqbb2" id="3V2fk_c6Gry" role="Q6QK4">
<ref role="ehGHo" to="i3ya:7eOyx9r3jsZ" resolve="Unit" />
</node>
</node>
<node concept="Q5ZZ6" id="3V2fk_c6GqO" role="Q6x$H">
<node concept="3clFbS" id="3V2fk_c6GqP" role="2VODD2">
<node concept="3clFbF" id="3V2fk_ca32d" role="3cqZAp">
<node concept="2OqwBi" id="3V2fk_ca4bB" role="3clFbG">
<node concept="2OqwBi" id="3V2fk_ca3oG" role="2Oq$k0">
<node concept="QwW4i" id="3V2fk_ca32c" role="2Oq$k0">
<ref role="QwW4h" node="3V2fk_c6Gro" resolve="unit" />
</node>
<node concept="3CFZ6_" id="3V2fk_ca3UP" role="2OqNvi">
<node concept="3CFYIy" id="3V2fk_ca3Zo" role="3CFYIz">
<ref role="3CFYIx" to="i3ya:3V2fk_c6FtV" resolve="AllowNameShadowingAnnotation" />
</node>
</node>
</node>
<node concept="2DeJnY" id="3V2fk_ca4qM" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="QznSV" id="4iGVAJE9IwK" role="QzAvj">
<node concept="3clFbS" id="4iGVAJE9IwL" role="2VODD2">
<node concept="3clFbF" id="4iGVAJE9IB2" role="3cqZAp">
<node concept="Xl_RD" id="4iGVAJE9IB1" role="3clFbG">
<property role="Xl_RC" value="Allow Name Shadowing" />
</node>
</node>
</node>
</node>
</node>
</model>

Loading

0 comments on commit ac81826

Please sign in to comment.