Skip to content

Commit eb89a8b

Browse files
mfsoliveiramfsoliveira
authored
Merge branch 'maintenance/mps20232' into feature/MigrateLanguagesFromIets3Core
2 parents b56dc79 + 5371f38 commit eb89a8b

File tree

16 files changed

+2565
-243
lines changed

16 files changed

+2565
-243
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1212
- Move languages org.iets3.protocol.transport, org.iets3.components.functional, org.iets3.components.hardware, org.iets3.components.toplevel.adapter, org.iets3.core.mapping, and org.iets3.safety.attributes from iets3.core to iets3.os
1313

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

1617

1718
### Fixed

‎build/scripts/build-allScripts.xml‎

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
<module ref="3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)" kind="cl" />
6060
<module ref="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)" kind="cl" />
6161
<module ref="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.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" />
@@ -273,7 +272,7 @@
273272

274273
<target name="makeDependents" />
275274

276-
<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">
275+
<target name="java.compile.org.iets3.opensource.build" depends="java.compile.org.iets3.opensource.build.gentests.rt, fetchDependencies">
277276
<mkdir dir="${iets3.lang.opensource}/solutions/org.iets3.opensource.build/source_gen" />
278277
<mkdir dir="${build.tmp}/java/out/org.iets3.opensource.build" />
279278
<javac destdir="${build.tmp}/java/out/org.iets3.opensource.build" fork="false" encoding="utf8" includeantruntime="false" debug="true">
@@ -282,54 +281,11 @@
282281
<path location="${iets3.lang.opensource}/solutions/org.iets3.opensource.build/source_gen" />
283282
</src>
284283
<classpath>
285-
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
286-
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
287-
<fileset file="${artifacts.mps}/lib/mps-context.jar" />
288-
<fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
289-
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
290-
<fileset file="${artifacts.mps}/lib/mps-problem.jar" />
291-
<fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
292-
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
293-
<fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
294-
<fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
295-
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
296-
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
297-
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
298-
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
299-
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
300284
<fileset file="${artifacts.mps}/lib/mps-references.jar" />
301-
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
302-
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
303-
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
304-
<fileset file="${artifacts.mps}/lib/mps-generator.jar" />
305-
<fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
306-
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
307-
<fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
308-
<pathelement path="${build.tmp}/java/out/org.iets3.opensource.build.gentests" />
309285
<pathelement path="${build.tmp}/java/out/org.iets3.opensource.build.gentests.rt" />
310286
<fileset file="${iets3.lang.opensource}/solutions/org.iets3.opensource.build.gentests.rt/lib/takari-cpsuite-1.2.7.jar" />
311-
<fileset file="${artifacts.mps}/lib/annotations.jar" />
312-
<fileset file="${artifacts.mps}/lib/app.jar" />
313-
<fileset file="${artifacts.mps}/lib/app-client.jar" />
314-
<fileset file="${artifacts.mps}/lib/lib.jar" />
315-
<fileset file="${artifacts.mps}/lib/lib-client.jar" />
316-
<fileset file="${artifacts.mps}/lib/util.jar" />
317-
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
318-
<fileset file="${artifacts.mps}/lib/util-8.jar" />
319-
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
320-
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
321-
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
322-
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
323-
<fileset file="${artifacts.mps}/lib/stats.jar" />
324-
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
325287
<fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.platform.jar" />
326288
<fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.extensions.build/languages/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.jar" />
327-
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
328-
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.mps.runner.jar" />
329-
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.workflow.jar" />
330-
<fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
331-
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
332-
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
333289
</classpath>
334290
</javac>
335291
<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: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,6 +1119,15 @@
11191119
<node concept="3Tm1VV" id="2Qbt$1tSx2G" role="1B3o_S" />
11201120
<node concept="3clFbS" id="2Qbt$1tSx2H" role="3clF47" />
11211121
</node>
1122+
<node concept="3clFb_" id="1$atYL2NvF5" role="jymVt">
1123+
<property role="TrG5h" value="createEmptyType" />
1124+
<property role="1EzhhJ" value="true" />
1125+
<node concept="3Tqbb2" id="1$atYL2NvF6" role="3clF45">
1126+
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
1127+
</node>
1128+
<node concept="3Tm1VV" id="1$atYL2NvF7" role="1B3o_S" />
1129+
<node concept="3clFbS" id="1$atYL2NvF8" role="3clF47" />
1130+
</node>
11221131
<node concept="3clFb_" id="3tudP__T$3q" role="jymVt">
11231132
<property role="TrG5h" value="createNumberLiteral" />
11241133
<property role="1EzhhJ" value="true" />
@@ -1297,6 +1306,43 @@
12971306
</node>
12981307
<node concept="3Tm1VV" id="2q0DACtKs0c" role="1B3o_S" />
12991308
</node>
1309+
<node concept="2tJIrI" id="1$atYL2Myu6" role="jymVt" />
1310+
<node concept="3clFb_" id="1$atYL2M_8d" role="jymVt">
1311+
<property role="TrG5h" value="isEmptyType" />
1312+
<node concept="3clFbS" id="1$atYL2M_8g" role="3clF47">
1313+
<node concept="3clFbF" id="1$atYL2Nwo1" role="3cqZAp">
1314+
<node concept="2OqwBi" id="1$atYL2Nwo2" role="3clFbG">
1315+
<node concept="2OqwBi" id="1$atYL2Nwo3" role="2Oq$k0">
1316+
<node concept="2YIFZM" id="1$atYL2Nwo4" role="2Oq$k0">
1317+
<ref role="37wK5l" to="u78q:~TypeChecker.getInstance()" resolve="getInstance" />
1318+
<ref role="1Pybhc" to="u78q:~TypeChecker" resolve="TypeChecker" />
1319+
</node>
1320+
<node concept="liA8E" id="1$atYL2Nwo5" role="2OqNvi">
1321+
<ref role="37wK5l" to="u78q:~TypeChecker.getSubtypingManager()" resolve="getSubtypingManager" />
1322+
</node>
1323+
</node>
1324+
<node concept="liA8E" id="1$atYL2Nwo6" role="2OqNvi">
1325+
<ref role="37wK5l" to="u78q:~SubtypingManager.isSubtype(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode)" resolve="isSubtype" />
1326+
<node concept="37vLTw" id="1$atYL2Nwo7" role="37wK5m">
1327+
<ref role="3cqZAo" node="1$atYL2M_AZ" resolve="type" />
1328+
</node>
1329+
<node concept="2YIFZM" id="1$atYL2N$yE" role="37wK5m">
1330+
<ref role="37wK5l" to="xfg9:1$atYL2Nr$T" resolve="createEmptyType" />
1331+
<ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
1332+
</node>
1333+
</node>
1334+
</node>
1335+
</node>
1336+
</node>
1337+
<node concept="3Tm1VV" id="1$atYL2Mzcw" role="1B3o_S" />
1338+
<node concept="10P_77" id="1$atYL2M_6r" role="3clF45" />
1339+
<node concept="37vLTG" id="1$atYL2M_AZ" role="3clF46">
1340+
<property role="TrG5h" value="type" />
1341+
<node concept="3Tqbb2" id="1$atYL2M_AY" role="1tU5fm">
1342+
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
1343+
</node>
1344+
</node>
1345+
</node>
13001346
<node concept="2tJIrI" id="2q0DACtJfg1" role="jymVt" />
13011347
<node concept="3clFb_" id="2oUyrt$Q$EB" role="jymVt">
13021348
<property role="TrG5h" value="useCommaInsteadOfDotForDecimals" />

0 commit comments

Comments
 (0)