From 79fc4b32a5f4c70a53c2b6a626bdd0c3a88a6d18 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sat, 22 Jul 2023 11:18:29 +0200 Subject: [PATCH 1/5] Implement simple dataflow for KernelF --- .../org.iets3.components.core.dataFlow.mps | 210 +++ .../org.iets3.components.core.mpl | 2 + .../org.iets3.core.attributes.dataFlow.mps | 79 + .../org.iets3.core.expr.adt.dataFlow.mps | 283 ++++ .../org.iets3.core.expr.base.dataFlow.mps | 1025 +++++++++++++ ...g.iets3.core.expr.collections.dataFlow.mps | 327 ++++ .../org.iets3.core.expr.data.dataFlow.mps | 145 ++ .../org.iets3.core.expr.data.mpl | 1 + .../org.iets3.core.expr.dataflow.dataFlow.mps | 212 +++ .../org.iets3.core.expr.datetime.dataFlow.mps | 284 ++++ ...r.genjava.stateMachineExample.dataFlow.mps | 69 + ....core.expr.genjava.stateMachineExample.mpl | 1 + ....iets3.core.expr.genjava.util.dataFlow.mps | 85 ++ .../org.iets3.core.expr.genjava.util.mpl | 1 + .../org.iets3.core.expr.lambda.dataFlow.mps | 573 +++++++ .../org.iets3.core.expr.lookup.dataFlow.mps | 181 +++ .../org.iets3.core.expr.math.dataFlow.mps | 264 ++++ .../org.iets3.core.expr.messages.dataFlow.mps | 179 +++ .../org.iets3.core.expr.messages.mpl | 1 + ....iets3.core.expr.metafunction.dataFlow.mps | 132 ++ .../org.iets3.core.expr.mutable.dataFlow.mps | 410 +++++ .../org.iets3.core.expr.natlang.dataFlow.mps | 103 ++ .../org.iets3.core.expr.natlang.mpl | 3 +- .../org.iets3.core.expr.process.dataFlow.mps | 170 +++ .../org.iets3.core.expr.query.dataFlow.mps | 143 ++ .../org.iets3.core.expr.query.mpl | 1 + .../org.iets3.core.expr.repl.dataFlow.mps | 241 +++ ...g.iets3.core.expr.simpleTypes.dataFlow.mps | 282 ++++ ...iets3.core.expr.statemachines.dataFlow.mps | 460 ++++++ ...s3.core.expr.stringvalidation.dataFlow.mps | 57 + .../org.iets3.core.expr.stringvalidation.mpl | 1 + .../org.iets3.core.expr.temporal.dataFlow.mps | 421 ++++++ .../org.iets3.core.expr.tests.dataFlow.mps | 356 +++++ .../models/typesystem.mps | 19 + .../org.iets3.core.expr.toplevel.dataFlow.mps | 861 +++++++++++ .../iets3/core/expr/toplevel/typesystem.mps | 1346 +++++++++++++++-- .../org.iets3.core.expr.toplevel.mpl | 5 + ....iets3.core.expr.typetags.lib.dataFlow.mps | 65 + .../org.iets3.core.expr.typetags.lib.mpl | 1 + ...ets3.core.expr.typetags.units.dataFlow.mps | 63 + .../org.iets3.core.expr.typetags.dataFlow.mps | 57 + .../org.iets3.core.expr.typetags.mpl | 1 + .../org.iets3.core.expr.util.dataFlow.mps | 575 +++++++ .../org.iets3.core.expr.util.mpl | 1 + .../org/iets3/opensource/build/build.mps | 10 + .../models/test/ts/expr/os/m1@tests.mps | 372 ++++- .../tests/test.ts.expr.os/test.ts.expr.os.msd | 1 + 47 files changed, 9937 insertions(+), 142 deletions(-) create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/org.iets3.components.core.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/org.iets3.core.attributes.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/org.iets3.core.expr.adt.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/org.iets3.core.expr.base.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/org.iets3.core.expr.collections.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/org.iets3.core.expr.dataflow.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/org.iets3.core.expr.datetime.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/org.iets3.core.expr.genjava.stateMachineExample.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/models/org.iets3.core.expr.genjava.util.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/org.iets3.core.expr.lambda.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/org.iets3.core.expr.lookup.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/org.iets3.core.expr.math.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/org.iets3.core.expr.messages.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/org.iets3.core.expr.metafunction.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/org.iets3.core.expr.mutable.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/org.iets3.core.expr.natlang.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org.iets3.core.expr.repl.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/org.iets3.core.expr.simpleTypes.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/org.iets3.core.expr.statemachines.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/org.iets3.core.expr.temporal.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/org.iets3.core.expr.tests.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org.iets3.core.expr.toplevel.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org.iets3.core.expr.typetags.lib.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org.iets3.core.expr.typetags.dataFlow.mps create mode 100644 code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/org.iets3.core.expr.util.dataFlow.mps diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/org.iets3.components.core.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/org.iets3.components.core.dataFlow.mps new file mode 100644 index 0000000000..9eea4c2bf7 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/org.iets3.components.core.dataFlow.mps @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/org.iets3.components.core.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/org.iets3.components.core.mpl index 1673cdcc30..ec6ac716b8 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/org.iets3.components.core.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/org.iets3.components.core.mpl @@ -62,6 +62,7 @@ + @@ -79,6 +80,7 @@ + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/org.iets3.core.attributes.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/org.iets3.core.attributes.dataFlow.mps new file mode 100644 index 0000000000..e89aa3bd74 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/org.iets3.core.attributes.dataFlow.mps @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/org.iets3.core.expr.adt.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/org.iets3.core.expr.adt.dataFlow.mps new file mode 100644 index 0000000000..0bf4293a3f --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/org.iets3.core.expr.adt.dataFlow.mps @@ -0,0 +1,283 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/org.iets3.core.expr.base.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/org.iets3.core.expr.base.dataFlow.mps new file mode 100644 index 0000000000..4225ed17cc --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/org.iets3.core.expr.base.dataFlow.mps @@ -0,0 +1,1025 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/org.iets3.core.expr.collections.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/org.iets3.core.expr.collections.dataFlow.mps new file mode 100644 index 0000000000..d3556c019f --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/org.iets3.core.expr.collections.dataFlow.mps @@ -0,0 +1,327 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.dataFlow.mps new file mode 100644 index 0000000000..e4ee2518e3 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.dataFlow.mps @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/org.iets3.core.expr.data.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/org.iets3.core.expr.data.mpl index c04b4bbbab..dfe331a7de 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/org.iets3.core.expr.data.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/org.iets3.core.expr.data.mpl @@ -48,6 +48,7 @@ + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/org.iets3.core.expr.dataflow.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/org.iets3.core.expr.dataflow.dataFlow.mps new file mode 100644 index 0000000000..5d7e41c3a3 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/org.iets3.core.expr.dataflow.dataFlow.mps @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/org.iets3.core.expr.datetime.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/org.iets3.core.expr.datetime.dataFlow.mps new file mode 100644 index 0000000000..52e7a8fc96 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/org.iets3.core.expr.datetime.dataFlow.mps @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/org.iets3.core.expr.genjava.stateMachineExample.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/org.iets3.core.expr.genjava.stateMachineExample.dataFlow.mps new file mode 100644 index 0000000000..628d00d943 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/org.iets3.core.expr.genjava.stateMachineExample.dataFlow.mps @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/org.iets3.core.expr.genjava.stateMachineExample.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/org.iets3.core.expr.genjava.stateMachineExample.mpl index faba800bb1..5b5e28ffeb 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/org.iets3.core.expr.genjava.stateMachineExample.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/org.iets3.core.expr.genjava.stateMachineExample.mpl @@ -118,6 +118,7 @@ + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/models/org.iets3.core.expr.genjava.util.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/models/org.iets3.core.expr.genjava.util.dataFlow.mps new file mode 100644 index 0000000000..6fbe8484ee --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/models/org.iets3.core.expr.genjava.util.dataFlow.mps @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/org.iets3.core.expr.genjava.util.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/org.iets3.core.expr.genjava.util.mpl index ff295def82..286eefe9ac 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/org.iets3.core.expr.genjava.util.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/org.iets3.core.expr.genjava.util.mpl @@ -147,6 +147,7 @@ + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/org.iets3.core.expr.lambda.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/org.iets3.core.expr.lambda.dataFlow.mps new file mode 100644 index 0000000000..1429ec3d91 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/org.iets3.core.expr.lambda.dataFlow.mps @@ -0,0 +1,573 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/org.iets3.core.expr.lookup.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/org.iets3.core.expr.lookup.dataFlow.mps new file mode 100644 index 0000000000..0b513e4ba5 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/org.iets3.core.expr.lookup.dataFlow.mps @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/org.iets3.core.expr.math.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/org.iets3.core.expr.math.dataFlow.mps new file mode 100644 index 0000000000..eac5862728 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/org.iets3.core.expr.math.dataFlow.mps @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/org.iets3.core.expr.messages.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/org.iets3.core.expr.messages.dataFlow.mps new file mode 100644 index 0000000000..b59c332d62 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/org.iets3.core.expr.messages.dataFlow.mps @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/org.iets3.core.expr.messages.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/org.iets3.core.expr.messages.mpl index ff9ef8a6fe..fe8b93c3fe 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/org.iets3.core.expr.messages.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/org.iets3.core.expr.messages.mpl @@ -46,6 +46,7 @@ + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/org.iets3.core.expr.metafunction.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/org.iets3.core.expr.metafunction.dataFlow.mps new file mode 100644 index 0000000000..07fbbbd5de --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/org.iets3.core.expr.metafunction.dataFlow.mps @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/org.iets3.core.expr.mutable.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/org.iets3.core.expr.mutable.dataFlow.mps new file mode 100644 index 0000000000..3eedde5d3d --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/org.iets3.core.expr.mutable.dataFlow.mps @@ -0,0 +1,410 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/org.iets3.core.expr.natlang.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/org.iets3.core.expr.natlang.dataFlow.mps new file mode 100644 index 0000000000..dc09bcc3cc --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/org.iets3.core.expr.natlang.dataFlow.mps @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/org.iets3.core.expr.natlang.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/org.iets3.core.expr.natlang.mpl index cbc5c9cea6..f026df3bce 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/org.iets3.core.expr.natlang.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/org.iets3.core.expr.natlang.mpl @@ -16,9 +16,9 @@ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) - c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) 9464fa06-5ab9-409b-9274-64ab29588457(org.iets3.core.expr.lambda) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) + c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) @@ -41,6 +41,7 @@ + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.dataFlow.mps new file mode 100644 index 0000000000..7214680110 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.dataFlow.mps @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.dataFlow.mps new file mode 100644 index 0000000000..7463ef3f9b --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.dataFlow.mps @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/org.iets3.core.expr.query.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/org.iets3.core.expr.query.mpl index c24998da18..df8032ee84 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/org.iets3.core.expr.query.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/org.iets3.core.expr.query.mpl @@ -38,6 +38,7 @@ + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org.iets3.core.expr.repl.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org.iets3.core.expr.repl.dataFlow.mps new file mode 100644 index 0000000000..68542d5810 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org.iets3.core.expr.repl.dataFlow.mps @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/org.iets3.core.expr.simpleTypes.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/org.iets3.core.expr.simpleTypes.dataFlow.mps new file mode 100644 index 0000000000..84dbf67cfd --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/org.iets3.core.expr.simpleTypes.dataFlow.mps @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/org.iets3.core.expr.statemachines.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/org.iets3.core.expr.statemachines.dataFlow.mps new file mode 100644 index 0000000000..e99301a36d --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/org.iets3.core.expr.statemachines.dataFlow.mps @@ -0,0 +1,460 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.dataFlow.mps new file mode 100644 index 0000000000..d1b9adab77 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.dataFlow.mps @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/org.iets3.core.expr.stringvalidation.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/org.iets3.core.expr.stringvalidation.mpl index 0c34f3a307..02ef5fbd43 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/org.iets3.core.expr.stringvalidation.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/org.iets3.core.expr.stringvalidation.mpl @@ -36,6 +36,7 @@ + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/org.iets3.core.expr.temporal.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/org.iets3.core.expr.temporal.dataFlow.mps new file mode 100644 index 0000000000..7be5566548 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/org.iets3.core.expr.temporal.dataFlow.mps @@ -0,0 +1,421 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/org.iets3.core.expr.tests.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/org.iets3.core.expr.tests.dataFlow.mps new file mode 100644 index 0000000000..f3dd4eedc7 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/org.iets3.core.expr.tests.dataFlow.mps @@ -0,0 +1,356 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/typesystem.mps index 8bddcaf99f..2c19aa44c1 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/typesystem.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/typesystem.mps @@ -11,6 +11,7 @@ + @@ -1329,5 +1330,23 @@ + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org.iets3.core.expr.toplevel.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org.iets3.core.expr.toplevel.dataFlow.mps new file mode 100644 index 0000000000..4020089a25 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org.iets3.core.expr.toplevel.dataFlow.mps @@ -0,0 +1,861 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/typesystem.mps index a98662a937..513b3b71cc 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/typesystem.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/typesystem.mps @@ -18,10 +18,15 @@ - - + + + + + + + @@ -37,9 +42,22 @@ + + + + + + + + + + + + + @@ -53,14 +71,33 @@ + + + + + + + + + + + + + + + + + + + @@ -74,6 +111,11 @@ + + + + + @@ -90,6 +132,7 @@ + @@ -102,6 +145,11 @@ + + + + + @@ -110,13 +158,33 @@ - + + + + + + + + + + + + + + + + + + + + + @@ -124,6 +192,10 @@ + + + + @@ -132,9 +204,12 @@ + + + @@ -176,6 +251,11 @@ + + + + + @@ -283,6 +363,8 @@ + + @@ -294,6 +376,9 @@ + + + @@ -303,7 +388,6 @@ - @@ -333,6 +417,7 @@ + @@ -380,6 +465,7 @@ + @@ -504,142 +590,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4321,5 +4271,1121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl index 4aa8b6d786..e48a9b09b8 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl @@ -33,9 +33,12 @@ 34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime) 3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations) 24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles) + 2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime) + 20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine) + @@ -120,6 +123,7 @@ + @@ -130,6 +134,7 @@ + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org.iets3.core.expr.typetags.lib.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org.iets3.core.expr.typetags.lib.dataFlow.mps new file mode 100644 index 0000000000..f06af9ed16 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org.iets3.core.expr.typetags.lib.dataFlow.mps @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/org.iets3.core.expr.typetags.lib.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/org.iets3.core.expr.typetags.lib.mpl index 4fc94dfa36..3e8a3c2642 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/org.iets3.core.expr.typetags.lib.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/org.iets3.core.expr.typetags.lib.mpl @@ -121,6 +121,7 @@ + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.dataFlow.mps new file mode 100644 index 0000000000..6410a52849 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.dataFlow.mps @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org.iets3.core.expr.typetags.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org.iets3.core.expr.typetags.dataFlow.mps new file mode 100644 index 0000000000..dd5aeba291 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org.iets3.core.expr.typetags.dataFlow.mps @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/org.iets3.core.expr.typetags.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/org.iets3.core.expr.typetags.mpl index 3dfc5e4128..890a964172 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/org.iets3.core.expr.typetags.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/org.iets3.core.expr.typetags.mpl @@ -126,6 +126,7 @@ + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/org.iets3.core.expr.util.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/org.iets3.core.expr.util.dataFlow.mps new file mode 100644 index 0000000000..1d7e449b14 --- /dev/null +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/org.iets3.core.expr.util.dataFlow.mps @@ -0,0 +1,575 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/org.iets3.core.expr.util.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/org.iets3.core.expr.util.mpl index 4ea6f156e3..13b1ae4bfc 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/org.iets3.core.expr.util.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/org.iets3.core.expr.util.mpl @@ -65,6 +65,7 @@ + diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps index 190d269294..3c3d94badf 100644 --- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps +++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps @@ -3826,6 +3826,16 @@ + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps index 1b8d2830e2..95e29119bb 100644 --- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps +++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps @@ -16,6 +16,7 @@ + @@ -41,7 +42,9 @@ - + + + @@ -59,6 +62,7 @@ + @@ -230,6 +234,9 @@ + + + @@ -591,6 +598,21 @@ + + + + + + + + + + + + + + + @@ -669,6 +691,10 @@ + + + + @@ -17532,5 +17558,349 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd index 400d58e0ec..022c445b17 100644 --- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd +++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd @@ -65,6 +65,7 @@ + From 277f55003c25f820c320b81c49c7315853101fc3 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sat, 22 Jul 2023 19:57:09 +0200 Subject: [PATCH 2/5] Remove inter-procedural parts --- .../org.iets3.core.expr.toplevel.dataFlow.mps | 317 ------------------ .../org.iets3.core.expr.toplevel.mpl | 1 - 2 files changed, 318 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org.iets3.core.expr.toplevel.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org.iets3.core.expr.toplevel.dataFlow.mps index 4020089a25..93f1ec1b97 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org.iets3.core.expr.toplevel.dataFlow.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org.iets3.core.expr.toplevel.dataFlow.mps @@ -3,33 +3,15 @@ - - - - - - - - - - - - - - - - - - @@ -40,13 +22,6 @@ - - - - - - - @@ -57,38 +32,17 @@ - - - - - - - - - - - - - - - - - - - - - @@ -104,26 +58,7 @@ - - - - - - - - - - - - - - - - - - - @@ -143,9 +78,6 @@ - - - @@ -154,8 +86,6 @@ - - @@ -482,253 +412,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl index e48a9b09b8..539a44bab2 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl @@ -38,7 +38,6 @@ - From 5daf4b5c8b41ed8832aba39190f2304279ebcfda Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sat, 22 Jul 2023 20:25:18 +0200 Subject: [PATCH 3/5] Optimize some imports + rebuild build script --- .../org.iets3.core.expr.base/models/constraints.mps | 1 - .../org.iets3.core.expr.base/models/editor.mps | 2 -- .../org.iets3.core.expr.base/models/intentions.mps | 4 ---- .../org.iets3.core.expr.base/models/listeners.mps | 11 +---------- .../org.iets3.core.expr.base/models/migration.mps | 5 ----- .../org.iets3.core.expr.base/models/plugin.mps | 3 --- .../org.iets3.core.expr.base/models/structure.mps | 1 - .../org.iets3.core.expr.base.mpl | 5 +---- .../models/plugin.mps | 1 - .../org.iets3.core.expr.simpleTypes.interpreter.msd | 9 --------- .../models/org/iets3/opensource/build/build.mps | 2 ++ 11 files changed, 4 insertions(+), 40 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps index dc275d54e1..5d2feafbeb 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps @@ -8,7 +8,6 @@ - diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps index 2af2eea5a8..a54cce2a6f 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps @@ -10,8 +10,6 @@ - - diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps index 39aa040eba..0a784b4dba 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps @@ -6,8 +6,6 @@ - - @@ -20,10 +18,8 @@ - - diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/listeners.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/listeners.mps index d2f5f68939..6c757697ef 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/listeners.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/listeners.mps @@ -3,17 +3,8 @@ - - - - - - - - - - + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/migration.mps index 172567417a..dca3789e83 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/migration.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/migration.mps @@ -3,10 +3,7 @@ - - - @@ -14,8 +11,6 @@ - - diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps index 0f4ef941ed..292c888236 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps @@ -29,8 +29,6 @@ - - @@ -40,7 +38,6 @@ - diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps index 956854e706..cb7312c222 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps @@ -5,7 +5,6 @@ - diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/org.iets3.core.expr.base.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/org.iets3.core.expr.base.mpl index f917fdedae..bdbd449c4e 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/org.iets3.core.expr.base.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/org.iets3.core.expr.base.mpl @@ -24,13 +24,11 @@ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) 726886d1-ef90-4249-a08f-1e3ec23a7113(com.mbeddr.mpsutil.traceExplorer) c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) - dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime) + dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime) 00ca1323-762b-4f39-ab5a-6a6bd602dc4b(org.iets3.core.expr.base.shared.runtime) - - @@ -71,7 +69,6 @@ - diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/models/plugin.mps index 241e26e88f..dc3c1987dd 100644 --- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/models/plugin.mps +++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/models/plugin.mps @@ -8,7 +8,6 @@ - diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/org.iets3.core.expr.simpleTypes.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/org.iets3.core.expr.simpleTypes.interpreter.msd index 48f7a46893..28dbf92315 100644 --- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/org.iets3.core.expr.simpleTypes.interpreter.msd +++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/org.iets3.core.expr.simpleTypes.interpreter.msd @@ -22,14 +22,7 @@ 00ca1323-762b-4f39-ab5a-6a6bd602dc4b(org.iets3.core.expr.base.shared.runtime) - - - - - - - @@ -40,8 +33,6 @@ - - diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps index 3c3d94badf..22b31387af 100644 --- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps +++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps @@ -7117,6 +7117,7 @@ + @@ -13673,6 +13674,7 @@ + From b0c2e4ef97311c67b867ab09d636fff4cf6dc26a Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sat, 22 Jul 2023 20:59:46 +0200 Subject: [PATCH 4/5] Introduce a method to query the referencable node of left values --- .../models/behavior.mps | 16 ++++++++++ .../models/behavior.mps | 30 +++++++++++++++++++ .../org.iets3.core.expr.base.dataFlow.mps | 30 +++++++++++-------- .../models/behavior.mps | 16 ++++++++++ .../models/behavior.mps | 16 ++++++++++ .../models/behavior.mps | 16 ++++++++++ 6 files changed, 111 insertions(+), 13 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps index 8d962d5b55..cd6a36056e 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps @@ -5896,6 +5896,22 @@ + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps index 8180eb11f4..0f3a9c63a7 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps @@ -3130,6 +3130,17 @@ + + + + + + + + + + + @@ -10922,6 +10933,17 @@ + + + + + + + + + + + @@ -25014,6 +25036,14 @@ + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/org.iets3.core.expr.base.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/org.iets3.core.expr.base.dataFlow.mps index 4225ed17cc..aff199b3f6 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/org.iets3.core.expr.base.dataFlow.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/org.iets3.core.expr.base.dataFlow.mps @@ -8,7 +8,7 @@ - + @@ -44,6 +44,9 @@ + + + @@ -87,6 +90,7 @@ + @@ -935,15 +939,15 @@ - - - - - + + + + + - + @@ -953,17 +957,17 @@ - + - - + + - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps index 696a9a8c9a..d420e32df8 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps @@ -5664,6 +5664,22 @@ + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/behavior.mps index d815120b90..5666edd6ea 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/behavior.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/behavior.mps @@ -418,6 +418,22 @@ + + + + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps index 4920b13e05..18f8fc5b5a 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps @@ -1685,6 +1685,22 @@ + + + + + + + + + + + + + + + + From 10a21143bda35695c5dc1adad3188fe8e3db4fb5 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sat, 22 Jul 2023 21:36:07 +0200 Subject: [PATCH 5/5] Fix tests --- .../models/test/ts/expr/os/m1@tests.mps | 75 +++++++++++++++++++ .../test.ts.expr.os/models/typetags@tests.mps | 8 ++ .../models/unitsonly@tests.mps | 41 ++++++++++ 3 files changed, 124 insertions(+) diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps index 95e29119bb..a793a10062 100644 --- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps +++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps @@ -802,6 +802,10 @@ + + + + @@ -922,6 +926,10 @@ + + + + @@ -994,6 +1002,10 @@ + + + + @@ -1639,6 +1651,10 @@ + + + + @@ -1763,6 +1779,10 @@ + + + + @@ -2255,6 +2275,10 @@ + + + + @@ -3169,6 +3193,10 @@ + + + + @@ -3305,6 +3333,10 @@ + + + + @@ -5787,6 +5819,10 @@ + + + + @@ -6140,6 +6176,10 @@ + + + + @@ -6430,6 +6470,10 @@ + + + + @@ -7642,6 +7686,7 @@ + @@ -7663,6 +7708,7 @@ + @@ -7687,6 +7733,7 @@ + @@ -14469,6 +14516,10 @@ + + + + @@ -14890,6 +14941,10 @@ + + + + @@ -15068,6 +15123,10 @@ + + + + @@ -15300,6 +15359,10 @@ + + + + @@ -15664,6 +15727,10 @@ + + + + @@ -16543,6 +16610,10 @@ + + + + @@ -16760,6 +16831,10 @@ + + + + diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/typetags@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/typetags@tests.mps index dcb3fd4ab9..2bfb184a1e 100644 --- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/typetags@tests.mps +++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/typetags@tests.mps @@ -133,6 +133,10 @@ + + + + @@ -463,6 +467,10 @@ + + + + diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/unitsonly@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/unitsonly@tests.mps index 50368f82c6..5d5e65d759 100644 --- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/unitsonly@tests.mps +++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/unitsonly@tests.mps @@ -532,6 +532,10 @@ + + + + @@ -739,6 +743,10 @@ + + + + @@ -1064,6 +1072,10 @@ + + + + @@ -1642,6 +1654,10 @@ + + + + @@ -1924,6 +1940,10 @@ + + + + @@ -3494,6 +3514,10 @@ + + + + @@ -4969,9 +4993,14 @@ + + + + + @@ -5410,6 +5439,10 @@ + + + + @@ -6244,6 +6277,10 @@ + + + + @@ -6802,6 +6839,10 @@ + + + +