Skip to content

Commit a3b43d7

Browse files
author
Alexander Pann
authored
Merge pull request #1228 from IETS3/merge/mps20232
Merge maintenance/mps20232 into master
2 parents 04162c5 + 5f18fba commit a3b43d7

File tree

10 files changed

+491
-119
lines changed

10 files changed

+491
-119
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1010
### Added
1111

1212
- a new approach to run interpreter test case from command line (and inside MPS) directly without invoking JUnit code generation
13+
- Added EmptyType to Pluggable Type Facade (PTF). If your language has some kind of _NixType_, you should override `PrimitiveTypeMapper.isEmptyType()` to recognize your _NixType_.
1314

1415
### Fixed
1516

‎build/scripts/build-allScripts.xml‎

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
<module ref="e70ad515-8ff0-4a50-8cb4-41406f14e348(org.iets3.opensource.build.gentests.rt)" kind="rt" />
6060
<module ref="3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)" kind="cl" />
6161
<module ref="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)" kind="cl" />
62-
<module ref="9d000fbd-bdca-4a46-b39b-c5ba9e79b38c(org.iets3.opensource.build.gentests)" kind="cl" />
6362
</dependencies>
6463
<uses>
6564
<language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
@@ -151,7 +150,7 @@
151150

152151
<target name="makeDependents" />
153152

154-
<target name="java.compile.org.iets3.opensource.build" depends="java.compile.org.iets3.opensource.build.gentests, java.compile.org.iets3.opensource.build.gentests.rt, fetchDependencies">
153+
<target name="java.compile.org.iets3.opensource.build" depends="java.compile.org.iets3.opensource.build.gentests.rt, fetchDependencies">
155154
<mkdir dir="${iets3.lang.opensource}/solutions/org.iets3.opensource.build/source_gen" />
156155
<mkdir dir="${build.tmp}/java/out/org.iets3.opensource.build" />
157156
<javac destdir="${build.tmp}/java/out/org.iets3.opensource.build" fork="false" encoding="utf8" includeantruntime="false" debug="true">
@@ -160,56 +159,11 @@
160159
<path location="${iets3.lang.opensource}/solutions/org.iets3.opensource.build/source_gen" />
161160
</src>
162161
<classpath>
163-
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
164-
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
165-
<fileset file="${artifacts.mps}/lib/mps-context.jar" />
166-
<fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
167-
<fileset file="${artifacts.mps}/lib/mps-problem.jar" />
168-
<fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
169-
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
170-
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
171-
<fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
172-
<fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
173-
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
174-
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
175-
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
176-
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
177-
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
178162
<fileset file="${artifacts.mps}/lib/mps-references.jar" />
179-
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
180-
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
181-
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
182-
<fileset file="${artifacts.mps}/lib/mps-generator.jar" />
183-
<fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
184-
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
185-
<fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
186-
<pathelement path="${build.tmp}/java/out/org.iets3.opensource.build.gentests" />
187163
<pathelement path="${build.tmp}/java/out/org.iets3.opensource.build.gentests.rt" />
188164
<fileset file="${iets3.lang.opensource}/solutions/org.iets3.opensource.build.gentests.rt/lib/takari-cpsuite-1.2.7.jar" />
189-
<fileset file="${artifacts.mps}/lib/annotations.jar" />
190-
<fileset file="${artifacts.mps}/lib/app.jar" />
191-
<fileset file="${artifacts.mps}/lib/app-client.jar" />
192-
<fileset file="${artifacts.mps}/lib/lib.jar" />
193-
<fileset file="${artifacts.mps}/lib/lib-client.jar" />
194-
<fileset file="${artifacts.mps}/lib/util.jar" />
195-
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
196-
<fileset file="${artifacts.mps}/lib/util-8.jar" />
197-
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
198-
<fileset file="${artifacts.mps}/lib/java-frontback.jar" />
199-
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
200-
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
201-
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
202-
<fileset file="${artifacts.mps}/lib/stats.jar" />
203-
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
204-
<fileset file="${artifacts.mps}/lib/trove.jar" />
205165
<fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.platform.jar" />
206166
<fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.extensions.build/languages/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.jar" />
207-
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
208-
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.mps.runner.jar" />
209-
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.workflow.jar" />
210-
<fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
211-
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
212-
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
213167
</classpath>
214168
</javac>
215169
<copy todir="${build.tmp}/java/out/org.iets3.opensource.build">

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps‎

Lines changed: 53 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<model ref="r:6c6155f0-4bbe-4af5-8c26-244d570e21e4(org.iets3.core.expr.base.plugin)">
33
<persistence version="9" />
4-
<attribute name="doNotGenerate" value="false" />
54
<languages>
65
<use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="-1" />
76
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
@@ -49,11 +48,11 @@
4948
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
5049
<import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" />
5150
<import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
51+
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
52+
<import index="ciba" ref="r:11b7cdb2-cc58-456e-bb9a-ce45b78edd2f(jetbrains.mps.ide.httpsupport.runtime.base)" />
5253
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
5354
<import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
5455
<import index="rfhd" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util.registry(MPS.IDEA/)" />
55-
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
56-
<import index="ciba" ref="r:11b7cdb2-cc58-456e-bb9a-ce45b78edd2f(jetbrains.mps.ide.httpsupport.runtime.base)" />
5756
</imports>
5857
<registry>
5958
<language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -104,7 +103,7 @@
104103
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
105104
<child id="1188214630783" name="value" index="2B76xF" />
106105
</concept>
107-
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
106+
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
108107
<child id="1188208488637" name="annotation" index="2AJF6D" />
109108
</concept>
110109
<concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
@@ -185,7 +184,7 @@
185184
<property id="1176718929932" name="isFinal" index="3TUv4t" />
186185
<child id="1068431790190" name="initializer" index="33vP2m" />
187186
</concept>
188-
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
187+
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
189188
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
190189
</concept>
191190
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -252,7 +251,7 @@
252251
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
253252
<child id="1081516765348" name="expression" index="3fr31v" />
254253
</concept>
255-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
254+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
256255
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
257256
<child id="1068499141038" name="actualArgument" index="37wK5m" />
258257
</concept>
@@ -281,7 +280,7 @@
281280
</concept>
282281
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
283282
<concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
284-
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
283+
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
285284
<child id="1178549979242" name="visibility" index="1B3o_S" />
286285
</concept>
287286
<concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -493,7 +492,7 @@
493492
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
494493
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
495494
</concept>
496-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
495+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
497496
<property id="1169194664001" name="name" index="TrG5h" />
498497
</concept>
499498
<concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -1124,6 +1123,15 @@
11241123
<node concept="3Tm1VV" id="2Qbt$1tSx2G" role="1B3o_S" />
11251124
<node concept="3clFbS" id="2Qbt$1tSx2H" role="3clF47" />
11261125
</node>
1126+
<node concept="3clFb_" id="1$atYL2NvF5" role="jymVt">
1127+
<property role="TrG5h" value="createEmptyType" />
1128+
<property role="1EzhhJ" value="true" />
1129+
<node concept="3Tqbb2" id="1$atYL2NvF6" role="3clF45">
1130+
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
1131+
</node>
1132+
<node concept="3Tm1VV" id="1$atYL2NvF7" role="1B3o_S" />
1133+
<node concept="3clFbS" id="1$atYL2NvF8" role="3clF47" />
1134+
</node>
11271135
<node concept="3clFb_" id="3tudP__T$3q" role="jymVt">
11281136
<property role="TrG5h" value="createNumberLiteral" />
11291137
<property role="1EzhhJ" value="true" />
@@ -1302,6 +1310,43 @@
13021310
</node>
13031311
<node concept="3Tm1VV" id="2q0DACtKs0c" role="1B3o_S" />
13041312
</node>
1313+
<node concept="2tJIrI" id="1$atYL2Myu6" role="jymVt" />
1314+
<node concept="3clFb_" id="1$atYL2M_8d" role="jymVt">
1315+
<property role="TrG5h" value="isEmptyType" />
1316+
<node concept="3clFbS" id="1$atYL2M_8g" role="3clF47">
1317+
<node concept="3clFbF" id="1$atYL2Nwo1" role="3cqZAp">
1318+
<node concept="2OqwBi" id="1$atYL2Nwo2" role="3clFbG">
1319+
<node concept="2OqwBi" id="1$atYL2Nwo3" role="2Oq$k0">
1320+
<node concept="2YIFZM" id="1$atYL2Nwo4" role="2Oq$k0">
1321+
<ref role="37wK5l" to="u78q:~TypeChecker.getInstance()" resolve="getInstance" />
1322+
<ref role="1Pybhc" to="u78q:~TypeChecker" resolve="TypeChecker" />
1323+
</node>
1324+
<node concept="liA8E" id="1$atYL2Nwo5" role="2OqNvi">
1325+
<ref role="37wK5l" to="u78q:~TypeChecker.getSubtypingManager()" resolve="getSubtypingManager" />
1326+
</node>
1327+
</node>
1328+
<node concept="liA8E" id="1$atYL2Nwo6" role="2OqNvi">
1329+
<ref role="37wK5l" to="u78q:~SubtypingManager.isSubtype(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode)" resolve="isSubtype" />
1330+
<node concept="37vLTw" id="1$atYL2Nwo7" role="37wK5m">
1331+
<ref role="3cqZAo" node="1$atYL2M_AZ" resolve="type" />
1332+
</node>
1333+
<node concept="2YIFZM" id="1$atYL2N$yE" role="37wK5m">
1334+
<ref role="37wK5l" to="xfg9:1$atYL2Nr$T" resolve="createEmptyType" />
1335+
<ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
1336+
</node>
1337+
</node>
1338+
</node>
1339+
</node>
1340+
</node>
1341+
<node concept="3Tm1VV" id="1$atYL2Mzcw" role="1B3o_S" />
1342+
<node concept="10P_77" id="1$atYL2M_6r" role="3clF45" />
1343+
<node concept="37vLTG" id="1$atYL2M_AZ" role="3clF46">
1344+
<property role="TrG5h" value="type" />
1345+
<node concept="3Tqbb2" id="1$atYL2M_AY" role="1tU5fm">
1346+
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
1347+
</node>
1348+
</node>
1349+
</node>
13051350
<node concept="2tJIrI" id="2q0DACtJfg1" role="jymVt" />
13061351
<node concept="3clFb_" id="2oUyrt$Q$EB" role="jymVt">
13071352
<property role="TrG5h" value="useCommaInsteadOfDotForDecimals" />

0 commit comments

Comments
 (0)