Skip to content

Commit 5d6c78d

Browse files
WimBastWimBast
committed
derived doGet
1 parent e5239a0 commit 5d6c78d

File tree

2 files changed

+7
-135
lines changed

2 files changed

+7
-135
lines changed

‎mps_build.xml

+3-133
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<property name="mps.teamcity.buildConfName" value="${import.mps.mps.teamcity.buildConfName}" />
2020
<property name="mps.idea.platform.build.number" value="${import.mps.mps.idea.platform.build.number}" />
2121
<property name="mps.mps.build.counter" value="${import.mps.mps.mps.build.counter}" />
22+
<property name="mps.runtimeBuild" value="${import.mps.mps.runtimeBuild}" />
2223
<property name="mpsBootstrapCore.version.major" value="${import.mps.mpsBootstrapCore.version.major}" />
2324
<property name="mpsBootstrapCore.version.minor" value="${import.mps.mpsBootstrapCore.version.minor}" />
2425
<property name="mpsBootstrapCore.version.bugfixNr" value="${import.mps.mpsBootstrapCore.version.bugfixNr}" />
@@ -757,7 +758,7 @@
757758
<zipfileset file="${dclare_home}/solutions/DclareMPSRuntime/lib/runtime.jar" prefix="DclareForMPS" />
758759
<fileset dir="${build.tmp}/default/DclareForMPS.zip" />
759760
</zip>
760-
<echo file="${build.layout}/build.properties">DclareForMPS.version=${version}${line.separator}DclareForMPS.versionExtra=${versionExtra}${line.separator}DclareForMPS.versionStamp=${versionStamp}${line.separator}DclareForMPS.fullVersion=${fullVersion}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
761+
<echo file="${build.layout}/build.properties">DclareForMPS.version=${version}${line.separator}DclareForMPS.versionExtra=${versionExtra}${line.separator}DclareForMPS.versionStamp=${versionStamp}${line.separator}DclareForMPS.fullVersion=${fullVersion}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mps.runtimeBuild=${mps.runtimeBuild}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
761762
</target>
762763

763764
<target name="buildDependents" />
@@ -790,145 +791,14 @@
790791
<plugin path="${artifacts.mps}/plugins/mps-core" id="jetbrains.mps.core" />
791792
<plugin path="${artifacts.mps}/plugins/mps-debugger-api" id="jetbrains.mps.debugger.api" />
792793
<plugin path="${artifacts.mps}/plugins/mps-execution-api" id="jetbrains.mps.execution.api" />
794+
<plugin path="${artifacts.mps}/plugins/mps-java" id="jetbrains.mps.ide.java" />
793795
<plugin path="${artifacts.mps}/plugins/mps-modelchecker" id="jetbrains.mps.ide.modelchecker" />
794796
<plugin path="${artifacts.mps}/plugins/mps-rcp" id="jetbrains.mps.rcp" />
795-
<library file="${artifacts.mps}/languages/baseLanguage/closures.runtime.jar" />
796-
<library file="${artifacts.mps}/languages/baseLanguage/collections.runtime.jar" />
797-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
798-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.checkedDots.jar" />
799-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
800-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
801-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
802-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.extensionMethods.jar" />
803-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
804-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.javadoc.jar" />
805-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
806-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
807-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
808-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.methodReferences.jar" />
809-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.references.runtime.jar" />
810-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.jar" />
811-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
812-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
813-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
814-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.runtime.jar" />
815-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.util.jar" />
816-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.varVariable.jar" />
817-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
818-
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.jar" />
819-
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.rules.jar" />
820-
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.rulesAndMessages.jar" />
821-
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.dataflow.jar" />
822-
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.migration.jar" />
823-
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.structure.jar" />
824-
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.typesystem.jar" />
825-
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
826-
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
827-
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.templates.jar" />
828-
<library file="${artifacts.mps}/languages/editor/jetbrains.mps.editing.runtime.jar" />
829-
<library file="${artifacts.mps}/languages/editor/jetbrains.mps.editor.runtime.jar" />
830-
<library file="${artifacts.mps}/languages/editor/jetbrains.mps.editorlang.runtime.jar" />
831-
<library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
832-
<library file="${artifacts.mps}/languages/editor/typesystemIntegration.jar" />
833-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
834-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
835-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
836-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
837-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
838-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
839-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.msg.specification.jar" />
840-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.rules.jar" />
841-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.rules.kinds.jar" />
842-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.rules.skeleton.jar" />
843-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.context.defs.jar" />
844-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.context.jar" />
845-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.doc.jar" />
846-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
847-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.analyzers.jar" />
848-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.jar" />
849-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
850-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
851-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
852-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.feedback.jar" />
853-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.feedback.messages.jar" />
854-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.feedback.problem.childAndProp.jar" />
855-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.feedback.problem.failingRule.jar" />
856-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.feedback.problem.jar" />
857-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.feedback.problem.scopes.jar" />
858-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.feedback.skeleton.jar" />
859-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.findUsages.jar" />
860-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
861-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationParameters.jar" />
862-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
863-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
864-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.messages.jar" />
865-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.jar" />
866-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
867-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
868-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
869-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
870-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.quotation.jar" />
871-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.refactoring.jar" />
872-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.resources.jar" />
873-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.rulesAndMessages.jar" />
874-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.jar" />
875-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
876-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.script.jar" />
877-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
878-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.slanguage.jar" />
879-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
880-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.jar" />
881-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
882-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
883-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
884-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
885-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
886-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
887-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.typesystemEngine.jar" />
888-
<library file="${artifacts.mps}/languages/make/jetbrains.mps.make.facet.jar" />
889-
<library file="${artifacts.mps}/languages/make/jetbrains.mps.make.facets.jar" />
890-
<library file="${artifacts.mps}/languages/make/jetbrains.mps.make.jar" />
891-
<library file="${artifacts.mps}/languages/make/jetbrains.mps.make.runtime.jar" />
892-
<library file="${artifacts.mps}/languages/make/jetbrains.mps.make.script.jar" />
893-
<library file="${artifacts.mps}/languages/make/jetbrains.mps.smodel.resources.jar" />
894-
<library file="${artifacts.mps}/languages/mps-stubs.jar" />
895-
<library file="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.search.jar" />
896-
<library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.platform.jar" />
897-
<library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.refactoring.platform.jar" />
898-
<library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.ui.jar" />
899-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
900-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
901-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.findUsages.runtime.jar" />
902-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.behavior.api.jar" />
903-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.behavior.runtime.jar" />
904-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.constraints.rules.runtime.jar" />
905-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.api.jar" />
906-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.context.jar" />
907-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.legacy-constraints.jar" />
908-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.rt.jar" />
909-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.rules.jar" />
910-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.messages.api.jar" />
911-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.migration.runtime.jar" />
912-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.script.rt.jar" />
913-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.smodel.query.runtime.jar" />
914-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.refactoring.runtime.jar" />
915-
<library file="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
916-
<library file="${artifacts.mps}/languages/tools/jetbrains.mps.core.tool.environment.jar" />
917-
<library file="${artifacts.mps}/languages/tools/jetbrains.mps.tool.common.jar" />
918-
<library file="${artifacts.mps}/languages/util/jetbrains.mps.java.stub.jar" />
919-
<library file="${artifacts.mps}/languages/util/jetbrains.mps.kernel.jar" />
920797
<library file="${artifacts.mps}/languages/util/jetbrains.mps.lang.extension.jar" />
921-
<library file="${artifacts.mps}/languages/util/jetbrains.mps.lang.makeup.jar" />
922-
<library file="${artifacts.mps}/languages/util/jetbrains.mps.project.jar" />
923-
<library file="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.jar" />
924-
<library file="${artifacts.mps}/languages/util/jetbrains.mps.runtime.jar" />
925798
<library file="${artifacts.mps}/languages/workbench-stub.jar" />
926799
<library file="${artifacts.mps}/languages/workbench/jetbrains.mps.ide.jar" />
927800
<library file="${artifacts.mps}/languages/workbench/jetbrains.mps.lang.plugin.standalone.jar" />
928-
<library file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
929801
<library file="${artifacts.mps}/plugins/mps-devkit/languages/jetbrains.mps.ide.devkit.editor.jar" />
930-
<library file="${artifacts.mps}/plugins/mps-java/modules/jetbrains.mps.java.core.jar" />
931-
<library file="${artifacts.mps}/plugins/mps-java/modules/jetbrains.mps.java.platform.jar" />
932802
<chunk>
933803
<module file="${basedir}/solutions/DclareForMPS.build/DclareForMPS.build.msd" />
934804
<module file="${basedir}/languages/DclareMPS/DclareMPS.mpl" />

‎solutions/DclareMPSRuntime/models/DclareMPSRuntime.util.mps

+4-2
Original file line numberDiff line numberDiff line change
@@ -1899,7 +1899,7 @@
18991899
<node concept="3clFbS" id="2VzmrKH_G20" role="9aQI4">
19001900
<node concept="3cpWs6" id="54lhvuXGzMP" role="3cqZAp">
19011901
<node concept="2YIFZM" id="1bjvCAOm7X4" role="3cqZAk">
1902-
<ref role="37wK5l" to="t4tl:~DClareMPS.get(java.lang.Object,java.util.function.Supplier)" resolve="get" />
1902+
<ref role="37wK5l" to="t4tl:~DClareMPS.get(java.lang.Object,java.util.function.Supplier,boolean)" resolve="get" />
19031903
<ref role="1Pybhc" to="t4tl:~DClareMPS" resolve="DClareMPS" />
19041904
<node concept="37vLTw" id="1bjvCAOmait" role="37wK5m">
19051905
<ref role="3cqZAo" node="1Xoy$rYfENc" resolve="object" />
@@ -1973,6 +1973,7 @@
19731973
</node>
19741974
</node>
19751975
</node>
1976+
<node concept="3clFbT" id="4i_SMBtI3uL" role="37wK5m" />
19761977
</node>
19771978
</node>
19781979
</node>
@@ -7881,7 +7882,7 @@
78817882
<node concept="3cpWs6" id="1bjvCAOQZdS" role="3cqZAp">
78827883
<node concept="2YIFZM" id="1bjvCAOQZdT" role="3cqZAk">
78837884
<ref role="1Pybhc" to="t4tl:~DClareMPS" resolve="DClareMPS" />
7884-
<ref role="37wK5l" to="t4tl:~DClareMPS.get(java.lang.Object,java.util.function.Supplier)" resolve="get" />
7885+
<ref role="37wK5l" to="t4tl:~DClareMPS.get(java.lang.Object,java.util.function.Supplier,boolean)" resolve="get" />
78857886
<node concept="37vLTw" id="1bjvCAOQZdU" role="37wK5m">
78867887
<ref role="3cqZAo" node="1bjvCAOVfkt" resolve="object" />
78877888
</node>
@@ -7963,6 +7964,7 @@
79637964
</node>
79647965
</node>
79657966
</node>
7967+
<node concept="3clFbT" id="4i_SMBtILgz" role="37wK5m" />
79667968
</node>
79677969
</node>
79687970
</node>

0 commit comments

Comments
 (0)