Skip to content

Commit

Permalink
Merge pull request #561 from IETS3/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 948a73c + 8b63442 commit 39f18a7
Show file tree
Hide file tree
Showing 2 changed files with 198 additions and 14 deletions.
171 changes: 164 additions & 7 deletions ...ges/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/constraints.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<model ref="r:e3651d26-951a-4ffc-9443-e8b8de452a77(org.iets3.core.expr.simpleTypes.constraints)">
<persistence version="9" />
<languages>
<use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="6" />
<devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
</languages>
<imports>
Expand All @@ -27,6 +28,12 @@
<concept id="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
<child id="8118189177080264854" name="alternative" index="nSUat" />
</concept>
<concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
<child id="1239714902950" name="expression" index="2$L3a6" />
</concept>
<concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
<child id="1154032183016" name="body" index="2LFqv$" />
</concept>
<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 All @@ -45,6 +52,8 @@
<reference id="1144433057691" name="classifier" index="1PxDUh" />
</concept>
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
<concept id="1070534555686" name="jetbrains.mps.baseLanguage.structure.CharType" flags="in" index="10Pfzv" />
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
<property id="1176718929932" name="isFinal" index="3TUv4t" />
<child id="1068431790190" name="initializer" index="33vP2m" />
Expand All @@ -64,6 +73,7 @@
<child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
<child id="1068580123160" name="condition" index="3clFbw" />
<child id="1068580123161" name="ifTrue" index="3clFbx" />
<child id="1206060520071" name="elsifClauses" index="3eNLev" />
</concept>
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
<child id="1068581517665" name="statement" index="3cqZAp" />
Expand All @@ -81,6 +91,14 @@
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
</concept>
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
<concept id="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
<child id="1206060619838" name="condition" index="3eO9$A" />
<child id="1206060644605" name="statementList" index="3eOfB_" />
</concept>
<concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
<child id="1081516765348" name="expression" index="3fr31v" />
</concept>
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
Expand All @@ -92,10 +110,18 @@
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
</concept>
<concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
<concept id="3093926081414150598" name="jetbrains.mps.baseLanguage.structure.MultipleCatchClause" flags="ng" index="3uVAMA">
<child id="8276990574895933173" name="catchBody" index="1zc67A" />
<child id="8276990574895933172" name="throwable" index="1zc67B" />
</concept>
<concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
<child id="1144230900587" name="variable" index="1Duv9x" />
</concept>
<concept id="1144231330558" name="jetbrains.mps.baseLanguage.structure.ForStatement" flags="nn" index="1Dw8fO">
<child id="1144231399730" name="condition" index="1Dwp0S" />
<child id="1144231408325" name="iteration" index="1Dwrff" />
</concept>
<concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
<child id="8276990574886367510" name="catchClause" index="1zxBo5" />
<child id="8276990574886367508" name="body" index="1zxBo7" />
Expand Down Expand Up @@ -214,16 +240,147 @@
<ref role="EomxK" to="5qo5:4rZeNQ6OYRb" resolve="value" />
<node concept="QB0g5" id="4rZeNQ6PjRv" role="QCWH9">
<node concept="3clFbS" id="4rZeNQ6PjRw" role="2VODD2">
<node concept="3clFbF" id="4fD91B__35L" role="3cqZAp">
<node concept="2OqwBi" id="4fD91B__1ih" role="3clFbG">
<node concept="1Wqviy" id="4fD91B__03P" role="2Oq$k0" />
<node concept="liA8E" id="4fD91B__22w" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
<node concept="Xl_RD" id="4fD91B__95R" role="37wK5m">
<property role="Xl_RC" value="(\\\\.|[^\\\\\&quot;])*" />
<node concept="3clFbJ" id="3VHXNElXe15" role="3cqZAp">
<node concept="3clFbS" id="3VHXNElXe17" role="3clFbx">
<node concept="3cpWs6" id="3VHXNElXgJv" role="3cqZAp">
<node concept="3clFbT" id="3VHXNElXlZ8" role="3cqZAk">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
<node concept="3clFbC" id="3VHXNElXfPN" role="3clFbw">
<node concept="3cmrfG" id="3VHXNElXgEV" role="3uHU7w">
<property role="3cmrfH" value="0" />
</node>
<node concept="2OqwBi" id="3VHXNElXeEQ" role="3uHU7B">
<node concept="1Wqviy" id="3VHXNElXe7s" role="2Oq$k0" />
<node concept="liA8E" id="3VHXNElXeXz" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="1pqGdr9hXPJ" role="3cqZAp">
<node concept="3cpWsn" id="1pqGdr9hXPM" role="3cpWs9">
<property role="TrG5h" value="isEscapeMode" />
<node concept="10P_77" id="1pqGdr9hXPH" role="1tU5fm" />
<node concept="3clFbT" id="1pqGdr9hY52" role="33vP2m" />
</node>
</node>
<node concept="1Dw8fO" id="1pqGdr9hTYM" role="3cqZAp">
<node concept="3clFbS" id="1pqGdr9hTYO" role="2LFqv$">
<node concept="3cpWs8" id="1pqGdr9hYNd" role="3cqZAp">
<node concept="3cpWsn" id="1pqGdr9hYNg" role="3cpWs9">
<property role="TrG5h" value="currentChar" />
<node concept="10Pfzv" id="1pqGdr9hYNc" role="1tU5fm" />
<node concept="2OqwBi" id="1pqGdr9i0iA" role="33vP2m">
<node concept="1Wqviy" id="1pqGdr9hZJq" role="2Oq$k0" />
<node concept="liA8E" id="1pqGdr9i0AB" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
<node concept="37vLTw" id="1pqGdr9i0Gs" role="37wK5m">
<ref role="3cqZAo" node="1pqGdr9hTYP" resolve="i" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="1pqGdr9i0S8" role="3cqZAp">
<node concept="3clFbS" id="1pqGdr9i0Sa" role="3clFbx">
<node concept="3clFbF" id="1pqGdr9i45I" role="3cqZAp">
<node concept="37vLTI" id="1pqGdr9i4tU" role="3clFbG">
<node concept="3fqX7Q" id="1pqGdr9i4KG" role="37vLTx">
<node concept="37vLTw" id="1pqGdr9i4UM" role="3fr31v">
<ref role="3cqZAo" node="1pqGdr9hXPM" resolve="isEscapeMode" />
</node>
</node>
<node concept="37vLTw" id="1pqGdr9i45G" role="37vLTJ">
<ref role="3cqZAo" node="1pqGdr9hXPM" resolve="isEscapeMode" />
</node>
</node>
</node>
</node>
<node concept="3clFbC" id="1pqGdr9i21_" role="3clFbw">
<node concept="1Xhbcc" id="1pqGdr9i27$" role="3uHU7w">
<property role="1XhdNS" value="\\" />
</node>
<node concept="37vLTw" id="1pqGdr9i0Y6" role="3uHU7B">
<ref role="3cqZAo" node="1pqGdr9hYNg" resolve="currentChar" />
</node>
</node>
<node concept="3eNFk2" id="1pqGdr9i51j" role="3eNLev">
<node concept="1Wc70l" id="1pqGdr9i7Ra" role="3eO9$A">
<node concept="3fqX7Q" id="1pqGdr9i7Uk" role="3uHU7w">
<node concept="37vLTw" id="1pqGdr9i7Xs" role="3fr31v">
<ref role="3cqZAo" node="1pqGdr9hXPM" resolve="isEscapeMode" />
</node>
</node>
<node concept="3clFbC" id="1pqGdr9i6lV" role="3uHU7B">
<node concept="37vLTw" id="1pqGdr9i57E" role="3uHU7B">
<ref role="3cqZAo" node="1pqGdr9hYNg" resolve="currentChar" />
</node>
<node concept="1Xhbcc" id="1pqGdr9i7FA" role="3uHU7w">
<property role="1XhdNS" value="&quot;" />
</node>
</node>
</node>
<node concept="3clFbS" id="1pqGdr9i51l" role="3eOfB_">
<node concept="3cpWs6" id="1pqGdr9i80y" role="3cqZAp">
<node concept="3clFbT" id="1pqGdr9i80E" role="3cqZAk" />
</node>
</node>
</node>
<node concept="9aQIb" id="1pqGdr9i83W" role="9aQIa">
<node concept="3clFbS" id="1pqGdr9i83X" role="9aQI4">
<node concept="3clFbF" id="1pqGdr9i8Qj" role="3cqZAp">
<node concept="37vLTI" id="1pqGdr9i9bx" role="3clFbG">
<node concept="3clFbT" id="1pqGdr9i9n7" role="37vLTx" />
<node concept="37vLTw" id="1pqGdr9i8Qi" role="37vLTJ">
<ref role="3cqZAo" node="1pqGdr9hXPM" resolve="isEscapeMode" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWsn" id="1pqGdr9hTYP" role="1Duv9x">
<property role="TrG5h" value="i" />
<node concept="10Oyi0" id="1pqGdr9hTZP" role="1tU5fm" />
<node concept="3cmrfG" id="1pqGdr9hTZY" role="33vP2m">
<property role="3cmrfH" value="0" />
</node>
</node>
<node concept="3eOVzh" id="1pqGdr9hV6w" role="1Dwp0S">
<node concept="2OqwBi" id="1pqGdr9hVFm" role="3uHU7w">
<node concept="1Wqviy" id="1pqGdr9hVd1" role="2Oq$k0" />
<node concept="liA8E" id="1pqGdr9hW1D" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
</node>
</node>
<node concept="37vLTw" id="1pqGdr9hU53" role="3uHU7B">
<ref role="3cqZAo" node="1pqGdr9hTYP" resolve="i" />
</node>
</node>
<node concept="3uNrnE" id="1pqGdr9hXHJ" role="1Dwrff">
<node concept="37vLTw" id="1pqGdr9hXHL" role="2$L3a6">
<ref role="3cqZAo" node="1pqGdr9hTYP" resolve="i" />
</node>
</node>
</node>
<node concept="3clFbJ" id="1pqGdr9i9zD" role="3cqZAp">
<node concept="3clFbS" id="1pqGdr9i9zF" role="3clFbx">
<node concept="3cpWs6" id="1pqGdr9iaD2" role="3cqZAp">
<node concept="3clFbT" id="1pqGdr9iaDb" role="3cqZAk" />
</node>
</node>
<node concept="37vLTw" id="1pqGdr9i9Dn" role="3clFbw">
<ref role="3cqZAo" node="1pqGdr9hXPM" resolve="isEscapeMode" />
</node>
</node>
<node concept="3cpWs6" id="3VHXNElX8XK" role="3cqZAp">
<node concept="3clFbT" id="3VHXNElX9CP" role="3cqZAk">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
</node>
Expand Down
41 changes: 34 additions & 7 deletions .../languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:75f6a9e9-cf21-495f-b1aa-7fd992d0d7d0(test.ts.expr.os.m1@tests)">
<persistence version="9" />
<attribute name="doNotGenerate" value="false" />
<languages>
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
<use id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base" version="-1" />
Expand Down Expand Up @@ -736,7 +737,7 @@
<node concept="2zPypq" id="7k$Bvd3eTmz" role="_iOnC">
<property role="TrG5h" value="a" />
<node concept="30bdrP" id="7k$Bvd3eTm$" role="2zPyp_">
<property role="30bdrQ" value="Hallo" />
<property role="30bdrQ" value="\Hello" />
</node>
<node concept="30bdrU" id="7k$Bvd3eTm_" role="2zM23F" />
</node>
Expand Down Expand Up @@ -793,7 +794,33 @@
</node>
<node concept="30bdrU" id="7k$Bvd3eTmV" role="2zM23F" />
</node>
<node concept="_ixoA" id="2xACJhqZdsS" role="_iOnC" />
<node concept="2zPypq" id="3VHXNElXxii" role="_iOnC">
<property role="TrG5h" value="longString" />
<node concept="30bdrP" id="3VHXNElXxjr" role="2zPyp_">
<property role="30bdrQ" value="hUc35RDHAGhOHYDOQVuScoO8bfbpgVqpr1pf9N6HN9wWWOl8aklHfScguYu4mE5jZxh0eM77tAHzvP8AX9ulSBhGvsOx4DNH93Iaf8byu1RBOdTZn6e0N1MVUGT6opO5pXc6EjUSNKYs0vMBy0pHt8SFm3joL4lOtk5J1gFk4zDP7GV8o2wpbg1ftEkYDC8FHyGKNDEjf70Aw4zyiUHefyEONX1ZdYKwgQIYdI5QPN7Rh4a6bFreXqICXR5Ax2rAhEBhuJqdO9RJBDB0ff4twHd3UBusCR15SINboyWZ4QmFKY2fJSA6nxfwhKKCyW9TkOVbz1Sk1uxfEwGvGnJ0cTrVjsnKguULPjHVSEfbnUew3tfRdcz2VHSADlm7YzxtPQGEPgDdkzGptg3jyS3fpljgjtIOTbjnxLF6We5zrQqjv9skiX7918Hs1zOuLoBF5qztTH2N8neCxUvfz7zYxOxVEgfp6LiPyJleOwwnYXCLd2UGaRq6tCqHUKOXydBsTlmELUyPbpyIualvs0zDtu6Krh3gDmIF1CFPSAhBMEulfCFffFsHztUr1wqg9AGmfYaTE4CA7e0n4BCtExSYmxwByiEKog28WYVTFPeOxlj33w2CciaW9c77QoMSHSnKp3LdM4kRjCwmfsoLrZDL0O4hwSMIr5OabR3bCMQDE18FvQCuamWph8FqsF4wmM7UCe5iX80Bea0KcpwPmBujJyuGYtlM5RcP5zdSDaMVAIro72HXYXg6CBljZIpnJMNpHBb6CxEh3JcHZFspcSm7773Z0c4Bb0hQiE66TBAUujbobGHANGcxx42a3hTs5G2zyq26xyzgIPKPc5hjtlPkqhPgqLPxmXCU2OK3FnGHdI2TNUb62wQ4WaAMBZlbnrJbSHS76NQ24jAp76AyB0rpQ5ga19uprwwnAtg9SlOsxTKk8BgekgEZJZrGpTt9nT814EO2YB2OpmK4MwcaoCFk3JBybEQtYceARUCgnWZg\n" />
</node>
<node concept="30bdrU" id="3VHXNElXxjf" role="2zM23F" />
</node>
<node concept="2zPypq" id="3VHXNElXxku" role="_iOnC">
<property role="TrG5h" value="stringWithEscapes" />
<node concept="30bdrP" id="3VHXNElXxln" role="2zPyp_">
<property role="30bdrQ" value="\nHello\nWorld" />
</node>
<node concept="30bdrU" id="3VHXNElXxrl" role="2zM23F" />
</node>
<node concept="2zPypq" id="3VHXNElXxmL" role="_iOnC">
<property role="TrG5h" value="stringQuoteEscape" />
<node concept="30bdrP" id="3VHXNElXxnE" role="2zPyp_">
<property role="30bdrQ" value="Hello \&quot;World\&quot;" />
</node>
<node concept="30bdrU" id="3VHXNElXxqS" role="2zM23F" />
</node>
<node concept="2zPypq" id="3VHXNElXxoX" role="_iOnC">
<property role="TrG5h" value="emptyString" />
<node concept="30bdrP" id="3VHXNElXxpO" role="2zPyp_" />
<node concept="30bdrU" id="3VHXNElXxq_" role="2zM23F" />
</node>
<node concept="_ixoA" id="3VHXNElXxoe" role="_iOnC" />
<node concept="2zPypq" id="2xACJhqZdy9" role="_iOnC">
<property role="TrG5h" value="optString" />
<node concept="UmHTt" id="2xACJhqZdzq" role="2zPyp_" />
Expand Down Expand Up @@ -15019,16 +15046,16 @@
<node concept="2zPypq" id="KoRsm$uuI4" role="_iOnC">
<property role="TrG5h" value="res2" />
<node concept="30cPrO" id="KoRsm$uvhv" role="2zPyp_">
<node concept="3iBYfx" id="KoRsm$uviv" role="30dEs_">
<node concept="30bXRB" id="KoRsm$uvjl" role="3iBYfI">
<property role="30bXRw" value="2" />
</node>
</node>
<node concept="3iBYfx" id="KoRsm$uv4e" role="30dEsF">
<node concept="30bXRB" id="KoRsm$uv4o" role="3iBYfI">
<property role="30bXRw" value="1" />
</node>
</node>
<node concept="3iBYfx" id="KoRsm$uviv" role="30dEs_">
<node concept="30bXRB" id="KoRsm$uvjl" role="3iBYfI">
<property role="30bXRw" value="2" />
</node>
</node>
</node>
</node>
<node concept="2zPypq" id="KoRsm$uwl5" role="_iOnC">
Expand Down

0 comments on commit 39f18a7

Please sign in to comment.