Commit 8e872b00 authored by André Pacak's avatar André Pacak

generate fresh names for generated rule conclusion (ctx, term)

parent c0da15ec
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" /> <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
</concept> </concept>
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" /> <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"> <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
<child id="5680397130376446158" name="type" index="1tU5fm" /> <child id="5680397130376446158" name="type" index="1tU5fm" />
</concept> </concept>
...@@ -122,6 +123,13 @@ ...@@ -122,6 +123,13 @@
<child id="1199569916463" name="body" index="1bW5cS" /> <child id="1199569916463" name="body" index="1bW5cS" />
</concept> </concept>
</language> </language>
<language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
<concept id="1218047638031" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_CreateUniqueName" flags="nn" index="2piZGk">
<child id="1218047638032" name="baseName" index="2piZGb" />
<child id="1218049772449" name="contextNode" index="2pr8EU" />
</concept>
<concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
</language>
<language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation"> <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"> <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
<reference id="5455284157994012188" name="link" index="2pIpSl" /> <reference id="5455284157994012188" name="link" index="2pIpSl" />
...@@ -955,16 +963,12 @@ ...@@ -955,16 +963,12 @@
<node concept="3clFbH" id="5bZNdPki0I8" role="3cqZAp" /> <node concept="3clFbH" id="5bZNdPki0I8" role="3cqZAp" />
<node concept="1DcWWT" id="5bZNdPki20U" role="3cqZAp"> <node concept="1DcWWT" id="5bZNdPki20U" role="3cqZAp">
<node concept="3clFbS" id="5bZNdPki20W" role="2LFqv$"> <node concept="3clFbS" id="5bZNdPki20W" role="2LFqv$">
<node concept="3clFbH" id="5bZNdPkr9oz" role="3cqZAp" />
<node concept="3SKdUt" id="5bZNdPki6Up" role="3cqZAp"> <node concept="3SKdUt" id="5bZNdPki6Up" role="3cqZAp">
<node concept="3SKdUq" id="5bZNdPki6Ur" role="3SKWNk"> <node concept="3SKdUq" id="5bZNdPki6Ur" role="3SKWNk">
<property role="3SKdUp" value="create conclusion, output is input that is getting eliminated" /> <property role="3SKdUp" value="create conclusion, output is input that is getting eliminated" />
</node> </node>
</node> </node>
<node concept="3SKdUt" id="5bZNdPkr3Xt" role="3cqZAp">
<node concept="3SKdUq" id="5bZNdPkr3Xv" role="3SKWNk">
<property role="3SKdUp" value="TODO generate fresh names for term to avoid name collision with premises of corresponding rule" />
</node>
</node>
<node concept="3cpWs8" id="5bZNdPkim0o" role="3cqZAp"> <node concept="3cpWs8" id="5bZNdPkim0o" role="3cqZAp">
<node concept="3cpWsn" id="5bZNdPkim0r" role="3cpWs9"> <node concept="3cpWsn" id="5bZNdPkim0r" role="3cpWs9">
<property role="TrG5h" value="arguments" /> <property role="TrG5h" value="arguments" />
...@@ -980,6 +984,40 @@ ...@@ -980,6 +984,40 @@
</node> </node>
</node> </node>
</node> </node>
<node concept="3cpWs8" id="2groWwXWg2T" role="3cqZAp">
<node concept="3cpWsn" id="2groWwXWg2U" role="3cpWs9">
<property role="TrG5h" value="freshTermName" />
<node concept="17QB3L" id="2groWwXWg2S" role="1tU5fm" />
<node concept="2OqwBi" id="2groWwXWg2V" role="33vP2m">
<node concept="1iwH7S" id="2groWwXWg2W" role="2Oq$k0" />
<node concept="2piZGk" id="2groWwXWg2X" role="2OqNvi">
<node concept="Xl_RD" id="2groWwXWg2Y" role="2piZGb">
<property role="Xl_RC" value="term" />
</node>
<node concept="37vLTw" id="2groWwY2W2V" role="2pr8EU">
<ref role="3cqZAo" node="5bZNdPkgJSg" resolve="rule" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="2groWwXWhrk" role="3cqZAp">
<node concept="3cpWsn" id="2groWwXWhrn" role="3cpWs9">
<property role="TrG5h" value="freshContextName" />
<node concept="17QB3L" id="2groWwXWhri" role="1tU5fm" />
<node concept="2OqwBi" id="2groWwXWhYP" role="33vP2m">
<node concept="1iwH7S" id="2groWwXWhQA" role="2Oq$k0" />
<node concept="2piZGk" id="2groWwXWi3D" role="2OqNvi">
<node concept="Xl_RD" id="2groWwXWi45" role="2piZGb">
<property role="Xl_RC" value="Ctx" />
</node>
<node concept="37vLTw" id="2groWwY2Wbh" role="2pr8EU">
<ref role="3cqZAo" node="5bZNdPkgJSg" resolve="rule" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="5bZNdPkod13" role="3cqZAp"> <node concept="3cpWs8" id="5bZNdPkod13" role="3cqZAp">
<node concept="3cpWsn" id="5bZNdPkod14" role="3cpWs9"> <node concept="3cpWsn" id="5bZNdPkod14" role="3cpWs9">
<property role="TrG5h" value="context" /> <property role="TrG5h" value="context" />
...@@ -991,8 +1029,8 @@ ...@@ -991,8 +1029,8 @@
<ref role="2pJxaS" to="b83y:2_58u12eCXq" resolve="MetaVariable" /> <ref role="2pJxaS" to="b83y:2_58u12eCXq" resolve="MetaVariable" />
<node concept="2pJxcG" id="5bZNdPkod17" role="2pJxcM"> <node concept="2pJxcG" id="5bZNdPkod17" role="2pJxcM">
<ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" /> <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
<node concept="Xl_RD" id="5bZNdPkod18" role="2pJxcZ"> <node concept="37vLTw" id="2groWwXWi4T" role="2pJxcZ">
<property role="Xl_RC" value="C" /> <ref role="3cqZAo" node="2groWwXWhrn" resolve="freshContextName" />
</node> </node>
</node> </node>
</node> </node>
...@@ -1010,8 +1048,8 @@ ...@@ -1010,8 +1048,8 @@
<ref role="2pJxaS" to="b83y:2_58u12eCXq" resolve="MetaVariable" /> <ref role="2pJxaS" to="b83y:2_58u12eCXq" resolve="MetaVariable" />
<node concept="2pJxcG" id="5bZNdPkoeD8" role="2pJxcM"> <node concept="2pJxcG" id="5bZNdPkoeD8" role="2pJxcM">
<ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" /> <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
<node concept="Xl_RD" id="5bZNdPkoeD9" role="2pJxcZ"> <node concept="37vLTw" id="2groWwXWi5J" role="2pJxcZ">
<property role="Xl_RC" value="t" /> <ref role="3cqZAo" node="2groWwXWg2U" resolve="freshTermName" />
</node> </node>
</node> </node>
</node> </node>
...@@ -1220,13 +1258,13 @@ ...@@ -1220,13 +1258,13 @@
</node> </node>
</node> </node>
</node> </node>
<node concept="3clFbH" id="5bZNdPkr8Qy" role="3cqZAp" /> <node concept="3clFbH" id="2groWwY3U_h" role="3cqZAp" />
<node concept="3SKdUt" id="5bZNdPkrarD" role="3cqZAp"> <node concept="3SKdUt" id="5bZNdPkrarD" role="3cqZAp">
<node concept="3SKdUq" id="5bZNdPkrarF" role="3SKWNk"> <node concept="3SKdUq" id="5bZNdPkrarF" role="3SKWNk">
<property role="3SKdUp" value="TODO create program slices that computes output of conclusion" /> <property role="3SKdUp" value="TODO create program slices that computes output of conclusion" />
</node> </node>
</node> </node>
<node concept="3clFbH" id="5bZNdPkr9oz" role="3cqZAp" /> <node concept="3clFbH" id="2groWwY1Uom" role="3cqZAp" />
<node concept="3cpWs8" id="5bZNdPki_lh" role="3cqZAp"> <node concept="3cpWs8" id="5bZNdPki_lh" role="3cqZAp">
<node concept="3cpWsn" id="5bZNdPki_lk" role="3cpWs9"> <node concept="3cpWsn" id="5bZNdPki_lk" role="3cpWs9">
<property role="TrG5h" value="xRequiredRule" /> <property role="TrG5h" value="xRequiredRule" />
...@@ -1265,7 +1303,7 @@ ...@@ -1265,7 +1303,7 @@
<node concept="2pIpSj" id="5bZNdPkhPWa" role="2pJxcM"> <node concept="2pIpSj" id="5bZNdPkhPWa" role="2pJxcM">
<ref role="2pIpSl" to="b83y:2_58u12eCWO" resolve="premises" /> <ref role="2pIpSl" to="b83y:2_58u12eCWO" resolve="premises" />
<node concept="36biLy" id="5bZNdPkizUx" role="2pJxcZ"> <node concept="36biLy" id="5bZNdPkizUx" role="2pJxcZ">
<node concept="37vLTw" id="5bZNdPko5KF" role="36biLW"> <node concept="37vLTw" id="2groWwY1WeF" role="36biLW">
<ref role="3cqZAo" node="5bZNdPko4Nn" resolve="premises" /> <ref role="3cqZAo" node="5bZNdPko4Nn" resolve="premises" />
</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