Introduce QueryKind. Fix the kinds of typechecking queries. Avoid directly linking the queries in types aspect.
This commit is contained in:
Fedor Isakov
parent
49296df88f
commit
2de4d69781
|
|
@ -18,7 +18,7 @@
|
|||
<modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd" folder="typechecking.test" />
|
||||
<modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.testlang.sandbox/jetbrains.mps.typechecking.testlang.sandbox.msd" folder="typechecking.test" />
|
||||
<modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd" folder="typechecking.ui" />
|
||||
<modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" folder="typechecking" />
|
||||
<modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" folder="typechecking.service" />
|
||||
<modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" folder="typesystem2" />
|
||||
<modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl" folder="typesystem2" />
|
||||
<modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd" folder="typesystem2" />
|
||||
|
|
|
|||
32
build.xml
32
build.xml
|
|
@ -2017,7 +2017,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -2047,6 +2047,9 @@
|
|||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
|
||||
|
|
@ -2054,6 +2057,9 @@
|
|||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
|
|
@ -2075,6 +2081,7 @@
|
|||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
|
||||
|
|
@ -2084,7 +2091,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2#4578927328670739933" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2#4578927328670739933" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -2115,6 +2122,9 @@
|
|||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
|
||||
|
|
@ -2122,6 +2132,9 @@
|
|||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
|
|
@ -2141,6 +2154,7 @@
|
|||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor-generator.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
|
||||
</classpath>
|
||||
|
|
@ -2575,7 +2589,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -2598,18 +2612,24 @@
|
|||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
|
|
@ -2699,7 +2719,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.sample, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.typechecking.sample, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -2720,6 +2740,7 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
|
||||
|
|
@ -2729,6 +2750,7 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-test.jar" />
|
||||
<fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
|
||||
<dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
|
||||
<dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
|
||||
<dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
|
||||
</dependencies>
|
||||
<languageVersions>
|
||||
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
|
||||
|
|
@ -60,6 +61,7 @@
|
|||
<module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
|
||||
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
|
||||
<module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
|
||||
<module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
|
||||
<module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
|
||||
</dependencyVersions>
|
||||
<extendedLanguages>
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@
|
|||
<import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.rule)" />
|
||||
<import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.typesystem2.macro)" />
|
||||
<import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
|
||||
<import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
|
||||
<import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" implicit="true" />
|
||||
</imports>
|
||||
<registry>
|
||||
|
|
@ -128,6 +129,9 @@
|
|||
<concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
|
||||
<child id="1164991057263" name="throwable" index="YScLw" />
|
||||
</concept>
|
||||
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
|
||||
<reference id="1144433057691" name="classifier" index="1PxDUh" />
|
||||
</concept>
|
||||
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
|
||||
<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" />
|
||||
|
|
@ -622,6 +626,7 @@
|
|||
</concept>
|
||||
<concept id="7871500063866331595" name="jetbrains.mps.lang.typesystem2.structure.Query" flags="ng" index="92CTh">
|
||||
<child id="7871500063866331596" name="queryStage" index="92CTm" />
|
||||
<child id="3026409000513569515" name="queryKind" index="2_lZgo" />
|
||||
</concept>
|
||||
<concept id="6928531011217292466" name="jetbrains.mps.lang.typesystem2.structure.IsfreeVariableConstraint" flags="ng" index="2aLmEc" />
|
||||
<concept id="6928531011217258898" name="jetbrains.mps.lang.typesystem2.structure.LogicVariableConstraint" flags="ng" index="2aLIYG">
|
||||
|
|
@ -20154,7 +20159,7 @@
|
|||
</node>
|
||||
</node>
|
||||
<node concept="92CTh" id="6OXbTD$fto2">
|
||||
<property role="TrG5h" value="typecheck" />
|
||||
<property role="TrG5h" value="Typecheck" />
|
||||
<node concept="2bWyPT" id="6OXbTD$ftqj" role="92CTm">
|
||||
<property role="TrG5h" value="check" />
|
||||
<node concept="3clFbS" id="6OXbTD$ftqk" role="fHCRw">
|
||||
|
|
@ -20193,9 +20198,13 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="10M0yZ" id="2BZXJecEQOM" role="2_lZgo">
|
||||
<ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
|
||||
<ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="92CTh" id="6OXbTD$ftrf">
|
||||
<property role="TrG5h" value="subtypeOf" />
|
||||
<property role="TrG5h" value="SubtypeOf" />
|
||||
<node concept="2bWyPT" id="6OXbTD$fttw" role="92CTm">
|
||||
<property role="TrG5h" value="subtypeOf" />
|
||||
<node concept="3clFbS" id="6OXbTD$fttx" role="fHCRw">
|
||||
|
|
@ -20266,6 +20275,10 @@
|
|||
<node concept="3clFbH" id="6OXbTD$fttZ" role="3cqZAp" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="10M0yZ" id="2BZXJecEQQ5" role="2_lZgo">
|
||||
<ref role="3cqZAo" to="1g4i:4t7Xo7inO_s" resolve="SUBTYPE" />
|
||||
<ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
|
||||
</node>
|
||||
</node>
|
||||
</model>
|
||||
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
<sourcePath />
|
||||
<dependencies>
|
||||
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
|
||||
<dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
|
||||
</dependencies>
|
||||
<languageVersions>
|
||||
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
|
||||
|
|
@ -95,6 +96,11 @@
|
|||
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
|
||||
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
|
||||
<module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
|
||||
<module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
|
||||
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
|
||||
<module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
|
||||
<module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
|
||||
<module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
|
||||
<module reference="3a1f0f04-b5e0-43be-884e-b856bfdeca21(jetbrains.mps.typechecking.testlang)" version="0" />
|
||||
</dependencyVersions>
|
||||
<extendedLanguages />
|
||||
|
|
|
|||
|
|
@ -933,6 +933,18 @@
|
|||
<ref role="3bR37D" to="ffeo:6zkSwmUIjUj" resolve="jetbrains.mps.lang.aspect#3274906159125927726" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="4t7Xo7inQpT" role="3bR37C">
|
||||
<node concept="3bR9La" id="4t7Xo7inQpU" role="1SiIV1">
|
||||
<property role="3bR36h" value="false" />
|
||||
<ref role="3bR37D" to="ffeo:7Kfy9QB6L8Y" resolve="jetbrains.mps.lang.project" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="4t7Xo7i$jSj" role="3bR37C">
|
||||
<node concept="3bR9La" id="4t7Xo7i$jSk" role="1SiIV1">
|
||||
<property role="3bR36h" value="false" />
|
||||
<ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="wfREvqj2G8" role="3bR37C">
|
||||
<node concept="3bR9La" id="wfREvqj2G9" role="1SiIV1">
|
||||
|
|
@ -1326,7 +1338,7 @@
|
|||
</node>
|
||||
<node concept="1SiIV0" id="65DJywFj294" role="3bR37C">
|
||||
<node concept="3bR9La" id="65DJywFj295" role="1SiIV1">
|
||||
<property role="3bR36h" value="false" />
|
||||
<property role="3bR36h" value="true" />
|
||||
<ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.typesystem2.template" />
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -1733,6 +1745,12 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="4t7Xo7iJJJg" role="3bR37C">
|
||||
<node concept="3bR9La" id="4t7Xo7iJJJh" role="1SiIV1">
|
||||
<property role="3bR36h" value="false" />
|
||||
<ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1E1JtA" id="46o4wsH5O3R" role="2G$12L">
|
||||
<property role="BnDLt" value="true" />
|
||||
|
|
|
|||
|
|
@ -38,9 +38,11 @@
|
|||
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
|
||||
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
|
||||
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
|
||||
<module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
|
||||
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
|
||||
<module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
|
||||
<module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
|
||||
<module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
|
||||
<module reference="3ddddf69-9ff0-426b-9365-51ae7356fb82(jetbrains.mps.typechecking.sample)" version="0" />
|
||||
<module reference="1b65dfe8-24ff-41c3-9a3e-70f102942455(jetbrains.mps.typechecking.sample.test)" version="0" />
|
||||
</dependencyVersions>
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
<import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
|
||||
<import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.rule)" />
|
||||
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
|
||||
<import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
|
||||
</imports>
|
||||
<registry>
|
||||
<language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
|
||||
|
|
@ -843,9 +844,10 @@
|
|||
</node>
|
||||
</node>
|
||||
<node concept="liA8E" id="6OXbTD_oqun" role="2OqNvi">
|
||||
<ref role="37wK5l" to="hano:7WKNeR95RPZ" resolve="byFqName" />
|
||||
<node concept="Xl_RD" id="6d0cWF2SWTi" role="37wK5m">
|
||||
<property role="Xl_RC" value="jetbrains.mps.baseLanguageExt.types.typecheck" />
|
||||
<ref role="37wK5l" to="hano:4t7Xo7inmSj" resolve="byKind" />
|
||||
<node concept="10M0yZ" id="2BZXJecMAXy" role="37wK5m">
|
||||
<ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
|
||||
<ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -1251,9 +1253,9 @@
|
|||
<node concept="3cpWsn" id="6$7vuu2wZdr" role="3cpWs9">
|
||||
<property role="TrG5h" value="typeOfExpr" />
|
||||
<node concept="3Tqbb2" id="6$7vuu2wZdp" role="1tU5fm" />
|
||||
<node concept="2YIFZM" id="3IIf9O_uwHs" role="33vP2m">
|
||||
<ref role="37wK5l" to="tj24:3IIf9O_u0Ck" resolve="typeOf" />
|
||||
<ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingFacade" />
|
||||
<node concept="2YIFZM" id="4t7Xo7iw4eI" role="33vP2m">
|
||||
<ref role="37wK5l" to="1g4i:3IIf9O_u0Ck" resolve="typeOf" />
|
||||
<ref role="1Pybhc" to="1g4i:7kaxm0sEy3e" resolve="TypecheckingFacade" />
|
||||
<node concept="2OqwBi" id="14$_tTxxSAt" role="37wK5m">
|
||||
<node concept="37vLTw" id="14$_tTxxSjJ" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="14$_tTxxQ5i" resolve="varo" />
|
||||
|
|
@ -1282,9 +1284,9 @@
|
|||
<node concept="3cpWsn" id="6$7vuu2xGoB" role="3cpWs9">
|
||||
<property role="TrG5h" value="typeOfExpr2" />
|
||||
<node concept="3Tqbb2" id="6$7vuu2xGoC" role="1tU5fm" />
|
||||
<node concept="2YIFZM" id="3IIf9O_uwVw" role="33vP2m">
|
||||
<ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingFacade" />
|
||||
<ref role="37wK5l" to="tj24:3IIf9O_u0Ck" resolve="typeOf" />
|
||||
<node concept="2YIFZM" id="4t7Xo7iw4eJ" role="33vP2m">
|
||||
<ref role="37wK5l" to="1g4i:3IIf9O_u0Ck" resolve="typeOf" />
|
||||
<ref role="1Pybhc" to="1g4i:7kaxm0sEy3e" resolve="TypecheckingFacade" />
|
||||
<node concept="2OqwBi" id="3IIf9O_uwVx" role="37wK5m">
|
||||
<node concept="37vLTw" id="3IIf9O_uwVy" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="14$_tTxxQ5i" resolve="varo" />
|
||||
|
|
@ -1622,9 +1624,9 @@
|
|||
<node concept="3cpWsn" id="3IIf9OA557D" role="3cpWs9">
|
||||
<property role="TrG5h" value="isSubtype" />
|
||||
<node concept="10P_77" id="3IIf9OA557w" role="1tU5fm" />
|
||||
<node concept="2YIFZM" id="3IIf9OA557E" role="33vP2m">
|
||||
<ref role="37wK5l" to="tj24:3IIf9OA4ZMD" resolve="isSubtype" />
|
||||
<ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingFacade" />
|
||||
<node concept="2YIFZM" id="4t7Xo7iw4eK" role="33vP2m">
|
||||
<ref role="37wK5l" to="1g4i:3IIf9OA4ZMD" resolve="isSubtype" />
|
||||
<ref role="1Pybhc" to="1g4i:7kaxm0sEy3e" resolve="TypecheckingFacade" />
|
||||
<node concept="37vLTw" id="3IIf9OA557F" role="37wK5m">
|
||||
<ref role="3cqZAo" node="3IIf9OA4zN5" resolve="typeOfExpr" />
|
||||
</node>
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@
|
|||
<import index="bid0" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.util(jetbrains.mps.logic.reactor/)" />
|
||||
<import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" />
|
||||
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
|
||||
<import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
|
||||
</imports>
|
||||
<registry>
|
||||
<language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
|
||||
|
|
@ -30470,8 +30471,10 @@
|
|||
<node concept="2YIFZL" id="7WKNeR8SP2E" role="jymVt">
|
||||
<property role="TrG5h" value="launchQuery" />
|
||||
<node concept="37vLTG" id="7WKNeR9gygX" role="3clF46">
|
||||
<property role="TrG5h" value="queryFqName" />
|
||||
<node concept="17QB3L" id="7WKNeR9gy_k" role="1tU5fm" />
|
||||
<property role="TrG5h" value="queryKind" />
|
||||
<node concept="3uibUv" id="2Mi2iz0OnfF" role="1tU5fm">
|
||||
<ref role="3uigEE" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="37vLTG" id="7WKNeR8SP2H" role="3clF46">
|
||||
<property role="TrG5h" value="editorComponent" />
|
||||
|
|
@ -30501,7 +30504,7 @@
|
|||
<node concept="1pGfFk" id="7WKNeR8SP2S" role="2ShVmc">
|
||||
<ref role="37wK5l" node="7WKNeR8SQxi" resolve="TypecheckingActions.LaunchQuery" />
|
||||
<node concept="37vLTw" id="7WKNeR9gzZ3" role="37wK5m">
|
||||
<ref role="3cqZAo" node="7WKNeR9gygX" resolve="queryFqName" />
|
||||
<ref role="3cqZAo" node="7WKNeR9gygX" resolve="queryKind" />
|
||||
</node>
|
||||
<node concept="37vLTw" id="7WKNeR8SP2U" role="37wK5m">
|
||||
<ref role="3cqZAo" node="7WKNeR8SP2H" resolve="editorComponent" />
|
||||
|
|
@ -31525,8 +31528,10 @@
|
|||
<node concept="2tJIrI" id="7WKNeR8SQxh" role="jymVt" />
|
||||
<node concept="3clFbW" id="7WKNeR8SQxi" role="jymVt">
|
||||
<node concept="37vLTG" id="7WKNeR9ahrT" role="3clF46">
|
||||
<property role="TrG5h" value="queryFqName" />
|
||||
<node concept="17QB3L" id="7WKNeR9ahN6" role="1tU5fm" />
|
||||
<property role="TrG5h" value="queryKind" />
|
||||
<node concept="3uibUv" id="2Mi2iz0Onwr" role="1tU5fm">
|
||||
<ref role="3uigEE" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="37vLTG" id="7WKNeR8SQxl" role="3clF46">
|
||||
<property role="TrG5h" value="editorComponent" />
|
||||
|
|
@ -31570,7 +31575,7 @@
|
|||
</node>
|
||||
</node>
|
||||
<node concept="37vLTw" id="7WKNeR9fm7l" role="37vLTx">
|
||||
<ref role="3cqZAo" node="7WKNeR9ahrT" resolve="queryFqName" />
|
||||
<ref role="3cqZAo" node="7WKNeR9ahrT" resolve="queryKind" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -31871,7 +31876,9 @@
|
|||
<node concept="312cEg" id="7WKNeR9fm7b" role="jymVt">
|
||||
<property role="TrG5h" value="queryFqName" />
|
||||
<node concept="3Tm6S6" id="7WKNeR9fm7c" role="1B3o_S" />
|
||||
<node concept="17QB3L" id="7WKNeR9fm7e" role="1tU5fm" />
|
||||
<node concept="3uibUv" id="2Mi2iz0OnNw" role="1tU5fm">
|
||||
<ref role="3uigEE" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2tJIrI" id="6hqFpWnfjsp" role="jymVt" />
|
||||
|
|
@ -33741,30 +33748,15 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3clFbH" id="7WKNeR8RdQu" role="3cqZAp" />
|
||||
<node concept="3SKdUt" id="6OXbTD_AKjZ" role="3cqZAp">
|
||||
<node concept="3SKdUq" id="6OXbTD_AKk1" role="3SKWNk">
|
||||
<property role="3SKdUp" value="FIXME: refactor into an extension point to avoid having to hardcode fqname" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3cpWs8" id="7WKNeR9hhkg" role="3cqZAp">
|
||||
<node concept="3cpWsn" id="7WKNeR9hhkh" role="3cpWs9">
|
||||
<property role="TrG5h" value="fqueryFqName" />
|
||||
<node concept="17QB3L" id="7WKNeR9hhkf" role="1tU5fm" />
|
||||
<node concept="Xl_RD" id="6d0cWF2SUMI" role="33vP2m">
|
||||
<property role="Xl_RC" value="jetbrains.mps.baseLanguageExt.types.typecheck" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3clFbH" id="6d0cWF2SWaM" role="3cqZAp" />
|
||||
<node concept="3clFbF" id="7WKNeR8RdQN" role="3cqZAp">
|
||||
<node concept="2OqwBi" id="7WKNeR8RdQO" role="3clFbG">
|
||||
<node concept="2OqwBi" id="7WKNeR8RdQP" role="2Oq$k0">
|
||||
<node concept="2YIFZM" id="7WKNeR8TaPY" role="2Oq$k0">
|
||||
<ref role="37wK5l" node="7WKNeR8SP2E" resolve="launchQuery" />
|
||||
<ref role="1Pybhc" node="6hqFpWnf9Mu" resolve="TypecheckingActions" />
|
||||
<node concept="37vLTw" id="7WKNeR9hhkt" role="37wK5m">
|
||||
<ref role="3cqZAo" node="7WKNeR9hhkh" resolve="fqueryFqName" />
|
||||
<node concept="10M0yZ" id="2Mi2iz0OoOv" role="37wK5m">
|
||||
<ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
|
||||
<ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
|
||||
</node>
|
||||
<node concept="2OqwBi" id="7WKNeR8TaPZ" role="37wK5m">
|
||||
<node concept="2WthIp" id="7WKNeR8TaQ0" role="2Oq$k0" />
|
||||
|
|
@ -33869,22 +33861,6 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3clFbH" id="3IIf9O_okkg" role="3cqZAp" />
|
||||
<node concept="3SKdUt" id="6d0cWF2SWTd" role="3cqZAp">
|
||||
<node concept="3SKdUq" id="6d0cWF2SWTe" role="3SKWNk">
|
||||
<property role="3SKdUp" value="FIXME: refactor into an extension point to avoid having to hardcode fqname" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3cpWs8" id="6d0cWF2SWTf" role="3cqZAp">
|
||||
<node concept="3cpWsn" id="6d0cWF2SWTg" role="3cpWs9">
|
||||
<property role="TrG5h" value="fqueryFqName" />
|
||||
<node concept="17QB3L" id="6d0cWF2SWTh" role="1tU5fm" />
|
||||
<node concept="Xl_RD" id="6d0cWF2SWTi" role="33vP2m">
|
||||
<property role="Xl_RC" value="jetbrains.mps.baseLanguageExt.types.typecheck" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3clFbH" id="3IIf9O_okkE" role="3cqZAp" />
|
||||
<node concept="3clFbF" id="3IIf9O_okkF" role="3cqZAp">
|
||||
<node concept="2OqwBi" id="3IIf9O_okkG" role="3clFbG">
|
||||
<node concept="2OqwBi" id="3IIf9O_oo3r" role="2Oq$k0">
|
||||
|
|
@ -33892,8 +33868,9 @@
|
|||
<node concept="2YIFZM" id="3IIf9O_okkI" role="2Oq$k0">
|
||||
<ref role="37wK5l" node="7WKNeR8SP2E" resolve="launchQuery" />
|
||||
<ref role="1Pybhc" node="6hqFpWnf9Mu" resolve="TypecheckingActions" />
|
||||
<node concept="37vLTw" id="6d0cWF2SY5R" role="37wK5m">
|
||||
<ref role="3cqZAo" node="6d0cWF2SWTg" resolve="fqueryFqName" />
|
||||
<node concept="10M0yZ" id="2Mi2iz0OpPz" role="37wK5m">
|
||||
<ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
|
||||
<ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
|
||||
</node>
|
||||
<node concept="2OqwBi" id="3IIf9O_okkK" role="37wK5m">
|
||||
<node concept="2WthIp" id="3IIf9O_okkL" role="2Oq$k0" />
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
<dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
|
||||
<dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
|
||||
<dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
|
||||
<dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
|
||||
<dependency reexport="true">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
|
||||
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
|
||||
<dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
|
||||
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -79,7 +79,7 @@
|
|||
<node concept="3clFbS" id="3IIf9O_EzTq" role="1Koe22">
|
||||
<node concept="3clFbF" id="3IIf9O_E_tv" role="3cqZAp">
|
||||
<node concept="1niqFM" id="3IIf9O_E_tt" role="3clFbG">
|
||||
<property role="1npUBZ" value="jetbrains.mps.typechecking.service.TypecheckingFacade" />
|
||||
<property role="1npUBZ" value="jetbrains.mps.typechecking.TypecheckingFacade" />
|
||||
<property role="1npL6y" value="typeOf" />
|
||||
<node concept="10Nm6u" id="3IIf9O_E_u8" role="2U24H$">
|
||||
<node concept="29HgVG" id="3IIf9O_E_u9" role="lGtFl">
|
||||
|
|
|
|||
|
|
@ -54,8 +54,10 @@
|
|||
<import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.typesystem2.program)" />
|
||||
<import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
|
||||
<import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
|
||||
<import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
|
||||
<import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" />
|
||||
<import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
|
||||
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
|
||||
<import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" implicit="true" />
|
||||
<import index="z8tp" ref="r:5bfbd177-208e-4d27-b74c-2ebd2a92eb80(jetbrains.mps.lang.smodel.types.structure)" implicit="true" />
|
||||
</imports>
|
||||
<registry>
|
||||
|
|
@ -20851,6 +20853,39 @@
|
|||
</node>
|
||||
</node>
|
||||
<node concept="2tJIrI" id="6OXbTD$fBKv" role="jymVt" />
|
||||
<node concept="3clFb_" id="4t7Xo7icnxD" role="jymVt">
|
||||
<property role="1EzhhJ" value="false" />
|
||||
<property role="2aFKle" value="false" />
|
||||
<property role="TrG5h" value="kind" />
|
||||
<node concept="3Tm1VV" id="4t7Xo7icnxF" role="1B3o_S" />
|
||||
<node concept="3uibUv" id="4t7Xo7insnx" role="3clF45">
|
||||
<ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
|
||||
</node>
|
||||
<node concept="3clFbS" id="4t7Xo7icnxH" role="3clF47">
|
||||
<node concept="3clFbF" id="2BZXJecG5i6" role="3cqZAp">
|
||||
<node concept="10Nm6u" id="2BZXJecG5i5" role="3clFbG">
|
||||
<node concept="29HgVG" id="2BZXJecG5iA" role="lGtFl">
|
||||
<node concept="3NFfHV" id="2BZXJecG5iQ" role="3NFExx">
|
||||
<node concept="3clFbS" id="2BZXJecG5iR" role="2VODD2">
|
||||
<node concept="3clFbF" id="2BZXJecG5mX" role="3cqZAp">
|
||||
<node concept="2OqwBi" id="2BZXJecG5xy" role="3clFbG">
|
||||
<node concept="30H73N" id="2BZXJecG5mW" role="2Oq$k0" />
|
||||
<node concept="3TrEf2" id="2BZXJecG6x1" role="2OqNvi">
|
||||
<ref role="3Tt5mk" to="wq2x:2BZXJecE0bF" resolve="queryKind" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2AHcQZ" id="4t7Xo7icnxI" role="2AJF6D">
|
||||
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2tJIrI" id="4t7Xo7icolH" role="jymVt" />
|
||||
<node concept="3clFb_" id="6OXbTD$jihG" role="jymVt">
|
||||
<property role="1EzhhJ" value="false" />
|
||||
<property role="TrG5h" value="usedHandlersFqNames" />
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
<dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
|
||||
<dependency reexport="false">df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)</dependency>
|
||||
<dependency reexport="false">96ee7a94-411d-4cf8-9b94-96cad7e52411(jetbrains.mps.baseLanguage.jdk7)</dependency>
|
||||
<dependency reexport="false">86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)</dependency>
|
||||
<dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
|
||||
</dependencies>
|
||||
<languageVersions>
|
||||
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
|
||||
|
|
@ -74,6 +76,7 @@
|
|||
<module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
|
||||
<module reference="3ac18869-0828-4401-abad-822a47bf83f1(jetbrains.mps.lang.descriptor#9020561928507175817)" version="0" />
|
||||
<module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
|
||||
<module reference="86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)" version="0" />
|
||||
<module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
|
||||
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
|
||||
<module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.typesystem2)" version="0" />
|
||||
|
|
@ -84,6 +87,7 @@
|
|||
<module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
|
||||
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
|
||||
<module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
|
||||
<module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
|
||||
<module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
|
||||
</dependencyVersions>
|
||||
<mapping-priorities />
|
||||
|
|
|
|||
|
|
@ -6808,26 +6808,26 @@
|
|||
<node concept="24kQdi" id="7P_FdVQ_S6G">
|
||||
<ref role="1XX52x" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
|
||||
<node concept="3EZMnI" id="7P_FdVQ_S6R" role="2wV5jI">
|
||||
<node concept="3F0A7n" id="7P_FdVQ_S77" role="3EZMnx">
|
||||
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
|
||||
<node concept="ljvvj" id="3IIf9O_dj_X" role="3F10Kt">
|
||||
<node concept="3F0ifn" id="2BZXJecJG8q" role="3EZMnx">
|
||||
<property role="3F0ifm" value="(" />
|
||||
<node concept="11LMrY" id="2BZXJecKocH" role="3F10Kt">
|
||||
<property role="VOm3f" value="true" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3F0ifn" id="6OXbTD$fGLE" role="3EZMnx">
|
||||
<property role="3F0ifm" value="" />
|
||||
<node concept="ljvvj" id="6OXbTD$fGLF" role="3F10Kt">
|
||||
<property role="VOm3f" value="true" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3F0ifn" id="6OXbTD$fGJW" role="3EZMnx">
|
||||
<property role="3F0ifm" value="stage:" />
|
||||
</node>
|
||||
<node concept="3F0A7n" id="6OXbTD$fGKx" role="3EZMnx">
|
||||
<property role="1$x2rV" value="initial" />
|
||||
<property role="1O74Pk" value="true" />
|
||||
<ref role="1NtTu8" to="wq2x:6OXbTD$fGCg" resolve="stage" />
|
||||
<node concept="ljvvj" id="6OXbTD$fGKI" role="3F10Kt">
|
||||
</node>
|
||||
<node concept="3F0ifn" id="2BZXJecJG9E" role="3EZMnx">
|
||||
<property role="3F0ifm" value=")" />
|
||||
<node concept="11L4FC" id="2BZXJecKocJ" role="3F10Kt">
|
||||
<property role="VOm3f" value="true" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3F0A7n" id="7P_FdVQ_S77" role="3EZMnx">
|
||||
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
|
||||
<node concept="ljvvj" id="2BZXJecJGb_" role="3F10Kt">
|
||||
<property role="VOm3f" value="true" />
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -6852,12 +6852,30 @@
|
|||
<node concept="24kQdi" id="6OXbTD$dU7D">
|
||||
<ref role="1XX52x" to="wq2x:6OXbTD$dU7b" resolve="Query" />
|
||||
<node concept="3EZMnI" id="6OXbTD$dU7F" role="2wV5jI">
|
||||
<node concept="3F0ifn" id="2BZXJecJG7U" role="3EZMnx">
|
||||
<property role="3F0ifm" value="query" />
|
||||
</node>
|
||||
<node concept="3F0A7n" id="6OXbTD$dU81" role="3EZMnx">
|
||||
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
|
||||
<node concept="ljvvj" id="6OXbTD$dU8h" role="3F10Kt">
|
||||
<property role="VOm3f" value="true" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3F0ifn" id="2BZXJecEa_Y" role="3EZMnx">
|
||||
<property role="3F0ifm" value="" />
|
||||
<node concept="ljvvj" id="2BZXJecEa_Z" role="3F10Kt">
|
||||
<property role="VOm3f" value="true" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3F0ifn" id="2BZXJecEa_K" role="3EZMnx">
|
||||
<property role="3F0ifm" value="kind:" />
|
||||
</node>
|
||||
<node concept="3F1sOY" id="2BZXJecEa_m" role="3EZMnx">
|
||||
<ref role="1NtTu8" to="wq2x:2BZXJecE0bF" resolve="queryKind" />
|
||||
<node concept="ljvvj" id="2BZXJecEaAS" role="3F10Kt">
|
||||
<property role="VOm3f" value="true" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3F0ifn" id="6OXbTD$dU8b" role="3EZMnx">
|
||||
<property role="3F0ifm" value="" />
|
||||
<node concept="ljvvj" id="6OXbTD$dU8j" role="3F10Kt">
|
||||
|
|
@ -6867,6 +6885,9 @@
|
|||
<node concept="3F2HdR" id="6OXbTD$dU7M" role="3EZMnx">
|
||||
<ref role="1NtTu8" to="wq2x:6OXbTD$dU7c" resolve="queryStage" />
|
||||
<node concept="l2Vlx" id="6OXbTD$dU7O" role="2czzBx" />
|
||||
<node concept="lj46D" id="2BZXJecJGc3" role="3F10Kt">
|
||||
<property role="VOm3f" value="true" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="l2Vlx" id="6OXbTD$dU7I" role="2iSdaV" />
|
||||
</node>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,10 @@
|
|||
<use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="2" />
|
||||
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
|
||||
</languages>
|
||||
<imports />
|
||||
<imports>
|
||||
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
|
||||
<import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
|
||||
</imports>
|
||||
<registry>
|
||||
<language id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect">
|
||||
<concept id="3433054418424672374" name="jetbrains.mps.lang.aspect.structure.SimpleLanguageAspectDescriptor" flags="ng" index="3vrhyV">
|
||||
|
|
|
|||
|
|
@ -1636,6 +1636,13 @@
|
|||
<property role="19KtqR" value="true" />
|
||||
<property role="34LRSv" value="query" />
|
||||
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
|
||||
<node concept="1TJgyj" id="2BZXJecE0bF" role="1TKVEi">
|
||||
<property role="IQ2ns" value="3026409000513569515" />
|
||||
<property role="20lmBu" value="aggregation" />
|
||||
<property role="20kJfa" value="queryKind" />
|
||||
<property role="20lbJX" value="1" />
|
||||
<ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
|
||||
</node>
|
||||
<node concept="1TJgyj" id="6OXbTD$dU7c" role="1TKVEi">
|
||||
<property role="IQ2ns" value="7871500063866331596" />
|
||||
<property role="20lmBu" value="aggregation" />
|
||||
|
|
|
|||
|
|
@ -1688,5 +1688,36 @@
|
|||
<ref role="1YaFvo" to="wq2x:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1YbPZF" id="2BZXJecE0cj">
|
||||
<property role="TrG5h" value="typeof_Query" />
|
||||
<node concept="3clFbS" id="2BZXJecE0ck" role="18ibNy">
|
||||
<node concept="1ZobV4" id="2BZXJecE0Nr" role="3cqZAp">
|
||||
<property role="3wDh2S" value="true" />
|
||||
<node concept="mw_s8" id="2BZXJecE0Oa" role="1ZfhKB">
|
||||
<node concept="2c44tf" id="2BZXJecE0O6" role="mwGJk">
|
||||
<node concept="3uibUv" id="2BZXJecE0Pl" role="2c44tc">
|
||||
<ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="mw_s8" id="2BZXJecE0Nu" role="1ZfhK$">
|
||||
<node concept="1Z2H0r" id="2BZXJecE0cu" role="mwGJk">
|
||||
<node concept="2OqwBi" id="2BZXJecE0n6" role="1Z2MuG">
|
||||
<node concept="1YBJjd" id="2BZXJecE0eg" role="2Oq$k0">
|
||||
<ref role="1YBMHb" node="2BZXJecE0cm" resolve="query" />
|
||||
</node>
|
||||
<node concept="3TrEf2" id="2BZXJecE0yD" role="2OqNvi">
|
||||
<ref role="3Tt5mk" to="wq2x:2BZXJecE0bF" resolve="queryKind" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1YaCAy" id="2BZXJecE0cm" role="1YuTPh">
|
||||
<property role="TrG5h" value="query" />
|
||||
<ref role="1YaFvo" to="wq2x:6OXbTD$dU7b" resolve="Query" />
|
||||
</node>
|
||||
</node>
|
||||
</model>
|
||||
|
||||
|
|
|
|||
|
|
@ -12199,6 +12199,32 @@
|
|||
</node>
|
||||
</node>
|
||||
<node concept="2tJIrI" id="7WKNeR98smD" role="jymVt" />
|
||||
<node concept="3clFb_" id="4t7Xo7inmSj" role="jymVt">
|
||||
<property role="TrG5h" value="byKind" />
|
||||
<node concept="37vLTG" id="4t7Xo7inmSk" role="3clF46">
|
||||
<property role="TrG5h" value="queryKind" />
|
||||
<node concept="3uibUv" id="4t7Xo7inyd1" role="1tU5fm">
|
||||
<ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3uibUv" id="4t7Xo7inmSm" role="3clF45">
|
||||
<ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
|
||||
</node>
|
||||
<node concept="3Tm1VV" id="4t7Xo7inmSn" role="1B3o_S" />
|
||||
<node concept="3clFbS" id="4t7Xo7inmSo" role="3clF47">
|
||||
<node concept="3clFbF" id="4t7Xo7inmSp" role="3cqZAp">
|
||||
<node concept="3EllGN" id="4t7Xo7inmSq" role="3clFbG">
|
||||
<node concept="37vLTw" id="4t7Xo7inmSr" role="3ElVtu">
|
||||
<ref role="3cqZAo" node="4t7Xo7inmSk" resolve="queryKind" />
|
||||
</node>
|
||||
<node concept="37vLTw" id="4t7Xo7inzKG" role="3ElQJh">
|
||||
<ref role="3cqZAo" node="4t7Xo7inyhm" resolve="kind2queryTemplate" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2tJIrI" id="4t7Xo7inmSi" role="jymVt" />
|
||||
<node concept="3clFb_" id="7WKNeR98sU4" role="jymVt">
|
||||
<property role="TrG5h" value="ruleTemplates" />
|
||||
<node concept="37vLTG" id="7WKNeR98uXx" role="3clF46">
|
||||
|
|
@ -12435,6 +12461,41 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3clFbJ" id="4t7Xo7in$su" role="3cqZAp">
|
||||
<node concept="3clFbS" id="4t7Xo7in$sw" role="3clFbx">
|
||||
<node concept="3clFbF" id="4t7Xo7inGd8" role="3cqZAp">
|
||||
<node concept="37vLTI" id="4t7Xo7inJsK" role="3clFbG">
|
||||
<node concept="2GrUjf" id="4t7Xo7inMuK" role="37vLTx">
|
||||
<ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
|
||||
</node>
|
||||
<node concept="3EllGN" id="4t7Xo7inGyT" role="37vLTJ">
|
||||
<node concept="2OqwBi" id="4t7Xo7inGHd" role="3ElVtu">
|
||||
<node concept="2GrUjf" id="4t7Xo7inG__" role="2Oq$k0">
|
||||
<ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
|
||||
</node>
|
||||
<node concept="liA8E" id="4t7Xo7inHtO" role="2OqNvi">
|
||||
<ref role="37wK5l" to="i348:4t7Xo7icmmF" resolve="kind" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="37vLTw" id="4t7Xo7inGd6" role="3ElQJh">
|
||||
<ref role="3cqZAo" node="4t7Xo7inyhm" resolve="kind2queryTemplate" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3y3z36" id="4t7Xo7inBbP" role="3clFbw">
|
||||
<node concept="10Nm6u" id="4t7Xo7inFzN" role="3uHU7w" />
|
||||
<node concept="2OqwBi" id="4t7Xo7in_do" role="3uHU7B">
|
||||
<node concept="2GrUjf" id="4t7Xo7in_5Z" role="2Oq$k0">
|
||||
<ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
|
||||
</node>
|
||||
<node concept="liA8E" id="4t7Xo7in_W9" role="2OqNvi">
|
||||
<ref role="37wK5l" to="i348:4t7Xo7icmmF" resolve="kind" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3clFbH" id="6OXbTD$owiJ" role="3cqZAp" />
|
||||
<node concept="3cpWs8" id="7WKNeR97HMt" role="3cqZAp">
|
||||
<node concept="3cpWsn" id="7WKNeR97HMu" role="3cpWs9">
|
||||
|
|
@ -12700,6 +12761,28 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="312cEg" id="4t7Xo7inyhm" role="jymVt">
|
||||
<property role="TrG5h" value="kind2queryTemplate" />
|
||||
<node concept="3Tm6S6" id="4t7Xo7inyhn" role="1B3o_S" />
|
||||
<node concept="3rvAFt" id="4t7Xo7inyho" role="1tU5fm">
|
||||
<node concept="3uibUv" id="4t7Xo7inzDS" role="3rvQeY">
|
||||
<ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
|
||||
</node>
|
||||
<node concept="3uibUv" id="4t7Xo7inyhq" role="3rvSg0">
|
||||
<ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2ShNRf" id="4t7Xo7inyhr" role="33vP2m">
|
||||
<node concept="3rGOSV" id="4t7Xo7inyhs" role="2ShVmc">
|
||||
<node concept="3uibUv" id="4t7Xo7inzII" role="3rHrn6">
|
||||
<ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
|
||||
</node>
|
||||
<node concept="3uibUv" id="4t7Xo7inyhu" role="3rHtpV">
|
||||
<ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="312cEg" id="6OXbTD$nH5r" role="jymVt">
|
||||
<property role="TrG5h" value="queryTemplate2stage_templates" />
|
||||
<node concept="3Tm6S6" id="6OXbTD$nH5s" role="1B3o_S" />
|
||||
|
|
|
|||
|
|
@ -2051,6 +2051,17 @@
|
|||
<node concept="3Tm1VV" id="6OXbTD$iO0B" role="1B3o_S" />
|
||||
<node concept="3clFbS" id="6OXbTD$iO0C" role="3clF47" />
|
||||
</node>
|
||||
<node concept="2tJIrI" id="4t7Xo7iclkP" role="jymVt" />
|
||||
<node concept="3clFb_" id="4t7Xo7icmmF" role="jymVt">
|
||||
<property role="1EzhhJ" value="true" />
|
||||
<property role="2aFKle" value="false" />
|
||||
<property role="TrG5h" value="kind" />
|
||||
<node concept="3clFbS" id="4t7Xo7icmmI" role="3clF47" />
|
||||
<node concept="3Tm1VV" id="4t7Xo7icmmJ" role="1B3o_S" />
|
||||
<node concept="3uibUv" id="4t7Xo7intc6" role="3clF45">
|
||||
<ref role="3uigEE" node="4t7Xo7inshN" resolve="QueryKind" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2tJIrI" id="6OXbTD$iO0D" role="jymVt" />
|
||||
<node concept="3clFb_" id="6OXbTD$iO0E" role="jymVt">
|
||||
<property role="1EzhhJ" value="true" />
|
||||
|
|
@ -2214,5 +2225,9 @@
|
|||
<node concept="3Tm1VV" id="7P_FdVQ_jCp" role="1B3o_S" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3HP615" id="4t7Xo7inshN">
|
||||
<property role="TrG5h" value="QueryKind" />
|
||||
<node concept="3Tm1VV" id="4t7Xo7inshO" role="1B3o_S" />
|
||||
</node>
|
||||
</model>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue