Skip to content

GitLab

Commit bc122e18 authored by André Pacak's avatar André Pacak
Browse files

refactoring

parent 18dbb163
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 534 additions and 382 deletions
inca-translation/languages/TypeLang/generator/template/main@generator.mps
View file @ bc122e18
......@@ -261,7 +261,7 @@
<node concept="1puMqW" id="4RJJaubPgua" role="1puA0r">
<ref role="1puQsG" node="7DdCaEODx6h" resolve="eliminateContextByProjection" />
</node>
<node concept="1puMqW" id="6XUlM2nKVB6" role="1puA0r">
<node concept="1puMqW" id="6XUlM2oHj7a" role="1puA0r">
<ref role="1puQsG" node="6XUlM2nKRm7" resolve="mergeContextProjectionLookup" />
</node>
</node>
......@@ -1143,31 +1143,31 @@
</node>
<node concept="1DcWWT" id="4RJJaubeT52" role="3cqZAp">
<node concept="3clFbS" id="4RJJaubeT54" role="2LFqv$">
<node concept="3cpWs8" id="32CDcOyFphR" role="3cqZAp">
<node concept="3cpWsn" id="32CDcOyFphS" role="3cpWs9">
<property role="TrG5h" value="projectContext" />
<node concept="3uibUv" id="32CDcOyFphP" role="1tU5fm">
<ref role="3uigEE" to="5tos:32CDcOyEa0d" resolve="ProjectContext" />
<node concept="3cpWs8" id="4RJJaubf6Wp" role="3cqZAp">
<node concept="3cpWsn" id="4RJJaubf6Wq" role="3cpWs9">
<property role="TrG5h" value="querier" />
<node concept="3uibUv" id="4RJJaubf6Wl" role="1tU5fm">
<ref role="3uigEE" to="5tos:32CDcOyGKwu" resolve="TypeLangModuleQuerier" />
</node>
<node concept="2ShNRf" id="32CDcOyFphT" role="33vP2m">
<node concept="1pGfFk" id="32CDcOyFphU" role="2ShVmc">
<ref role="37wK5l" to="5tos:32CDcOyElBr" resolve="ProjectContext" />
<node concept="37vLTw" id="4RJJaubf2rm" role="37wK5m">
<node concept="2ShNRf" id="4RJJaubf6Wr" role="33vP2m">
<node concept="1pGfFk" id="4RJJaubf6Ws" role="2ShVmc">
<ref role="37wK5l" to="5tos:4RJJaub9nwG" resolve="TypeLangModuleQuerier" />
<node concept="37vLTw" id="4RJJaubf6Wt" role="37wK5m">
<ref role="3cqZAo" node="4RJJaubeT55" resolve="module" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="32CDcOyUpM7" role="3cqZAp" />
<node concept="3clFbH" id="6XUlM2o$5YW" role="3cqZAp" />
<node concept="3clFbJ" id="32CDcOyUrdg" role="3cqZAp">
<node concept="3clFbS" id="32CDcOyUrdi" role="3clFbx">
<node concept="3cpWs6" id="32CDcOyUtBN" role="3cqZAp" />
</node>
<node concept="3fqX7Q" id="32CDcOyUtAh" role="3clFbw">
<node concept="2OqwBi" id="32CDcOyUtAj" role="3fr31v">
<node concept="37vLTw" id="32CDcOyUtAk" role="2Oq$k0">
<ref role="3cqZAo" node="32CDcOyFphS" resolve="projectContext" />
<node concept="37vLTw" id="6XUlM2o$B0o" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubf6Wq" resolve="querier" />
</node>
<node concept="liA8E" id="32CDcOyUtAl" role="2OqNvi">
<ref role="37wK5l" to="5tos:32CDcOyUlT4" resolve="hasLookupDeclaration" />
......@@ -1176,22 +1176,23 @@
</node>
</node>
<node concept="3clFbH" id="32CDcOyUv1L" role="3cqZAp" />
<node concept="3cpWs8" id="4RJJaubf6Wp" role="3cqZAp">
<node concept="3cpWsn" id="4RJJaubf6Wq" role="3cpWs9">
<property role="TrG5h" value="querier" />
<node concept="3uibUv" id="4RJJaubf6Wl" role="1tU5fm">
<ref role="3uigEE" to="5tos:32CDcOyGKwu" resolve="TypeLangModuleQuerier" />
<node concept="3cpWs8" id="32CDcOyFphR" role="3cqZAp">
<node concept="3cpWsn" id="32CDcOyFphS" role="3cpWs9">
<property role="TrG5h" value="projectContext" />
<node concept="3uibUv" id="32CDcOyFphP" role="1tU5fm">
<ref role="3uigEE" to="5tos:32CDcOyEa0d" resolve="ProjectContext" />
</node>
<node concept="2ShNRf" id="4RJJaubf6Wr" role="33vP2m">
<node concept="1pGfFk" id="4RJJaubf6Ws" role="2ShVmc">
<ref role="37wK5l" to="5tos:4RJJaub9nwG" resolve="TypeLangModuleQuerier" />
<node concept="37vLTw" id="4RJJaubf6Wt" role="37wK5m">
<node concept="2ShNRf" id="32CDcOyFphT" role="33vP2m">
<node concept="1pGfFk" id="32CDcOyFphU" role="2ShVmc">
<ref role="37wK5l" to="5tos:32CDcOyElBr" resolve="ProjectContext" />
<node concept="37vLTw" id="4RJJaubf2rm" role="37wK5m">
<ref role="3cqZAo" node="4RJJaubeT55" resolve="module" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="6XUlM2o$mAt" role="3cqZAp" />
<node concept="3cpWs8" id="32CDcOyFp__" role="3cqZAp">
<node concept="3cpWsn" id="32CDcOyFp_A" role="3cpWs9">
<property role="TrG5h" value="declsWithContextAndTerm" />
......@@ -1199,7 +1200,7 @@
<ref role="2I9WkF" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
</node>
<node concept="2OqwBi" id="4RJJauciAbi" role="33vP2m">
<node concept="37vLTw" id="4RJJauci$Rv" role="2Oq$k0">
<node concept="37vLTw" id="6XUlM2o$E10" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubf6Wq" resolve="querier" />
</node>
<node concept="liA8E" id="4RJJauciBAn" role="2OqNvi">
......@@ -1235,7 +1236,7 @@
<ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
</node>
<node concept="2OqwBi" id="32CDcOyOAks" role="33vP2m">
<node concept="37vLTw" id="32CDcOyOAkt" role="2Oq$k0">
<node concept="37vLTw" id="6XUlM2o$GAo" role="2Oq$k0">
<ref role="3cqZAo" node="32CDcOyFphS" resolve="projectContext" />
</node>
<node concept="liA8E" id="32CDcOyOAku" role="2OqNvi">
......@@ -1275,7 +1276,7 @@
<ref role="2I9WkF" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
</node>
<node concept="2OqwBi" id="4RJJaubx5Q5" role="33vP2m">
<node concept="37vLTw" id="4RJJauciTjn" role="2Oq$k0">
<node concept="37vLTw" id="6XUlM2o$GBF" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubf6Wq" resolve="querier" />
</node>
<node concept="liA8E" id="4RJJaubx5Q7" role="2OqNvi">
......@@ -1420,7 +1421,7 @@
<node concept="3cpWsn" id="4RJJaubxenU" role="3cpWs9">
<property role="TrG5h" value="createdRule" />
<node concept="2OqwBi" id="4RJJaubxenV" role="33vP2m">
<node concept="37vLTw" id="4RJJaubxenW" role="2Oq$k0">
<node concept="37vLTw" id="6XUlM2o$I5R" role="2Oq$k0">
<ref role="3cqZAo" node="32CDcOyFphS" resolve="projectContext" />
</node>
<node concept="liA8E" id="4RJJaubxenX" role="2OqNvi">
......@@ -1519,7 +1520,7 @@
</node>
<node concept="3clFbF" id="4RJJaubSZlE" role="3cqZAp">
<node concept="2OqwBi" id="4RJJaubT0_g" role="3clFbG">
<node concept="37vLTw" id="4RJJauciUGD" role="2Oq$k0">
<node concept="37vLTw" id="6XUlM2o$L3B" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubf6Wq" resolve="querier" />
</node>
<node concept="liA8E" id="4RJJaubT0MZ" role="2OqNvi">
......@@ -1557,7 +1558,7 @@
<ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
</node>
<node concept="2OqwBi" id="32CDcOz4ljS" role="33vP2m">
<node concept="37vLTw" id="32CDcOz4ljT" role="2Oq$k0">
<node concept="37vLTw" id="6XUlM2o$I6Z" role="2Oq$k0">
<ref role="3cqZAo" node="32CDcOyFphS" resolve="projectContext" />
</node>
<node concept="liA8E" id="32CDcOz4ljU" role="2OqNvi">
......@@ -1573,8 +1574,8 @@
<ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
</node>
<node concept="2OqwBi" id="4RJJaubC1p5" role="33vP2m">
<node concept="37vLTw" id="4RJJaubC1p6" role="2Oq$k0">
<ref role="3cqZAo" node="32CDcOyFphS" resolve="projectContext" />
<node concept="37vLTw" id="6XUlM2o$B2U" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubf6Wq" resolve="querier" />
</node>
<node concept="liA8E" id="4RJJaubC1p7" role="2OqNvi">
<ref role="37wK5l" to="5tos:32CDcOyTUll" resolve="getLookupDeclaration" />
......@@ -1607,7 +1608,7 @@
<ref role="ehGHo" to="b83y:2_58u12eCWN" resolve="Rule" />
</node>
<node concept="2OqwBi" id="4RJJaubIiQa" role="33vP2m">
<node concept="37vLTw" id="4RJJaubIiQb" role="2Oq$k0">
<node concept="37vLTw" id="6XUlM2o$J_A" role="2Oq$k0">
<ref role="3cqZAo" node="32CDcOyFphS" resolve="projectContext" />
</node>
<node concept="liA8E" id="4RJJaubIiQc" role="2OqNvi">
......@@ -1624,7 +1625,7 @@
</node>
</node>
<node concept="2OqwBi" id="4RJJaubLcps" role="2Oq$k0">
<node concept="37vLTw" id="4RJJauciUIE" role="2Oq$k0">
<node concept="37vLTw" id="6XUlM2o$JCO" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubf6Wq" resolve="querier" />
</node>
<node concept="liA8E" id="4RJJaubLxio" role="2OqNvi">
......@@ -1651,7 +1652,7 @@
<ref role="2I9WkF" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
</node>
<node concept="2OqwBi" id="4RJJaubYnZ2" role="33vP2m">
<node concept="37vLTw" id="4RJJauciUJm" role="2Oq$k0">
<node concept="37vLTw" id="6XUlM2o$JFB" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubf6Wq" resolve="querier" />
</node>
<node concept="liA8E" id="4RJJaubYo5h" role="2OqNvi">
......@@ -1876,16 +1877,16 @@
</node>
</node>
</node>
<node concept="3cpWs8" id="6XUlM2nMZ3G" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2nMZ3H" role="3cpWs9">
<property role="TrG5h" value="projectContext" />
<node concept="3uibUv" id="6XUlM2nMZ3D" role="1tU5fm">
<ref role="3uigEE" to="5tos:32CDcOyEa0d" resolve="ProjectContext" />
</node>
<node concept="2ShNRf" id="6XUlM2nMZ3I" role="33vP2m">
<node concept="1pGfFk" id="6XUlM2nMZ3J" role="2ShVmc">
<ref role="37wK5l" to="5tos:32CDcOyElBr" resolve="ProjectContext" />
<node concept="37vLTw" id="6XUlM2nMZ3K" role="37wK5m">
<node concept="3cpWs8" id="6XUlM2o$SHO" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2o$SHP" role="3cpWs9">
<property role="TrG5h" value="mergeCtxProjLookup" />
<node concept="3uibUv" id="6XUlM2o$SHQ" role="1tU5fm">
<ref role="3uigEE" to="5tos:6XUlM2oz67t" resolve="MergeContextProjectionAndLookup" />
</node>
<node concept="2ShNRf" id="6XUlM2o$V3K" role="33vP2m">
<node concept="1pGfFk" id="6XUlM2o$V3J" role="2ShVmc">
<ref role="37wK5l" to="5tos:6XUlM2oz6pr" resolve="MergeContextProjectionAndLookup" />
<node concept="37vLTw" id="6XUlM2o$V49" role="37wK5m">
<ref role="3cqZAo" node="6XUlM2nKR$9" resolve="module" />
</node>
</node>
......@@ -1900,12 +1901,12 @@
<ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
</node>
<node concept="2OqwBi" id="6XUlM2nMZwf" role="33vP2m">
<node concept="37vLTw" id="6XUlM2nXsKr" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2nMZ3H" resolve="projectContext" />
</node>
<node concept="liA8E" id="6XUlM2nMZwh" role="2OqNvi">
<ref role="37wK5l" to="5tos:32CDcOyTUll" resolve="getLookupDeclaration" />
</node>
<node concept="37vLTw" id="6XUlM2o$Ntb" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2nKWP5" resolve="querier" />
</node>
</node>
</node>
</node>
......@@ -2030,9 +2031,6 @@
<ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
</node>
<node concept="2OqwBi" id="6XUlM2oh_OT" role="33vP2m">
<node concept="37vLTw" id="6XUlM2oh_OU" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2nMZ3H" resolve="projectContext" />
</node>
<node concept="liA8E" id="6XUlM2oh_OV" role="2OqNvi">
<ref role="37wK5l" to="5tos:6XUlM2ogrDK" resolve="inlineContextProjectionInDeclaration" />
<node concept="37vLTw" id="6XUlM2oh_OW" role="37wK5m">
......@@ -2042,6 +2040,9 @@
<ref role="3cqZAo" node="6XUlM2nU1TW" resolve="contextProjectionDeclaration" />
</node>
</node>
<node concept="37vLTw" id="6XUlM2o$ZSm" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2o$SHP" resolve="mergeCtxProjLookup" />
</node>
</node>
</node>
</node>
......@@ -2284,20 +2285,6 @@
<property role="3SKdUp" value="TODO better way for var" />
</node>
</node>
<node concept="3cpWs8" id="6XUlM2nXaKn" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2nXaKq" role="3cpWs9">
<property role="TrG5h" value="varName" />
<node concept="17QB3L" id="6XUlM2nXb3i" role="1tU5fm" />
<node concept="2OqwBi" id="6XUlM2nXccv" role="33vP2m">
<node concept="1iwH7S" id="6XUlM2nXc4q" role="2Oq$k0" />
<node concept="2piZGk" id="6XUlM2nXcs7" role="2OqNvi">
<node concept="Xl_RD" id="6XUlM2nXcsx" role="2piZGb">
<property role="Xl_RC" value="name" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="6XUlM2nYt54" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2nYt55" role="3cpWs9">
<property role="TrG5h" value="var" />
......
inca-translation/solutions/TypeLangTest/models/test_single.mps
View file @ bc122e18
......@@ -537,8 +537,14 @@
<property role="TrG5h" value="lookup found" />
<node concept="1FvB8F" id="6G$bWLkr_dY" role="1FvUUP">
<ref role="1FvB8G" node="6G$bWLkr_b_" resolve="lookup" />
<node concept="1FvUUU" id="6G$bWLkr_dZ" role="1FvB8H">
<property role="TrG5h" value="name" />
<node concept="27Pwox" id="6XUlM2oxa2a" role="1FvB8H">
<ref role="1F1YRu" to="5va7:1Da9ityUTbw" resolve="Var" />
<node concept="bFJCQ" id="6XUlM2oxa2i" role="27Pwov">
<ref role="3zVwH8" to="tpck:h0TrG11" resolve="name" />
<node concept="1FvUUU" id="6XUlM2oxa2w" role="bFJCb">
<property role="TrG5h" value="name" />
</node>
</node>
</node>
<node concept="27Pwox" id="6G$bWLkr_e0" role="1FvB8I">
<ref role="1F1YRu" to="5va7:2_58u12e1eN" resolve="Bind" />
......@@ -573,8 +579,14 @@
<property role="TrG5h" value="lookup next" />
<node concept="1FvB8F" id="6G$bWLkr_eb" role="1FvUUP">
<ref role="1FvB8G" node="6G$bWLkr_b_" resolve="lookup" />
<node concept="1FvUUU" id="6G$bWLkr_ec" role="1FvB8H">
<property role="TrG5h" value="name" />
<node concept="27Pwox" id="6XUlM2oxa1j" role="1FvB8H">
<ref role="1F1YRu" to="5va7:1Da9ityUTbw" resolve="Var" />
<node concept="bFJCQ" id="6XUlM2oxa1r" role="27Pwov">
<ref role="3zVwH8" to="tpck:h0TrG11" resolve="name" />
<node concept="1FvUUU" id="6XUlM2oxa1D" role="bFJCb">
<property role="TrG5h" value="name" />
</node>
</node>
</node>
<node concept="27Pwox" id="6G$bWLkr_ed" role="1FvB8I">
<ref role="1F1YRu" to="5va7:2_58u12e1eN" resolve="Bind" />
......@@ -598,7 +610,7 @@
<node concept="1FvB8F" id="6G$bWLkr_ej" role="1FvUVk">
<ref role="1FvB8G" node="6G$bWLkr_b_" resolve="lookup" />
<node concept="1FvUUU" id="6G$bWLkr_ek" role="1FvB8H">
<property role="TrG5h" value="name" />
<property role="TrG5h" value="var" />
</node>
<node concept="1FvUUU" id="6G$bWLkr_el" role="1FvB8I">
<property role="TrG5h" value="C" />
......
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