Skip to content

GitLab

Commit 2eadac01 authored by André Pacak's avatar André Pacak
Browse files
Options

do not remove projection judgments and inline target decl

parent 5bc8f7be
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 80 deletions
inca-translation/languages/TypeLang/generator/template/main@generator.mps
View file @ 2eadac01
......@@ -2949,107 +2949,122 @@
<property role="3SKdUp" value="cleanup" />
</node>
</node>
<node concept="2Gpval" id="5UZDbCZ2_PJ" role="3cqZAp">
<node concept="2GrKxI" id="5UZDbCZ2_PL" role="2Gsz3X">
<property role="TrG5h" value="decl" />
</node>
<node concept="2OqwBi" id="5UZDbCZ2A06" role="2GsD0m">
<node concept="37vLTw" id="5UZDbCZ2_T8" role="2Oq$k0">
<ref role="3cqZAo" node="6faGdF_JNe$" resolve="inliner" />
</node>
<node concept="2OwXpG" id="5UZDbCZ2Aas" role="2OqNvi">
<ref role="2Oxat5" to="5tos:6faGdF_IPZ$" resolve="inlineSourceDecls" />
<node concept="1X3_iC" id="7U7_D9zhUb8" role="lGtFl">
<property role="3V$3am" value="statement" />
<property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
<node concept="2Gpval" id="5UZDbCZ2_PJ" role="8Wnug">
<node concept="2GrKxI" id="5UZDbCZ2_PL" role="2Gsz3X">
<property role="TrG5h" value="decl" />
</node>
<node concept="2OqwBi" id="5UZDbCZ2A06" role="2GsD0m">
<node concept="37vLTw" id="5UZDbCZ2_T8" role="2Oq$k0">
<ref role="3cqZAo" node="6faGdF_JNe$" resolve="inliner" />
</node>
<node concept="2OwXpG" id="5UZDbCZ2Aas" role="2OqNvi">
<ref role="2Oxat5" to="5tos:6faGdF_IPZ$" resolve="inlineSourceDecls" />
</node>
</node>
</node>
<node concept="3clFbS" id="5UZDbCZ2_PP" role="2LFqv$">
<node concept="3cpWs8" id="7U7_D9z9XkE" role="3cqZAp">
<node concept="3cpWsn" id="7U7_D9z9XkF" role="3cpWs9">
<property role="TrG5h" value="instances" />
<node concept="2I9FWS" id="7U7_D9z9Xjf" role="1tU5fm">
<ref role="2I9WkF" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
</node>
<node concept="2OqwBi" id="7U7_D9z9XkG" role="33vP2m">
<node concept="37vLTw" id="7U7_D9z9XkH" role="2Oq$k0">
<ref role="3cqZAo" node="3FODiuxeONy" resolve="querier" />
<node concept="3clFbS" id="5UZDbCZ2_PP" role="2LFqv$">
<node concept="3cpWs8" id="7U7_D9z9XkE" role="3cqZAp">
<node concept="3cpWsn" id="7U7_D9z9XkF" role="3cpWs9">
<property role="TrG5h" value="instances" />
<node concept="2I9FWS" id="7U7_D9z9Xjf" role="1tU5fm">
<ref role="2I9WkF" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
</node>
<node concept="liA8E" id="7U7_D9z9XkI" role="2OqNvi">
<ref role="37wK5l" to="5tos:4RJJaub9DpF" resolve="getInstancesOfDeclaration" />
<node concept="2GrUjf" id="7U7_D9z9XkJ" role="37wK5m">
<ref role="2Gs0qQ" node="5UZDbCZ2_PL" resolve="decl" />
<node concept="2OqwBi" id="7U7_D9z9XkG" role="33vP2m">
<node concept="37vLTw" id="7U7_D9z9XkH" role="2Oq$k0">
<ref role="3cqZAo" node="3FODiuxeONy" resolve="querier" />
</node>
<node concept="liA8E" id="7U7_D9z9XkI" role="2OqNvi">
<ref role="37wK5l" to="5tos:4RJJaub9DpF" resolve="getInstancesOfDeclaration" />
<node concept="2GrUjf" id="7U7_D9z9XkJ" role="37wK5m">
<ref role="2Gs0qQ" node="5UZDbCZ2_PL" resolve="decl" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2Gpval" id="7U7_D9z9Yhu" role="3cqZAp">
<node concept="2GrKxI" id="7U7_D9z9Yhw" role="2Gsz3X">
<property role="TrG5h" value="instances" />
</node>
<node concept="37vLTw" id="7U7_D9z9Yun" role="2GsD0m">
<ref role="3cqZAo" node="7U7_D9z9XkF" resolve="instances" />
</node>
<node concept="3clFbS" id="7U7_D9z9Yh$" role="2LFqv$">
<node concept="3SKdUt" id="7U7_D9z9Yv7" role="3cqZAp">
<node concept="3SKdUq" id="7U7_D9z9Yv8" role="3SKWNk">
<property role="3SKdUp" value="TODO check that the output is " />
<node concept="2Gpval" id="7U7_D9z9Yhu" role="3cqZAp">
<node concept="2GrKxI" id="7U7_D9z9Yhw" role="2Gsz3X">
<property role="TrG5h" value="instance" />
</node>
<node concept="37vLTw" id="7U7_D9z9Yun" role="2GsD0m">
<ref role="3cqZAo" node="7U7_D9z9XkF" resolve="instances" />
</node>
<node concept="3clFbS" id="7U7_D9z9Yh$" role="2LFqv$">
<node concept="3clFbF" id="7U7_D9zgbrU" role="3cqZAp">
<node concept="2OqwBi" id="7U7_D9zgdQs" role="3clFbG">
<node concept="2GrUjf" id="7U7_D9zgdI5" role="2Oq$k0">
<ref role="2Gs0qQ" node="7U7_D9z9Yhw" resolve="instance" />
</node>
<node concept="3YRAZt" id="7U7_D9zhEqT" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="5UZDbCZ2Asd" role="3cqZAp">
<node concept="2OqwBi" id="5UZDbCZ2AxG" role="3clFbG">
<node concept="37vLTw" id="5UZDbCZ2Asc" role="2Oq$k0">
<ref role="3cqZAo" node="3FODiuxeONy" resolve="querier" />
</node>
<node concept="liA8E" id="5UZDbCZ3OhZ" role="2OqNvi">
<ref role="37wK5l" to="5tos:6XUlM2nTnbU" resolve="removeRulesOfDeclarationAndItself" />
<node concept="2GrUjf" id="5UZDbCZ3Ojt" role="37wK5m">
<ref role="2Gs0qQ" node="5UZDbCZ2_PL" resolve="decl" />
<node concept="3clFbF" id="5UZDbCZ2Asd" role="3cqZAp">
<node concept="2OqwBi" id="5UZDbCZ2AxG" role="3clFbG">
<node concept="37vLTw" id="5UZDbCZ2Asc" role="2Oq$k0">
<ref role="3cqZAo" node="3FODiuxeONy" resolve="querier" />
</node>
<node concept="liA8E" id="5UZDbCZ3OhZ" role="2OqNvi">
<ref role="37wK5l" to="5tos:6XUlM2nTnbU" resolve="removeRulesOfDeclarationAndItself" />
<node concept="2GrUjf" id="5UZDbCZ3Ojt" role="37wK5m">
<ref role="2Gs0qQ" node="5UZDbCZ2_PL" resolve="decl" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="5UZDbCZ3OuC" role="3cqZAp">
<node concept="2OqwBi" id="5UZDbCZ3OIw" role="3clFbG">
<node concept="37vLTw" id="5UZDbCZ3OuA" role="2Oq$k0">
<ref role="3cqZAo" node="3FODiuxeONy" resolve="querier" />
</node>
<node concept="liA8E" id="5UZDbCZ52WW" role="2OqNvi">
<ref role="37wK5l" to="5tos:6XUlM2nTnbU" resolve="removeRulesOfDeclarationAndItself" />
<node concept="2OqwBi" id="5UZDbCZ53DC" role="37wK5m">
<node concept="37vLTw" id="5UZDbCZ52YA" role="2Oq$k0">
<ref role="3cqZAo" node="6faGdF_JNe$" resolve="inliner" />
</node>
<node concept="2OwXpG" id="5UZDbCZ53OB" role="2OqNvi">
<ref role="2Oxat5" to="5tos:6faGdF_IPyR" resolve="inlineTargetDecl" />
<node concept="1X3_iC" id="7U7_D9zgafb" role="lGtFl">
<property role="3V$3am" value="statement" />
<property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
<node concept="3clFbF" id="5UZDbCZ3OuC" role="8Wnug">
<node concept="2OqwBi" id="5UZDbCZ3OIw" role="3clFbG">
<node concept="37vLTw" id="5UZDbCZ3OuA" role="2Oq$k0">
<ref role="3cqZAo" node="3FODiuxeONy" resolve="querier" />
</node>
<node concept="liA8E" id="5UZDbCZ52WW" role="2OqNvi">
<ref role="37wK5l" to="5tos:6XUlM2nTnbU" resolve="removeRulesOfDeclarationAndItself" />
<node concept="2OqwBi" id="5UZDbCZ53DC" role="37wK5m">
<node concept="37vLTw" id="5UZDbCZ52YA" role="2Oq$k0">
<ref role="3cqZAo" node="6faGdF_JNe$" resolve="inliner" />
</node>
<node concept="2OwXpG" id="5UZDbCZ53OB" role="2OqNvi">
<ref role="2Oxat5" to="5tos:6faGdF_IPyR" resolve="inlineTargetDecl" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="5UZDbCZdCs4" role="3cqZAp" />
<node concept="2Gpval" id="5UZDbCZ9IVu" role="3cqZAp">
<node concept="2GrKxI" id="5UZDbCZ9IVw" role="2Gsz3X">
<property role="TrG5h" value="rule" />
</node>
<node concept="3clFbS" id="5UZDbCZ9IV$" role="2LFqv$">
<node concept="3clFbF" id="5UZDbCZ9JYJ" role="3cqZAp">
<node concept="2OqwBi" id="5UZDbCZ9Ka8" role="3clFbG">
<node concept="2GrUjf" id="5UZDbCZ9JYI" role="2Oq$k0">
<ref role="2Gs0qQ" node="5UZDbCZ9IVw" resolve="rule" />
<node concept="1X3_iC" id="7U7_D9zgaPt" role="lGtFl">
<property role="3V$3am" value="statement" />
<property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
<node concept="2Gpval" id="5UZDbCZ9IVu" role="8Wnug">
<node concept="2GrKxI" id="5UZDbCZ9IVw" role="2Gsz3X">
<property role="TrG5h" value="rule" />
</node>
<node concept="3clFbS" id="5UZDbCZ9IV$" role="2LFqv$">
<node concept="3clFbF" id="5UZDbCZ9JYJ" role="3cqZAp">
<node concept="2OqwBi" id="5UZDbCZ9Ka8" role="3clFbG">
<node concept="2GrUjf" id="5UZDbCZ9JYI" role="2Oq$k0">
<ref role="2Gs0qQ" node="5UZDbCZ9IVw" resolve="rule" />
</node>
<node concept="3YRAZt" id="5UZDbCZclW5" role="2OqNvi" />
</node>
<node concept="3YRAZt" id="5UZDbCZclW5" role="2OqNvi" />
</node>
</node>
</node>
<node concept="2OqwBi" id="5UZDbCZ8rU$" role="2GsD0m">
<node concept="37vLTw" id="5UZDbCZ8rCU" role="2Oq$k0">
<ref role="3cqZAo" node="6faGdF_JNe$" resolve="inliner" />
</node>
<node concept="2OwXpG" id="5UZDbCZ8s4Q" role="2OqNvi">
<ref role="2Oxat5" to="5tos:6faGdFAiGHk" resolve="inlinedTargetRules" />
<node concept="2OqwBi" id="5UZDbCZ8rU$" role="2GsD0m">
<node concept="37vLTw" id="5UZDbCZ8rCU" role="2Oq$k0">
<ref role="3cqZAo" node="6faGdF_JNe$" resolve="inliner" />
</node>
<node concept="2OwXpG" id="5UZDbCZ8s4Q" role="2OqNvi">
<ref role="2Oxat5" to="5tos:6faGdFAiGHk" resolve="inlinedTargetRules" />
</node>
</node>
</node>
</node>
......
inca-translation/solutions/TypeLangTest/TypeLangTest.msd
View file @ 2eadac01
......@@ -12,6 +12,7 @@
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f7521a8a-f887-420a-b23b-8fffa9357b8f:STLCN" version="0" />
<language slang="l:ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71:TypeLang" version="0" />
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
......
inca-translation/solutions/TypeLangTest/models/test_genInca.mps
View file @ 2eadac01
......@@ -437,7 +437,7 @@
</node>
<node concept="1FtGIX" id="2U2uJPpu3RF" role="1FvzS5" />
</node>
<node concept="1F53FG" id="2U2uJPpd3fX" role="1FufQt" />
<node concept="1F53FG" id="68JnpgkWw14" role="1FufQt" />
<node concept="1FvUVj" id="2U2uJPpd3fY" role="1FufQt">
<property role="TrG5h" value="infer Zero" />
<node concept="1ROOy3" id="2U2uJPpu3BN" role="1FvUVk">
......
inca-translation/solutions/TypeLangTest/models/test_single.mps
View file @ 2eadac01
......@@ -92,7 +92,7 @@
</node>
<node concept="1FtGBS" id="6G$bWLkr_bk" role="1FvzHI">
<ref role="1FtGBW" to="5va7:1Da9ityUTbh" resolve="Term" />
<node concept="2jlkjo" id="2KaZpbam0US" role="1FtGIM" />
<node concept="2jlkjo" id="68JnpgkWv8w" role="1FtGIM" />
</node>
<node concept="1FtGIX" id="6G$bWLkr_bm" role="1FsQh1">
<property role="1FtGIY" value="=&gt;" />
......@@ -126,7 +126,6 @@
</node>
<node concept="1FtGIX" id="6G$bWLkr_b$" role="1FvzSA" />
</node>
<node concept="1F53FG" id="6G$bWLkr_be" role="1FufQt" />
<node concept="1F53FG" id="1t5MWi46nxK" role="1FufQt" />
<node concept="1FvzHF" id="6G$bWLkr_b_" role="1FufQt">
<property role="TrG5h" value="lookup" />
......
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