Commit 8856f057 authored by André Pacak's avatar André Pacak
Browse files

node deletion works, added test case that shows bug in our translation

parent 728e5f3d
......@@ -6,7 +6,7 @@
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="b802a056-92a2-4fbc-902e-f8e5004c331f" name="org.inca.core" version="0" />
<use id="cd2909da-ecb4-49dc-b176-33e5c619e516" name="org.inca.gp" version="0" />
<use id="83519d5a-e8d8-40b1-b958-7bbbda82ff24" name="testlanguages" version="0" />
<use id="83519d5a-e8d8-40b1-b958-7bbbda82ff24" name="forecursive.lang" version="0" />
<use id="e6d2ffd5-9c56-41f8-99ac-9d1ceb13daa2" name="org.inca.data" version="2" />
<use id="8c9a2720-9d21-4370-a226-819eb3e76e1e" name="org.inca.fun" version="0" />
<use id="3a1c1f85-c745-4d04-a210-f97a7e31f9cc" name="org.inca.extensions" version="0" />
......
......@@ -17,6 +17,9 @@
</imports>
<registry>
<language id="8c9a2720-9d21-4370-a226-819eb3e76e1e" name="org.inca.fun">
<concept id="5746856838774042406" name="org.inca.fun.structure.Def" flags="ng" index="2dT$3Y">
<child id="5746856838774042549" name="expression" index="2dT$1H" />
</concept>
<concept id="996292992024565907" name="org.inca.fun.structure.Tuple" flags="ng" index="2k1_ex">
<child id="5168759050436890827" name="expressions" index="3tmOSN" />
</concept>
......@@ -152,6 +155,27 @@
</concept>
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
</language>
<language id="5a551d67-ba3f-49dc-b984-2ea4f8c9ad07" name="pcf.lang">
<concept id="7997266186981964043" name="pcf.lang.structure.ModuleElemDef" flags="ng" index="2BHCoM">
<child id="7997266186982065639" name="term" index="2BHfFu" />
</concept>
<concept id="6840065899900111365" name="pcf.lang.structure.NumLit" flags="ng" index="158W6R">
<property id="6840065899900111366" name="num" index="158W6O" />
</concept>
<concept id="5790571747095872620" name="pcf.lang.structure.Module" flags="ng" index="1gj3CZ">
<child id="5790571747095872621" name="elems" index="1gj3CY" />
</concept>
<concept id="1894367444356272930" name="pcf.lang.structure.Lam" flags="ng" index="1SCro5">
<child id="6840065899900111421" name="ty" index="158W6f" />
<child id="1894367444356272950" name="t" index="1SCroh" />
</concept>
<concept id="1894367444356272898" name="pcf.lang.structure.Add" flags="ng" index="1SCro_">
<child id="1894367444356272903" name="t1" index="1SCrow" />
<child id="1894367444356272907" name="t2" index="1SCroG" />
</concept>
<concept id="1894367444356273132" name="pcf.lang.structure.Nat" flags="ng" index="1SCrrb" />
<concept id="1894367444356272864" name="pcf.lang.structure.Var" flags="ng" index="1SCrv7" />
</language>
<language id="3a1c1f85-c745-4d04-a210-f97a7e31f9cc" name="org.inca.extensions">
<concept id="8889009408328735956" name="org.inca.extensions.structure.NodePattern" flags="ng" index="27Pwox">
<child id="8889009408328735975" name="type" index="27Pwoi" />
......@@ -254,7 +278,6 @@
<node concept="C6Zt3" id="3g6selKTO0B" role="xaH5_">
<ref role="ws7DW" node="3g6selKTNWn" resolve="Type_ADT" />
</node>
<node concept="1XdyHe" id="3g6selKTO0C" role="1dubk0" />
<node concept="3zyOaA" id="3g6selKTO0M" role="1dubk0">
<property role="TrG5h" value="lookup_projection_typeOf_Context" />
<node concept="1VLyuc" id="3g6selKTO0E" role="1dv5OJ">
......@@ -2145,6 +2168,84 @@
</node>
</node>
<node concept="1XdyHe" id="3g6selKTO19" role="1dubk0" />
<node concept="3zyOaA" id="7YmdsW3f4J9" role="1dubk0">
<property role="TrG5h" value="varSelfAvailable" />
<node concept="3zV_Rz" id="7YmdsW3f4Ja" role="3zVECR">
<node concept="34ocy7" id="7YmdsW3f761" role="1dgzf0">
<node concept="2dT$3Y" id="7YmdsW3f774" role="34ocs8">
<node concept="2k1GkI" id="7YmdsW3f77_" role="2dT$1H">
<node concept="2k1_uq" id="7YmdsW3f77z" role="2nKVj6">
<ref role="2nKBpL" node="3g6selKTO0M" resolve="lookup_projection_typeOf_Context" />
<node concept="30NkWi" id="7YmdsW3f77R" role="2nKBpO">
<ref role="XkjO9" node="7YmdsW3f75$" resolve="v" />
</node>
<node concept="30NkWi" id="7YmdsW3fb9w" role="2nKBpO">
<ref role="XkjO9" node="7YmdsW3f75$" resolve="v" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1VLyuc" id="7YmdsW3f75$" role="1dv5OJ">
<property role="TrG5h" value="v" />
<node concept="2kdjtB" id="7YmdsW3f75U" role="1dukDx">
<ref role="2UGuZ7" to="jzuy:1Da9ityUTbw" resolve="Var" />
</node>
</node>
</node>
<node concept="1XdyHe" id="7YmdsW3f03u" role="1dubk0" />
<node concept="3zyOaA" id="7YmdsW3fg2B" role="1dubk0">
<property role="TrG5h" value="test1" />
<node concept="3zV_Rz" id="7YmdsW3fg2C" role="3zVECR">
<node concept="34ocy7" id="7YmdsW3firT" role="1dgzf0">
<node concept="34sUYq" id="7YmdsW3fiso" role="34ocs8">
<node concept="2k1GkI" id="7YmdsW3fisT" role="34sUSb">
<node concept="2k1_uq" id="7YmdsW3fisR" role="2nKVj6">
<ref role="2nKBpL" node="7YmdsW3f4J9" resolve="varSelfAvailable" />
<node concept="30NkWi" id="7YmdsW3fita" role="2nKBpO">
<ref role="XkjO9" node="7YmdsW3firw" resolve="v" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1VLyuc" id="7YmdsW3firw" role="1dv5OJ">
<property role="TrG5h" value="v" />
<node concept="2kdjtB" id="7YmdsW3firM" role="1dukDx">
<ref role="2UGuZ7" to="jzuy:1Da9ityUTbw" resolve="Var" />
</node>
</node>
</node>
<node concept="1XdyHe" id="7YmdsW3fdE1" role="1dubk0" />
<node concept="3zyOaA" id="7YmdsW3flh5" role="1dubk0">
<property role="TrG5h" value="test2" />
<node concept="3zV_Rz" id="7YmdsW3flh6" role="3zVECR">
<node concept="34ocy7" id="7YmdsW3fnH1" role="1dgzf0">
<node concept="34sUYq" id="7YmdsW3fnHw" role="34ocs8">
<node concept="2k1GkI" id="7YmdsW3fnI1" role="34sUSb">
<node concept="2k1_uq" id="7YmdsW3fnHZ" role="2nKVj6">
<ref role="2nKBpL" node="3g6selKTO0M" resolve="lookup_projection_typeOf_Context" />
<node concept="30NkWi" id="7YmdsW3fnIj" role="2nKBpO">
<ref role="XkjO9" node="7YmdsW3fnGG" resolve="v" />
</node>
<node concept="30NkWi" id="7YmdsW3fvXc" role="2nKBpO">
<ref role="XkjO9" node="7YmdsW3fnGG" resolve="v" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1VLyuc" id="7YmdsW3fnGG" role="1dv5OJ">
<property role="TrG5h" value="v" />
<node concept="2kdjtB" id="7YmdsW3fnGU" role="1dukDx">
<ref role="2UGuZ7" to="jzuy:1Da9ityUTbw" resolve="Var" />
</node>
</node>
</node>
<node concept="1XdyHe" id="7YmdsW3fiS2" role="1dubk0" />
<node concept="3zyOaA" id="3g6selKTO1h" role="1dubk0">
<property role="TrG5h" value="typeOf_errors" />
<node concept="1VLyuc" id="3g6selKTO1b" role="1dv5OJ">
......@@ -3958,5 +4059,23 @@
</node>
</node>
</node>
<node concept="1gj3CZ" id="1IkJagZxeny">
<property role="TrG5h" value="Test" />
<node concept="2BHCoM" id="1IkJagZxenz" role="1gj3CY">
<property role="TrG5h" value="test" />
<node concept="1SCro5" id="7YmdsW3eGfe" role="2BHfFu">
<property role="TrG5h" value="x" />
<node concept="1SCro_" id="7YmdsW3eGfo" role="1SCroh">
<node concept="1SCrv7" id="7YmdsW3eGgd" role="1SCrow">
<property role="TrG5h" value="y" />
</node>
<node concept="158W6R" id="7YmdsW3eGg3" role="1SCroG">
<property role="158W6O" value="12" />
</node>
</node>
<node concept="1SCrrb" id="7YmdsW3eGfl" role="158W6f" />
</node>
</node>
</node>
</model>
......@@ -40,12 +40,12 @@
<node concept="1SCro5" id="RBQsPPLDT7" role="2BHfFu">
<property role="TrG5h" value="x" />
<node concept="1SCro_" id="RBQsPPLDT8" role="1SCroh">
<node concept="158W6R" id="RBQsPPLDTa" role="1SCrow">
<property role="158W6O" value="12" />
</node>
<node concept="1SCrv7" id="RBQsPPLDTb" role="1SCroG">
<node concept="1SCrv7" id="7YmdsW3e35d" role="1SCrow">
<property role="TrG5h" value="y" />
</node>
<node concept="158W6R" id="7YmdsW3e35r" role="1SCroG">
<property role="158W6O" value="12" />
</node>
</node>
<node concept="1SCrrb" id="RBQsPPLDT9" role="158W6f" />
</node>
......
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:dbcb22ec-bf36-466a-bd55-f8fd362f2698(pcf.exectests.test.fail_var2)">
<persistence version="9" />
<languages>
<use id="5a551d67-ba3f-49dc-b984-2ea4f8c9ad07" name="pcf.lang" version="0" />
</languages>
<imports />
<registry>
<language id="5a551d67-ba3f-49dc-b984-2ea4f8c9ad07" name="pcf.lang">
<concept id="7997266186981964043" name="pcf.lang.structure.ModuleElemDef" flags="ng" index="2BHCoM">
<child id="7997266186982065639" name="term" index="2BHfFu" />
</concept>
<concept id="5790571747095872620" name="pcf.lang.structure.Module" flags="ng" index="1gj3CZ">
<child id="5790571747095872621" name="elems" index="1gj3CY" />
</concept>
<concept id="1894367444356272930" name="pcf.lang.structure.Lam" flags="ng" index="1SCro5">
<child id="6840065899900111421" name="ty" index="158W6f" />
<child id="1894367444356272950" name="t" index="1SCroh" />
</concept>
<concept id="1894367444356272898" name="pcf.lang.structure.Add" flags="ng" index="1SCro_">
<child id="1894367444356272903" name="t1" index="1SCrow" />
<child id="1894367444356272907" name="t2" index="1SCroG" />
</concept>
<concept id="1894367444356273132" name="pcf.lang.structure.Nat" flags="ng" index="1SCrrb" />
<concept id="1894367444356272864" name="pcf.lang.structure.Var" flags="ng" index="1SCrv7" />
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
</language>
</registry>
<node concept="1gj3CZ" id="6HKiFajeH74">
<property role="TrG5h" value="TestFailVar2" />
<node concept="2BHCoM" id="6HKiFajeH75" role="1gj3CY">
<property role="TrG5h" value="test" />
<node concept="1SCro5" id="6HKiFajeH79" role="2BHfFu">
<property role="TrG5h" value="x" />
<node concept="1SCro_" id="6HKiFajeH7j" role="1SCroh">
<node concept="1SCrv7" id="6HKiFajeH7u" role="1SCrow">
<property role="TrG5h" value="x" />
</node>
<node concept="1SCrv7" id="6HKiFajeH7$" role="1SCroG">
<property role="TrG5h" value="y" />
</node>
</node>
<node concept="1SCrrb" id="6HKiFajeH7g" role="158W6f" />
</node>
</node>
</node>
</model>
......@@ -115,6 +115,7 @@
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
<concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
<reference id="1107535924139" name="classifier" index="3uigEE" />
</concept>
......@@ -482,24 +483,41 @@
</node>
</node>
</node>
<node concept="3cpWs8" id="6HKiFajdRbQ" role="3cqZAp">
<node concept="3cpWsn" id="6HKiFajdRbR" role="3cpWs9">
<property role="TrG5h" value="resultAccess" />
<node concept="3uibUv" id="6HKiFajdRbS" role="1tU5fm">
<ref role="3uigEE" to="49o:75UymJIFJjC" resolve="AnalysisResultAccess" />
</node>
<node concept="2ShNRf" id="6HKiFajdTln" role="33vP2m">
<node concept="1pGfFk" id="6HKiFajdTlm" role="2ShVmc">
<ref role="37wK5l" to="49o:6HKiFajdFgi" resolve="AnalysisResultAccess" />
<node concept="37vLTw" id="6HKiFajdTlH" role="37wK5m">
<ref role="3cqZAo" node="VcfMLFPDCA" resolve="model" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="VcfMLFPRTZ" role="3cqZAp">
<node concept="3cpWsn" id="VcfMLFPRTX" role="3cpWs9">
<property role="3TUv4t" value="true" />
<property role="TrG5h" value="result" />
<node concept="10P_77" id="VcfMLFPRUt" role="1tU5fm" />
<node concept="2YIFZM" id="75UymJITfAd" role="33vP2m">
<ref role="1Pybhc" to="49o:75UymJIFJjC" resolve="AnalysisResultAccess" />
<ref role="37wK5l" to="49o:2fgAgwSOTIw" resolve="isChecked" />
<node concept="2OqwBi" id="75UymJITfAe" role="37wK5m">
<node concept="37vLTw" id="75UymJITfAf" role="2Oq$k0">
<ref role="3cqZAo" node="VcfMLFPH$y" resolve="elem" />
</node>
<node concept="3TrEf2" id="RBQsPPEaMD" role="2OqNvi">
<ref role="3Tt5mk" to="jzuy:6VVZNB9jKnB" resolve="term" />
</node>
<node concept="2OqwBi" id="6HKiFajdVLs" role="33vP2m">
<node concept="37vLTw" id="6HKiFajdVf2" role="2Oq$k0">
<ref role="3cqZAo" node="6HKiFajdRbR" resolve="resultAccess" />
</node>
<node concept="37vLTw" id="75UymJITfAh" role="37wK5m">
<ref role="3cqZAo" node="VcfMLFPDCA" resolve="model" />
<node concept="liA8E" id="6HKiFajdYbI" role="2OqNvi">
<ref role="37wK5l" to="49o:6HKiFajdJKR" resolve="observeChange" />
<node concept="2OqwBi" id="6HKiFajdZg8" role="37wK5m">
<node concept="37vLTw" id="6HKiFajdYDd" role="2Oq$k0">
<ref role="3cqZAo" node="VcfMLFPH$y" resolve="elem" />
</node>
<node concept="3TrEf2" id="6HKiFajdZYi" role="2OqNvi">
<ref role="3Tt5mk" to="jzuy:6VVZNB9jKnB" resolve="term" />
</node>
</node>
</node>
</node>
</node>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment