Skip to content

Commit

Permalink
Merge pull request #592 from IETS3/bugfix/enumLiteralChecks
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexanderpann
alexanderpann authored Aug 25, 2022
2 parents b81a08d + 061ba2c commit 7f47230
Show file tree
Hide file tree
Showing 4 changed files with 409 additions and 0 deletions.
236 changes: 236 additions & 0 deletions ...languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/typesystem.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
<import index="nu60" ref="r:cfd59c48-ecc8-4b0c-8ae8-6d876c46ebbb(org.iets3.core.expr.toplevel.behavior)" />
<import index="7gi8" ref="r:7010ed35-a675-4b23-b299-e2e6344a71a0(org.iets3.core.expr.path.typesystem)" />
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
<import index="5qo5" ref="r:6d93ddb1-b0b0-4eee-8079-51303666672a(org.iets3.core.expr.simpleTypes.structure)" />
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
<import index="hwgx" ref="r:fd2980c8-676c-4b19-b524-18c70e02f8b7(com.mbeddr.core.base.behavior)" implicit="true" />
</imports>
Expand Down Expand Up @@ -66,6 +68,7 @@
</concept>
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
<child id="5680397130376446158" name="type" index="1tU5fm" />
</concept>
Expand Down Expand Up @@ -119,6 +122,9 @@
<child id="1144231399730" name="condition" index="1Dwp0S" />
<child id="1144231408325" name="iteration" index="1Dwrff" />
</concept>
<concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
<reference id="5497648299878491909" name="baseVariableDeclaration" index="1M0zk5" />
</concept>
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
<child id="8356039341262087992" name="line" index="1aUNEU" />
</concept>
Expand Down Expand Up @@ -273,6 +279,14 @@
<concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
<reference id="1145383142433" name="elementConcept" index="2I9WkF" />
</concept>
<concept id="1883223317721008708" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfStatement" flags="nn" index="Jncv_">
<reference id="1883223317721008712" name="nodeConcept" index="JncvD" />
<child id="1883223317721008709" name="body" index="Jncv$" />
<child id="1883223317721008711" name="variable" index="JncvA" />
<child id="1883223317721008710" name="nodeExpression" index="JncvB" />
</concept>
<concept id="1883223317721008713" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVariable" flags="ng" index="JncvC" />
<concept id="1883223317721107059" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVarReference" flags="nn" index="Jnkvi" />
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
<concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
Expand Down Expand Up @@ -336,6 +350,8 @@
<concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
<child id="1226511765987" name="elementType" index="2hN53Y" />
</concept>
<concept id="1226516258405" name="jetbrains.mps.baseLanguage.collections.structure.HashSetCreator" flags="nn" index="2i4dXS" />
<concept id="5699792037748043353" name="jetbrains.mps.baseLanguage.collections.structure.TestAddElementOperation" flags="nn" index="2oyXjL" />
<concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
<concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
<child id="1153944400369" name="variable" index="2Gsz3X" />
Expand All @@ -346,6 +362,9 @@
<reference id="1153944258490" name="variable" index="2Gs0qQ" />
</concept>
<concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
<concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
<child id="1237721435807" name="elementType" index="HW$YZ" />
</concept>
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
Expand Down Expand Up @@ -4029,5 +4048,222 @@
<ref role="1YaFvo" to="yv47:c36CPsxOj8" resolve="EnumIndexOp" />
</node>
</node>
<node concept="18kY7G" id="bAwKVX3rBj">
<property role="TrG5h" value="check_EnumDeclaration" />
<property role="3GE5qa" value="enum" />
<node concept="3clFbS" id="bAwKVX3rBk" role="18ibNy">
<node concept="3clFbJ" id="bAwKVX3sq$" role="3cqZAp">
<node concept="3fqX7Q" id="bAwKVX3tpr" role="3clFbw">
<node concept="2OqwBi" id="bAwKVX3tpt" role="3fr31v">
<node concept="1YBJjd" id="bAwKVX3tpu" role="2Oq$k0">
<ref role="1YBMHb" node="bAwKVX3rBm" resolve="enumDeclaration" />
</node>
<node concept="2qgKlT" id="bAwKVX3tpv" role="2OqNvi">
<ref role="37wK5l" to="nu60:3Y6fbK16sYK" resolve="isValued" />
</node>
</node>
</node>
<node concept="3clFbS" id="bAwKVX3sqA" role="3clFbx">
<node concept="3cpWs6" id="bAwKVX3tpW" role="3cqZAp" />
</node>
</node>
<node concept="3clFbH" id="Y$AzCx89nj" role="3cqZAp" />
<node concept="3cpWs8" id="Y$AzCx8F15" role="3cqZAp">
<node concept="3cpWsn" id="Y$AzCx8F18" role="3cpWs9">
<property role="TrG5h" value="stringValues" />
<node concept="2hMVRd" id="Y$AzCx8F11" role="1tU5fm">
<node concept="17QB3L" id="Y$AzCx8F4N" role="2hN53Y" />
</node>
<node concept="2ShNRf" id="Y$AzCx8F5p" role="33vP2m">
<node concept="2i4dXS" id="Y$AzCx8FbZ" role="2ShVmc">
<node concept="17QB3L" id="Y$AzCx8Fih" role="HW$YZ" />
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="Y$AzCx8LME" role="3cqZAp">
<node concept="3cpWsn" id="Y$AzCx8LMH" role="3cpWs9">
<property role="TrG5h" value="enumValues" />
<node concept="2hMVRd" id="Y$AzCx8LMA" role="1tU5fm">
<node concept="3Tqbb2" id="Y$AzCx8LQu" role="2hN53Y" />
</node>
<node concept="2ShNRf" id="Y$AzCx8LR1" role="33vP2m">
<node concept="2i4dXS" id="Y$AzCx8LXB" role="2ShVmc">
<node concept="3Tqbb2" id="Y$AzCx8M3E" role="HW$YZ" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="Y$AzCx8eZH" role="3cqZAp" />
<node concept="3clFbF" id="Y$AzCx89uw" role="3cqZAp">
<node concept="2OqwBi" id="Y$AzCx8cSN" role="3clFbG">
<node concept="2OqwBi" id="Y$AzCx89QI" role="2Oq$k0">
<node concept="1YBJjd" id="Y$AzCx89uu" role="2Oq$k0">
<ref role="1YBMHb" node="bAwKVX3rBm" resolve="enumDeclaration" />
</node>
<node concept="3Tsc0h" id="Y$AzCx8aQu" role="2OqNvi">
<ref role="3TtcxE" to="yv47:67Y8mp$DMVO" resolve="literals" />
</node>
</node>
<node concept="2es0OD" id="Y$AzCx8eUc" role="2OqNvi">
<node concept="1bVj0M" id="Y$AzCx8eUe" role="23t8la">
<node concept="3clFbS" id="Y$AzCx8eUf" role="1bW5cS">
<node concept="3clFbH" id="Y$AzCx8y$0" role="3cqZAp" />
<node concept="Jncv_" id="Y$AzCx8nah" role="3cqZAp">
<ref role="JncvD" to="hm2y:7halHeUzscN" resolve="PrimitiveLiteral" />
<node concept="2OqwBi" id="Y$AzCx8nqC" role="JncvB">
<node concept="37vLTw" id="Y$AzCx8ndN" role="2Oq$k0">
<ref role="3cqZAo" node="Y$AzCx8eUg" resolve="it" />
</node>
<node concept="3TrEf2" id="Y$AzCx8nH7" role="2OqNvi">
<ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
</node>
</node>
<node concept="3clFbS" id="Y$AzCx8nal" role="Jncv$">
<node concept="3clFbJ" id="Y$AzCx8uPa" role="3cqZAp">
<node concept="3clFbS" id="Y$AzCx8uPc" role="3clFbx">
<node concept="3SKdUt" id="Y$AzCx8xqX" role="3cqZAp">
<node concept="1PaTwC" id="Y$AzCx8xqY" role="1aUNEU">
<node concept="3oM_SD" id="Y$AzCx8xvA" role="1PaTwD">
<property role="3oM_SC" value="booleans" />
</node>
<node concept="3oM_SD" id="Y$AzCx8xLK" role="1PaTwD">
<property role="3oM_SC" value="are" />
</node>
<node concept="3oM_SD" id="Y$AzCx8xLN" role="1PaTwD">
<property role="3oM_SC" value="allowed" />
</node>
<node concept="3oM_SD" id="Y$AzCx8xLR" role="1PaTwD">
<property role="3oM_SC" value="to" />
</node>
<node concept="3oM_SD" id="Y$AzCx8xLW" role="1PaTwD">
<property role="3oM_SC" value="have" />
</node>
<node concept="3oM_SD" id="Y$AzCx8yfz" role="1PaTwD">
<property role="3oM_SC" value="same" />
</node>
<node concept="3oM_SD" id="Y$AzCx8yfE" role="1PaTwD">
<property role="3oM_SC" value="values" />
</node>
</node>
</node>
<node concept="3cpWs6" id="Y$AzCx8x27" role="3cqZAp" />
</node>
<node concept="2OqwBi" id="Y$AzCx8voB" role="3clFbw">
<node concept="Jnkvi" id="Y$AzCx8uTW" role="2Oq$k0">
<ref role="1M0zk5" node="Y$AzCx8nan" resolve="currentPrimitiveLit" />
</node>
<node concept="1mIQ4w" id="Y$AzCx8vJo" role="2OqNvi">
<node concept="chp4Y" id="Y$AzCx8vTz" role="cj9EA">
<ref role="cht4Q" to="5qo5:6sdnDbSlcHm" resolve="BooleanLiteral" />
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="Y$AzCx8rF9" role="3cqZAp">
<node concept="3cpWsn" id="Y$AzCx8rFa" role="3cpWs9">
<property role="TrG5h" value="stringValue" />
<node concept="17QB3L" id="Y$AzCx8r$D" role="1tU5fm" />
<node concept="2OqwBi" id="Y$AzCx8rFb" role="33vP2m">
<node concept="Jnkvi" id="Y$AzCx8rFc" role="2Oq$k0">
<ref role="1M0zk5" node="Y$AzCx8nan" resolve="currentPrimitiveLit" />
</node>
<node concept="2qgKlT" id="Y$AzCx8rFd" role="2OqNvi">
<ref role="37wK5l" to="pbu6:2q1ydqQjSPO" resolve="getStringValue" />
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="Y$AzCx8FFh" role="3cqZAp">
<node concept="3clFbS" id="Y$AzCx8FFj" role="3clFbx">
<node concept="2MkqsV" id="bAwKVX3LP6" role="3cqZAp">
<node concept="Xl_RD" id="bAwKVX3M18" role="2MkJ7o">
<property role="Xl_RC" value="Duplicated value" />
</node>
<node concept="Jnkvi" id="Y$AzCx8Lwx" role="1urrMF">
<ref role="1M0zk5" node="Y$AzCx8nan" resolve="currentPrimitiveLit" />
</node>
</node>
</node>
<node concept="3fqX7Q" id="Y$AzCx8G2E" role="3clFbw">
<node concept="2OqwBi" id="Y$AzCx8GUA" role="3fr31v">
<node concept="37vLTw" id="Y$AzCx8G7v" role="2Oq$k0">
<ref role="3cqZAo" node="Y$AzCx8F18" resolve="stringValues" />
</node>
<node concept="2oyXjL" id="Y$AzCx8W$X" role="2OqNvi">
<node concept="37vLTw" id="Y$AzCx8W$Z" role="25WWJ7">
<ref role="3cqZAo" node="Y$AzCx8rFa" resolve="stringValue" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="JncvC" id="Y$AzCx8nan" role="JncvA">
<property role="TrG5h" value="currentPrimitiveLit" />
<node concept="2jxLKc" id="Y$AzCx8nao" role="1tU5fm" />
</node>
</node>
<node concept="Jncv_" id="Y$AzCx8yMK" role="3cqZAp">
<ref role="JncvD" to="yv47:67Y8mp$DNr5" resolve="EnumLiteralRef" />
<node concept="2OqwBi" id="Y$AzCx8zn5" role="JncvB">
<node concept="37vLTw" id="Y$AzCx8z89" role="2Oq$k0">
<ref role="3cqZAo" node="Y$AzCx8eUg" resolve="it" />
</node>
<node concept="3TrEf2" id="Y$AzCx8zFa" role="2OqNvi">
<ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
</node>
</node>
<node concept="3clFbS" id="Y$AzCx8yMO" role="Jncv$">
<node concept="3clFbJ" id="Y$AzCx8Num" role="3cqZAp">
<node concept="3fqX7Q" id="Y$AzCx8NyS" role="3clFbw">
<node concept="2OqwBi" id="Y$AzCx8OCD" role="3fr31v">
<node concept="37vLTw" id="Y$AzCx8NBu" role="2Oq$k0">
<ref role="3cqZAo" node="Y$AzCx8LMH" resolve="enumValues" />
</node>
<node concept="2oyXjL" id="Y$AzCx8X8v" role="2OqNvi">
<node concept="2OqwBi" id="Y$AzCx8X8x" role="25WWJ7">
<node concept="Jnkvi" id="Y$AzCx8X8y" role="2Oq$k0">
<ref role="1M0zk5" node="Y$AzCx8yMQ" resolve="enumLiteralRef" />
</node>
<node concept="3TrEf2" id="Y$AzCx8X8z" role="2OqNvi">
<ref role="3Tt5mk" to="yv47:67Y8mp$DNs9" resolve="literal" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbS" id="Y$AzCx8Nuo" role="3clFbx">
<node concept="2MkqsV" id="Y$AzCx8Qqy" role="3cqZAp">
<node concept="Xl_RD" id="Y$AzCx8Qqz" role="2MkJ7o">
<property role="Xl_RC" value="Duplicated value" />
</node>
<node concept="Jnkvi" id="Y$AzCx8Qq$" role="1urrMF">
<ref role="1M0zk5" node="Y$AzCx8yMQ" resolve="enumLiteralRef" />
</node>
</node>
</node>
</node>
</node>
<node concept="JncvC" id="Y$AzCx8yMQ" role="JncvA">
<property role="TrG5h" value="enumLiteralRef" />
<node concept="2jxLKc" id="Y$AzCx8yMR" role="1tU5fm" />
</node>
</node>
</node>
<node concept="Rh6nW" id="Y$AzCx8eUg" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="Y$AzCx8eUh" role="1tU5fm" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1YaCAy" id="bAwKVX3rBm" role="1YuTPh">
<property role="TrG5h" value="enumDeclaration" />
<ref role="1YaFvo" to="yv47:67Y8mp$DMUI" resolve="EnumDeclaration" />
</node>
</node>
</model>

2 changes: 2 additions & 0 deletions ....iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<dependency reexport="false">726886d1-ef90-4249-a08f-1e3ec23a7113(com.mbeddr.mpsutil.traceExplorer)</dependency>
<dependency reexport="false">28583149-5b6e-4663-9c02-b9a8fa3cb099(com.mbeddr.mpsutil.contextactions.runtime)</dependency>
<dependency reexport="false">dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)</dependency>
<dependency reexport="false">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>
</dependencies>
<languageVersions>
<language slang="l:677f00fb-4488-405e-9885-abb75d472fd1:com.mbeddr.mpsutil.contextactions" version="0" />
Expand Down Expand Up @@ -133,6 +134,7 @@
<module reference="2f7e2e35-6e74-4c43-9fa5-2465d68f5996(org.iets3.core.expr.collections)" version="5" />
<module reference="9464fa06-5ab9-409b-9274-64ab29588457(org.iets3.core.expr.lambda)" version="0" />
<module reference="f3eafff0-30d2-46d6-9150-f0f3b880ce27(org.iets3.core.expr.path)" version="0" />
<module reference="6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)" version="1" />
<module reference="71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)" version="2" />
</dependencyVersions>
<extendedLanguages>
Expand Down
5 changes: 5 additions & 0 deletions ...ensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3698,6 +3698,11 @@
<ref role="3bR37D" to="al5i:7vUP_qcXuSh" resolve="com.mbeddr.mpsutil.contextactions.runtime" />
</node>
</node>
<node concept="1SiIV0" id="Y$AzCx9ivQ" role="3bR37C">
<node concept="3bR9La" id="Y$AzCx9ivR" role="1SiIV1">
<ref role="3bR37D" node="5wLtKNeSRQd" resolve="org.iets3.core.expr.simpleTypes" />
</node>
</node>
</node>
<node concept="1E1JtD" id="5a_u3OzLedQ" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down
Loading

0 comments on commit 7f47230

Please sign in to comment.