Skip to content

Commit

Permalink
Merge branch 'master' into bugfix/stringLiteral#545
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexanderpann
alexanderpann authored Jun 14, 2022
2 parents 5241445 + 948a73c commit 8b63442
Show file tree
Hide file tree
Showing 16 changed files with 1,989 additions and 420 deletions.
20 changes: 18 additions & 2 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,15 @@
<concept id="1164833692343" name="jetbrains.mps.lang.editor.structure.CellMenuPart_PropertyValues" flags="ng" index="PvTIS">
<child id="1164833692344" name="valuesFunction" index="PvTIR" />
</concept>
<concept id="1078938745671" name="jetbrains.mps.lang.editor.structure.EditorComponentDeclaration" flags="ig" index="PKFIW" />
<concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
<reference id="1078939183255" name="editorComponent" index="PMmxG" />
</concept>
<concept id="1235728439575" name="jetbrains.mps.lang.editor.structure.BaseLineCell" flags="ln" index="2R9Tw8" />
<concept id="1149850725784" name="jetbrains.mps.lang.editor.structure.CellModel_AttributedNodeCell" flags="ng" index="2SsqMj" />
<concept id="1164914519156" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReplaceNode_CustomNodeConcept" flags="ng" index="UkePV">
<reference id="1164914727930" name="replacementConcept" index="Ul1FP" />
</concept>
<concept id="1186402211651" name="jetbrains.mps.lang.editor.structure.StyleSheet" flags="ng" index="V5hpn">
<child id="1186402402630" name="styles" index="V601i" />
</concept>
Expand Down Expand Up @@ -2659,8 +2663,8 @@
<ref role="1XX52x" to="hm2y:2U5Q01UkDMQ" resolve="OneOfTarget" />
<node concept="3EZMnI" id="2U5Q01UkDNw" role="2wV5jI">
<node concept="2iRfu4" id="2U5Q01UkDNx" role="2iSdaV" />
<node concept="3F0ifn" id="2U5Q01UkDNs" role="3EZMnx">
<property role="3F0ifm" value="oneOf" />
<node concept="PMmxH" id="12bsjhgd0e2" role="3EZMnx">
<ref role="PMmxG" node="12bsjhgd0dR" resolve="OpAlias" />
</node>
<node concept="3F0ifn" id="2U5Q01UkDNJ" role="3EZMnx">
<property role="3F0ifm" value="[" />
Expand Down Expand Up @@ -6576,5 +6580,17 @@
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
</node>
</node>
<node concept="PKFIW" id="12bsjhgd0dR">
<property role="TrG5h" value="OpAlias" />
<ref role="1XX52x" to="hm2y:7NJy08a3O9a" resolve="IDotTarget" />
<node concept="PMmxH" id="12bsjhgd0dT" role="2wV5jI">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
<node concept="OXEIz" id="12bsjhgd0dW" role="P5bDN">
<node concept="UkePV" id="12bsjhgd0dZ" role="OY2wv">
<ref role="Ul1FP" to="hm2y:7NJy08a3O9a" resolve="IDotTarget" />
</node>
</node>
</node>
</node>
</model>

499 changes: 455 additions & 44 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
View file

Large diffs are not rendered by default.

62 changes: 62 additions & 0 deletions ...nguages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/actions.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<child id="1068498886297" name="rValue" index="37vLTx" />
<child id="1068498886295" name="lValue" index="37vLTJ" />
</concept>
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
<child id="1197027771414" name="operand" index="2Oq$k0" />
<child id="1197027833540" name="operation" index="2OqNvi" />
Expand Down Expand Up @@ -51,10 +52,14 @@
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
<child id="1068581517665" name="statement" index="3cqZAp" />
</concept>
<concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6" />
<concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
</concept>
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
<concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
<reference id="5497648299878491909" name="baseVariableDeclaration" index="1M0zk5" />
</concept>
</language>
<language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
<concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
Expand Down Expand Up @@ -97,6 +102,7 @@
<concept id="1158701162220" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction" flags="in" index="37Y9Zx" />
<concept id="5584396657084912703" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction_NewNode" flags="nn" index="1r4Lsj" />
<concept id="5584396657084920670" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction_EnclosingNode" flags="nn" index="1r4N1M" />
<concept id="5584396657084920413" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction_SampleNode" flags="nn" index="1r4N5L" />
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
Expand All @@ -109,6 +115,14 @@
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
</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="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
</concept>
Expand Down Expand Up @@ -420,6 +434,54 @@
</node>
</node>
</node>
<node concept="37WvkG" id="4l_LUjibjsh" role="37WGs$">
<ref role="37XkoT" to="700h:6zmBjqUjnKs" resolve="OneArgCollectionOp" />
<node concept="37Y9Zx" id="4l_LUjibjsi" role="37ZfLb">
<node concept="3clFbS" id="4l_LUjibjsj" role="2VODD2">
<node concept="3clFbJ" id="4l_LUjibEwm" role="3cqZAp">
<node concept="3clFbS" id="4l_LUjibEwo" role="3clFbx">
<node concept="3cpWs6" id="4l_LUjibELa" role="3cqZAp" />
</node>
<node concept="2OqwBi" id="4l_LUjibEC3" role="3clFbw">
<node concept="1r4Lsj" id="4l_LUjickKD" role="2Oq$k0" />
<node concept="1mIQ4w" id="4l_LUjibEIz" role="2OqNvi">
<node concept="chp4Y" id="4l_LUjibEIV" role="cj9EA">
<ref role="cht4Q" to="700h:oG0sI$GQkF" resolve="TwoArgPredicateCollectionOp" />
</node>
</node>
</node>
</node>
<node concept="Jncv_" id="4l_LUjibjut" role="3cqZAp">
<ref role="JncvD" to="700h:6zmBjqUjnKs" resolve="OneArgCollectionOp" />
<node concept="1r4N5L" id="4l_LUjibjuM" role="JncvB" />
<node concept="3clFbS" id="4l_LUjibjuv" role="Jncv$">
<node concept="3clFbF" id="4l_LUjibjvx" role="3cqZAp">
<node concept="37vLTI" id="4l_LUjibke4" role="3clFbG">
<node concept="2OqwBi" id="4l_LUjibksF" role="37vLTx">
<node concept="Jnkvi" id="4l_LUjibkeC" role="2Oq$k0">
<ref role="1M0zk5" node="4l_LUjibjuw" resolve="oneArgOp" />
</node>
<node concept="3TrEf2" id="4l_LUjibkOP" role="2OqNvi">
<ref role="3Tt5mk" to="700h:6zmBjqUjnKt" resolve="arg" />
</node>
</node>
<node concept="2OqwBi" id="4l_LUjibjFr" role="37vLTJ">
<node concept="1r4Lsj" id="4l_LUjibjvQ" role="2Oq$k0" />
<node concept="3TrEf2" id="4l_LUjibk2J" role="2OqNvi">
<ref role="3Tt5mk" to="700h:6zmBjqUjnKt" resolve="arg" />
</node>
</node>
</node>
</node>
</node>
<node concept="JncvC" id="4l_LUjibjuw" role="JncvA">
<property role="TrG5h" value="oneArgOp" />
<node concept="2jxLKc" id="4l_LUjibjux" role="1tU5fm" />
</node>
</node>
</node>
</node>
</node>
</node>
</model>

40 changes: 22 additions & 18 deletions ...anguages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<import index="oq0c" ref="r:6c6155f0-4bbe-4af5-8c26-244d570e21e4(org.iets3.core.expr.base.plugin)" />
<import index="700h" ref="r:61b1de80-490d-4fee-8e95-b956503290e9(org.iets3.core.expr.collections.structure)" />
<import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
<import index="buwp" ref="r:8405f486-53b5-4fe6-af3e-7f68358bd631(org.iets3.core.expr.base.editor)" implicit="true" />
<import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" implicit="true" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
Expand Down Expand Up @@ -423,11 +424,8 @@
<property role="3GE5qa" value="" />
<ref role="1XX52x" to="700h:6zmBjqUjnKs" resolve="OneArgCollectionOp" />
<node concept="3EZMnI" id="6zmBjqUjnOV" role="2wV5jI">
<node concept="PMmxH" id="6zmBjqUjnOW" role="3EZMnx">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
<node concept="11LMrY" id="49WTic8ec1k" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="PMmxH" id="4l_LUjie3jr" role="3EZMnx">
<ref role="PMmxG" to="buwp:12bsjhgd0dR" resolve="OpAlias" />
</node>
<node concept="3F0ifn" id="6zmBjqUjnOX" role="3EZMnx">
<property role="3F0ifm" value="(" />
Expand Down Expand Up @@ -817,8 +815,8 @@
<ref role="1XX52x" to="700h:6IBT1wT$hPp" resolve="IMapOneArgOp" />
<node concept="3EZMnI" id="7kYh9Ws$z$o" role="2wV5jI">
<node concept="2iRfu4" id="7kYh9Ws$z$p" role="2iSdaV" />
<node concept="PMmxH" id="7kYh9Ws$z$m" role="3EZMnx">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
<node concept="PMmxH" id="4l_LUjie3iJ" role="3EZMnx">
<ref role="PMmxG" to="buwp:12bsjhgd0dR" resolve="OpAlias" />
</node>
<node concept="3F0ifn" id="7kYh9Ws$z$x" role="3EZMnx">
<property role="3F0ifm" value="(" />
Expand Down Expand Up @@ -887,8 +885,8 @@
<ref role="1XX52x" to="700h:4_KMC82H1yT" resolve="IListOneArgOp" />
<node concept="3EZMnI" id="1RHynufnBTp" role="2wV5jI">
<node concept="l2Vlx" id="NE1gl4Nw13" role="2iSdaV" />
<node concept="PMmxH" id="1RHynufnBTr" role="3EZMnx">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
<node concept="PMmxH" id="4l_LUjie3hU" role="3EZMnx">
<ref role="PMmxG" to="buwp:12bsjhgd0dR" resolve="OpAlias" />
</node>
<node concept="3F0ifn" id="1RHynufnBTs" role="3EZMnx">
<property role="3F0ifm" value="(" />
Expand Down Expand Up @@ -1065,9 +1063,15 @@
<node concept="24kQdi" id="3tudP_AOMNH">
<ref role="1XX52x" to="700h:3tudP_AOMNf" resolve="UpToTarget" />
<node concept="3EZMnI" id="3tudP_AOMNJ" role="2wV5jI">
<node concept="3F0ifn" id="3tudP_AOMNQ" role="3EZMnx">
<property role="3F0ifm" value="upto(" />
<node concept="11LMrY" id="3tudP_AOMSn" role="3F10Kt">
<node concept="PMmxH" id="4l_LUjie3jL" role="3EZMnx">
<ref role="PMmxG" to="buwp:12bsjhgd0dR" resolve="OpAlias" />
</node>
<node concept="3F0ifn" id="4l_LUjib1e6" role="3EZMnx">
<property role="3F0ifm" value="(" />
<node concept="11L4FC" id="4l_LUjib1ee" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="11LMrY" id="4l_LUjib1ej" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
Expand Down Expand Up @@ -1101,8 +1105,8 @@
<ref role="1XX52x" to="700h:4hLehKTZXcg" resolve="FoldOp" />
<node concept="3EZMnI" id="4hLehKU05ea" role="2wV5jI">
<node concept="l2Vlx" id="6vzDuv94evh" role="2iSdaV" />
<node concept="PMmxH" id="4hLehKU05e7" role="3EZMnx">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
<node concept="PMmxH" id="4l_LUjie49l" role="3EZMnx">
<ref role="PMmxG" to="buwp:12bsjhgd0dR" resolve="OpAlias" />
</node>
<node concept="3F0ifn" id="4hLehKU05ep" role="3EZMnx">
<property role="3F0ifm" value="(" />
Expand Down Expand Up @@ -1152,8 +1156,8 @@
<ref role="1XX52x" to="700h:thkha3aNEl" resolve="ISetOneArgOp" />
<node concept="3EZMnI" id="thkha3aNE$" role="2wV5jI">
<node concept="2iRfu4" id="thkha3aNE_" role="2iSdaV" />
<node concept="PMmxH" id="thkha3aNEA" role="3EZMnx">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
<node concept="PMmxH" id="4l_LUjie3j5" role="3EZMnx">
<ref role="PMmxG" to="buwp:12bsjhgd0dR" resolve="OpAlias" />
</node>
<node concept="3F0ifn" id="thkha3aNEB" role="3EZMnx">
<property role="3F0ifm" value="(" />
Expand Down Expand Up @@ -1187,8 +1191,8 @@
<ref role="1XX52x" to="700h:LrvgQhjFyf" resolve="ListInsertOp" />
<node concept="3EZMnI" id="LrvgQhkLIP" role="2wV5jI">
<node concept="2iRfu4" id="LrvgQhkLIQ" role="2iSdaV" />
<node concept="PMmxH" id="LrvgQhkLIR" role="3EZMnx">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
<node concept="PMmxH" id="4l_LUjie3im" role="3EZMnx">
<ref role="PMmxG" to="buwp:12bsjhgd0dR" resolve="OpAlias" />
</node>
<node concept="3F0ifn" id="LrvgQhkLIS" role="3EZMnx">
<property role="3F0ifm" value="(" />
Expand Down
52 changes: 52 additions & 0 deletions ...languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/intentions.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,18 @@
</concept>
</language>
<language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions">
<concept id="3618415754251190715" name="jetbrains.mps.lang.intentions.structure.ChildFilterFunction" flags="in" index="zTJ1e" />
<concept id="3618415754251192144" name="jetbrains.mps.lang.intentions.structure.ConceptFunctionParameter_childNode" flags="nn" index="zTJq_" />
<concept id="1192794744107" name="jetbrains.mps.lang.intentions.structure.IntentionDeclaration" flags="ig" index="2S6QgY" />
<concept id="1192794782375" name="jetbrains.mps.lang.intentions.structure.DescriptionBlock" flags="in" index="2S6ZIM" />
<concept id="1192795771125" name="jetbrains.mps.lang.intentions.structure.IsApplicableBlock" flags="in" index="2SaL7w" />
<concept id="1192795911897" name="jetbrains.mps.lang.intentions.structure.ExecuteBlock" flags="in" index="2Sbjvc" />
<concept id="1192796902958" name="jetbrains.mps.lang.intentions.structure.ConceptFunctionParameter_node" flags="nn" index="2Sf5sV" />
<concept id="2522969319638091381" name="jetbrains.mps.lang.intentions.structure.BaseIntentionDeclaration" flags="ig" index="2ZfUlf">
<property id="2522969319638091386" name="isAvailableInChildNodes" index="2ZfUl0" />
<reference id="2522969319638198290" name="forConcept" index="2ZfgGC" />
<child id="2522969319638198291" name="executeFunction" index="2ZfgGD" />
<child id="2522969319638093994" name="childFilterFunction" index="2ZfVeg" />
<child id="2522969319638093995" name="isApplicableFunction" index="2ZfVeh" />
<child id="2522969319638093993" name="descriptionFunction" index="2ZfVej" />
</concept>
Expand Down Expand Up @@ -184,6 +188,7 @@
<node concept="2S6QgY" id="49WTic8ewUk">
<property role="TrG5h" value="transformIntoExplicitVersion" />
<property role="3GE5qa" value="lambda" />
<property role="2ZfUl0" value="true" />
<ref role="2ZfgGC" to="zzzn:6zmBjqUm7MQ" resolve="ShortLambdaExpression" />
<node concept="2S6ZIM" id="49WTic8ewUl" role="2ZfVej">
<node concept="3clFbS" id="49WTic8ewUm" role="2VODD2">
Expand Down Expand Up @@ -215,10 +220,34 @@
<node concept="1SWQZ3" id="4zsmO3Lu8z7" role="lGtFl">
<property role="1SWRpm" value="EXPRESSIONS" />
</node>
<node concept="zTJ1e" id="2dLHlXdFg$l" role="2ZfVeg">
<node concept="3clFbS" id="2dLHlXdFg$m" role="2VODD2">
<node concept="3clFbF" id="2dLHlXdFgCY" role="3cqZAp">
<node concept="2OqwBi" id="2dLHlXdFv3t" role="3clFbG">
<node concept="2OqwBi" id="2dLHlXdFrcU" role="2Oq$k0">
<node concept="zTJq_" id="2dLHlXdFr3W" role="2Oq$k0" />
<node concept="2Xjw5R" id="2dLHlXdFrkf" role="2OqNvi">
<node concept="1xMEDy" id="2dLHlXdFrkh" role="1xVPHs">
<node concept="chp4Y" id="2dLHlXdFuSC" role="ri$Ld">
<ref role="cht4Q" to="zzzn:2D48zR6a1ez" resolve="ILambdaLike" />
</node>
</node>
</node>
</node>
<node concept="1mIQ4w" id="2dLHlXdFvf2" role="2OqNvi">
<node concept="chp4Y" id="2dLHlXdFvlu" role="cj9EA">
<ref role="cht4Q" to="zzzn:6zmBjqUm7MQ" resolve="ShortLambdaExpression" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2S6QgY" id="49WTic8eH3P">
<property role="TrG5h" value="transformIntoShortVersion" />
<property role="3GE5qa" value="lambda" />
<property role="2ZfUl0" value="true" />
<ref role="2ZfgGC" to="zzzn:6zmBjqUkws6" resolve="LambdaExpression" />
<node concept="2S6ZIM" id="49WTic8eH3Q" role="2ZfVej">
<node concept="3clFbS" id="49WTic8eH3R" role="2VODD2">
Expand Down Expand Up @@ -474,6 +503,29 @@
<node concept="1SWQZ3" id="4zsmO3Lu7Ji" role="lGtFl">
<property role="1SWRpm" value="EXPRESSIONS" />
</node>
<node concept="zTJ1e" id="2dLHlXdFhkr" role="2ZfVeg">
<node concept="3clFbS" id="2dLHlXdFhks" role="2VODD2">
<node concept="3clFbF" id="2dLHlXdFwvZ" role="3cqZAp">
<node concept="2OqwBi" id="2dLHlXdFww1" role="3clFbG">
<node concept="2OqwBi" id="2dLHlXdFww2" role="2Oq$k0">
<node concept="zTJq_" id="2dLHlXdFww3" role="2Oq$k0" />
<node concept="2Xjw5R" id="2dLHlXdFww4" role="2OqNvi">
<node concept="1xMEDy" id="2dLHlXdFww5" role="1xVPHs">
<node concept="chp4Y" id="2dLHlXdFww6" role="ri$Ld">
<ref role="cht4Q" to="zzzn:2D48zR6a1ez" resolve="ILambdaLike" />
</node>
</node>
</node>
</node>
<node concept="1mIQ4w" id="2dLHlXdFww7" role="2OqNvi">
<node concept="chp4Y" id="2dLHlXdFww8" role="cj9EA">
<ref role="cht4Q" to="zzzn:6zmBjqUkws6" resolve="LambdaExpression" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2S6QgY" id="6iqfHNCkuGe">
<property role="TrG5h" value="wrapWithBlock" />
Expand Down
Loading

0 comments on commit 8b63442

Please sign in to comment.