Minor refactoring: extract constants for building terms
This commit is contained in:
Fedor Isakov
parent
52725b4826
commit
b3c57465fc
88
build.xml
88
build.xml
|
|
@ -303,6 +303,7 @@
|
|||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
|
||||
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
|
||||
<module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
|
||||
<module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
|
||||
<module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
|
||||
<module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
|
||||
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="cl" />
|
||||
|
|
@ -2479,6 +2480,7 @@
|
|||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
|
||||
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
|
||||
<module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
|
||||
<module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
|
||||
<module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
|
||||
<module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
|
||||
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="cl" />
|
||||
|
|
@ -4078,7 +4080,7 @@
|
|||
<delete dir="${build.layout}" />
|
||||
</target>
|
||||
|
||||
<target name="compileJava" depends="java.compile.jetbrains.mps.coderules.build, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking#01, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.coderules.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.typechecking.testlang, java.compile.jetbrains.mps.typechecking.testlang#3575255234175341581, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.coderules.typechecking.test, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.lang.controlflow, java.compile.jetbrains.mps.lang.controlflow#01, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.controlflow.ui, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.ui, java.compile.jetbrains.mps.coderules.test" />
|
||||
<target name="compileJava" depends="java.compile.jetbrains.mps.coderules.build, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking#01, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.coderules.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.typechecking.testlang, java.compile.jetbrains.mps.typechecking.testlang#3575255234175341581, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.coderules.typechecking.test, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.lang.controlflow, java.compile.jetbrains.mps.lang.controlflow#01, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.controlflow.ui, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.ui, java.compile.jetbrains.mps.coderules.test" />
|
||||
|
||||
<target name="processResources" />
|
||||
|
||||
|
|
@ -4225,23 +4227,17 @@
|
|||
<module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.build/jetbrains.mps.coderules.build.msd" />
|
||||
<module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.runtime/jetbrains.mps.coderules.runtime.msd" />
|
||||
<module file="${basedir}/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" />
|
||||
<module file="${basedir}/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" />
|
||||
</chunk>
|
||||
<chunk bootstrap="true">
|
||||
<module file="${basedir}/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd" bootstrap="true" />
|
||||
<module file="${basedir}/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" />
|
||||
</chunk>
|
||||
<chunk>
|
||||
<module file="${basedir}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd" />
|
||||
<module file="${basedir}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd" />
|
||||
<module file="${basedir}/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" />
|
||||
</chunk>
|
||||
<chunk bootstrap="true">
|
||||
<module file="${basedir}/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd" />
|
||||
<module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd" bootstrap="true" />
|
||||
<module file="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl" />
|
||||
<module file="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl" bootstrap="true" />
|
||||
<module file="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd" bootstrap="true" />
|
||||
<module file="${basedir}/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd" bootstrap="true" />
|
||||
<module file="${basedir}/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl" />
|
||||
<module file="${basedir}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd" />
|
||||
<module file="${basedir}/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" />
|
||||
<module file="${basedir}/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" />
|
||||
<module file="${basedir}/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" bootstrap="true" />
|
||||
</chunk>
|
||||
<chunk>
|
||||
|
|
@ -4251,6 +4247,8 @@
|
|||
<module file="${basedir}/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd" />
|
||||
<module file="${basedir}/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd" />
|
||||
<module file="${basedir}/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl" />
|
||||
<module file="${basedir}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd" />
|
||||
<module file="${basedir}/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" />
|
||||
<module file="${basedir}/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl" />
|
||||
</chunk>
|
||||
<chunk>
|
||||
|
|
@ -4288,7 +4286,51 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.logic.runtime" depends="java.compile.jetbrains.mps.coderules.runtime, fetchDependencies">
|
||||
<target name="java.compile.java.modules.cycle.1" depends="java.compile.jetbrains.mps.coderules.runtime, fetchDependencies">
|
||||
<mkdir dir="${build.tmp}/java.modules.cycle.1" />
|
||||
<javac destdir="${build.tmp}/java.modules.cycle.1" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
|
||||
<compilerarg value="-Xlint:none" />
|
||||
<src>
|
||||
<path location="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/source_gen" />
|
||||
<path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" />
|
||||
<path location="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen" />
|
||||
</src>
|
||||
<classpath>
|
||||
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-context.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-generator.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-references.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.14.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.logic.runtime" depends="java.compile.jetbrains.mps.coderules.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -4326,6 +4368,7 @@
|
|||
<fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
|
||||
<pathelement path="${build.tmp}/java.modules.cycle.1" />
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
|
|
@ -5543,7 +5586,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.coderules.template" depends="java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.lang.coderules.template" depends="java.compile.jetbrains.mps.coderules.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -5571,7 +5614,6 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.14.jar" />
|
||||
|
|
@ -5582,11 +5624,12 @@
|
|||
<fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
|
||||
<pathelement path="${build.tmp}/java.modules.cycle.1" />
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.coderules.runtime" depends="java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.lang.coderules.runtime" depends="java.compile.jetbrains.mps.coderules.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -5614,8 +5657,6 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.14.jar" />
|
||||
|
|
@ -5627,6 +5668,7 @@
|
|||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
|
||||
<pathelement path="${build.tmp}/java.modules.cycle.1" />
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
|
|
@ -6073,11 +6115,6 @@
|
|||
<target name="cleanSources">
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.build/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/generator/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.test/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" />
|
||||
|
|
@ -6086,13 +6123,16 @@
|
|||
<delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/generator/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/generator/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/generator/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/generator/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/generator/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.test/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/source_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/test_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.test/test_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/test_gen" />
|
||||
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.test/test_gen" />
|
||||
</target>
|
||||
</project>
|
||||
|
|
@ -45,6 +45,7 @@
|
|||
<import index="7ed7" ref="r:48788b84-8ecd-41f5-ad03-cc8c09b1f186(jetbrains.mps.lang.coderules.analysis)" />
|
||||
<import index="i8bi" ref="r:c3548bac-30eb-4a2a-937c-0111d5697309(jetbrains.mps.lang.smodel.generator.smodelAdapter)" />
|
||||
<import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
|
||||
<import index="jpi6" ref="r:4c913df4-f2d5-43f7-af56-6bccd35aeb11(jetbrains.mps.lang.coderules.terms)" />
|
||||
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
|
||||
</imports>
|
||||
<registry>
|
||||
|
|
@ -15731,7 +15732,7 @@
|
|||
<node concept="1oi1Uc" id="6P1UyJpnUAb" role="3cqZAk">
|
||||
<node concept="1oi5UN" id="6P1UyJpnUAc" role="1oi0x0">
|
||||
<node concept="1oi5Wm" id="6P1UyJpnUAd" role="1ojpOf">
|
||||
<property role="TrG5h" value="_term" />
|
||||
<property role="TrG5h" value="_declaration_" />
|
||||
<node concept="1oi5XN" id="6P1UyJpnUAe" role="1oi5zu">
|
||||
<property role="1oi5yK" value="symbol" />
|
||||
<node concept="17Uvod" id="6P1UyJpnUAf" role="lGtFl">
|
||||
|
|
@ -15751,6 +15752,20 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="17Uvod" id="1RYTbd6oEZP" role="lGtFl">
|
||||
<property role="2qtEX9" value="name" />
|
||||
<property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
|
||||
<node concept="3zFVjK" id="1RYTbd6oEZQ" role="3zH0cK">
|
||||
<node concept="3clFbS" id="1RYTbd6oEZR" role="2VODD2">
|
||||
<node concept="3clFbF" id="1RYTbd6oFh7" role="3cqZAp">
|
||||
<node concept="10M0yZ" id="1RYTbd6oFmB" role="3clFbG">
|
||||
<ref role="3cqZAo" to="jpi6:1RYTbd6oE68" resolve="DECLARATION" />
|
||||
<ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1oi5Wm" id="6P1UyJpnUAm" role="1ojpOf">
|
||||
<property role="TrG5h" value="name" />
|
||||
|
|
@ -15792,7 +15807,7 @@
|
|||
</node>
|
||||
</node>
|
||||
<node concept="1oi5ST" id="6P1UyJpnUAE" role="1ojpOf">
|
||||
<property role="TrG5h" value="_subterm" />
|
||||
<property role="TrG5h" value="_specification_" />
|
||||
<node concept="1oi5UN" id="6P1UyJpnUAF" role="1oi5TL">
|
||||
<node concept="1sPUBX" id="6P1UyJpnUAG" role="lGtFl">
|
||||
<ref role="v9R2y" node="4lCLOtwvFAX" resolve="term_builder" />
|
||||
|
|
@ -15816,6 +15831,20 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="17Uvod" id="1RYTbd6oIKB" role="lGtFl">
|
||||
<property role="2qtEX9" value="name" />
|
||||
<property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
|
||||
<node concept="3zFVjK" id="1RYTbd6oIKC" role="3zH0cK">
|
||||
<node concept="3clFbS" id="1RYTbd6oIKD" role="2VODD2">
|
||||
<node concept="3clFbF" id="1RYTbd6oIL_" role="3cqZAp">
|
||||
<node concept="10M0yZ" id="1RYTbd6oIQH" role="3clFbG">
|
||||
<ref role="3cqZAo" to="jpi6:1RYTbd6oE9B" resolve="SPECIFICATION" />
|
||||
<ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1oi5ST" id="6P1UyJpnUAP" role="1ojpOf">
|
||||
<property role="TrG5h" value="name" />
|
||||
|
|
@ -15860,7 +15889,6 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3clFbH" id="6P1UyJpnUBa" role="3cqZAp" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3Tm6S6" id="5dFCr0xEfYP" role="1B3o_S" />
|
||||
|
|
@ -15900,7 +15928,7 @@
|
|||
<node concept="1oi1Uc" id="4lCLOtwwaTG" role="3cqZAk">
|
||||
<node concept="1oi5UN" id="4lCLOtwwaTH" role="1oi0x0">
|
||||
<node concept="1oi5Wm" id="4lCLOtwwaTI" role="1ojpOf">
|
||||
<property role="TrG5h" value="_term" />
|
||||
<property role="TrG5h" value="_declaration_" />
|
||||
<node concept="1oi5XN" id="4lCLOtwwaTJ" role="1oi5zu">
|
||||
<property role="1oi5yK" value="symbol" />
|
||||
<node concept="17Uvod" id="4lCLOtwwaTK" role="lGtFl">
|
||||
|
|
@ -15920,9 +15948,23 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="17Uvod" id="1RYTbd6oJ8s" role="lGtFl">
|
||||
<property role="2qtEX9" value="name" />
|
||||
<property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
|
||||
<node concept="3zFVjK" id="1RYTbd6oJ8t" role="3zH0cK">
|
||||
<node concept="3clFbS" id="1RYTbd6oJ8u" role="2VODD2">
|
||||
<node concept="3clFbF" id="1RYTbd6oJio" role="3cqZAp">
|
||||
<node concept="10M0yZ" id="1RYTbd6oJiB" role="3clFbG">
|
||||
<ref role="3cqZAo" to="jpi6:1RYTbd6oE68" resolve="DECLARATION" />
|
||||
<ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1oi5ST" id="4vr5SAptRDh" role="1ojpOf">
|
||||
<property role="TrG5h" value="_subterm" />
|
||||
<property role="TrG5h" value="_specification_" />
|
||||
<node concept="2IllgU" id="4vr5SAptSzP" role="1oi5TL" />
|
||||
<node concept="1W57fq" id="4vr5SAptSzT" role="lGtFl">
|
||||
<node concept="3IZrLx" id="4vr5SAptSzU" role="3IZSJc">
|
||||
|
|
@ -15938,6 +15980,20 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="17Uvod" id="1RYTbd6oJuM" role="lGtFl">
|
||||
<property role="2qtEX9" value="name" />
|
||||
<property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
|
||||
<node concept="3zFVjK" id="1RYTbd6oJuN" role="3zH0cK">
|
||||
<node concept="3clFbS" id="1RYTbd6oJuO" role="2VODD2">
|
||||
<node concept="3clFbF" id="1RYTbd6oJzW" role="3cqZAp">
|
||||
<node concept="10M0yZ" id="1RYTbd6oJ$b" role="3clFbG">
|
||||
<ref role="3cqZAo" to="jpi6:1RYTbd6oE9B" resolve="SPECIFICATION" />
|
||||
<ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1oi5Wm" id="4lCLOtwwaTR" role="1ojpOf">
|
||||
<property role="TrG5h" value="name" />
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<model ref="r:4c913df4-f2d5-43f7-af56-6bccd35aeb11(jetbrains.mps.lang.coderules.terms)">
|
||||
<persistence version="9" />
|
||||
<languages>
|
||||
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
|
||||
</languages>
|
||||
<imports>
|
||||
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
|
||||
</imports>
|
||||
<registry>
|
||||
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
|
||||
<concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
|
||||
<concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
|
||||
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
|
||||
<property id="1070475926801" name="value" index="Xl_RC" />
|
||||
</concept>
|
||||
<concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
|
||||
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
|
||||
<property id="1176718929932" name="isFinal" index="3TUv4t" />
|
||||
<child id="1068431790190" name="initializer" index="33vP2m" />
|
||||
</concept>
|
||||
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
|
||||
<child id="5680397130376446158" name="type" index="1tU5fm" />
|
||||
</concept>
|
||||
<concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
|
||||
<child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
|
||||
</concept>
|
||||
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
|
||||
<reference id="1107535924139" name="classifier" index="3uigEE" />
|
||||
</concept>
|
||||
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
|
||||
<child id="1178549979242" name="visibility" index="1B3o_S" />
|
||||
</concept>
|
||||
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
|
||||
</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="312cEu" id="1RYTbd6oE5l">
|
||||
<property role="TrG5h" value="TermUtil" />
|
||||
<node concept="2tJIrI" id="1RYTbd6oE5P" role="jymVt" />
|
||||
<node concept="Wx3nA" id="1RYTbd6oE68" role="jymVt">
|
||||
<property role="3TUv4t" value="true" />
|
||||
<property role="TrG5h" value="DECLARATION" />
|
||||
<node concept="3Tm1VV" id="1RYTbd6oE6u" role="1B3o_S" />
|
||||
<node concept="3uibUv" id="1RYTbd6oICU" role="1tU5fm">
|
||||
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
|
||||
</node>
|
||||
<node concept="Xl_RD" id="1RYTbd6oE7S" role="33vP2m">
|
||||
<property role="Xl_RC" value="_term" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2tJIrI" id="1RYTbd6oEa8" role="jymVt" />
|
||||
<node concept="Wx3nA" id="1RYTbd6oE9B" role="jymVt">
|
||||
<property role="3TUv4t" value="true" />
|
||||
<property role="TrG5h" value="SPECIFICATION" />
|
||||
<node concept="3Tm1VV" id="1RYTbd6oE9C" role="1B3o_S" />
|
||||
<node concept="3uibUv" id="1RYTbd6oIJx" role="1tU5fm">
|
||||
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
|
||||
</node>
|
||||
<node concept="Xl_RD" id="1RYTbd6oE9E" role="33vP2m">
|
||||
<property role="Xl_RC" value="_subterm" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2tJIrI" id="1RYTbd6oE5U" role="jymVt" />
|
||||
<node concept="3Tm1VV" id="1RYTbd6oE5m" role="1B3o_S" />
|
||||
</node>
|
||||
</model>
|
||||
|
||||
|
|
@ -18,6 +18,7 @@
|
|||
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
|
||||
<dependency reexport="false">9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)</dependency>
|
||||
<dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
|
||||
<dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
|
||||
</dependencies>
|
||||
<languageVersions>
|
||||
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
|
||||
|
|
@ -40,6 +41,8 @@
|
|||
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
|
||||
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
|
||||
<module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
|
||||
<module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
|
||||
<module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
|
||||
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
|
||||
<module reference="9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)" version="0" />
|
||||
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -534,6 +534,11 @@
|
|||
<ref role="3bR37D" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="1RYTbd6pb7T" role="3bR37C">
|
||||
<node concept="3bR9La" id="1RYTbd6pb7U" role="1SiIV1">
|
||||
<ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1E1JtD" id="7BVjoXzUxkQ" role="2G$12L">
|
||||
<property role="TrG5h" value="jetbrains.mps.logic" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue