From 94e05f48edf17d7a3600c43730d00f1bfc8fb794 Mon Sep 17 00:00:00 2001 From: Andre Pacak Date: Wed, 6 Nov 2019 16:33:29 +0100 Subject: [PATCH] Experiment with recursion detection in type lang --- .../languages/TypeLang/models/behavior.mps | 208 ++++- .../languages/TypeLang/models/constraints.mps | 4 + .../languages/TypeLang/models/editor.mps | 88 +- .../languages/TypeLang/models/structure.mps | 10 + .../languages/TypeLang/models/typesystem.mps | 89 +- .../solutions/TypeLangTest/models/test.mps | 775 +++++++++++++++--- 6 files changed, 999 insertions(+), 175 deletions(-) diff --git a/inca-translation/languages/TypeLang/models/behavior.mps b/inca-translation/languages/TypeLang/models/behavior.mps index c5bc381..fc459d7 100644 --- a/inca-translation/languages/TypeLang/models/behavior.mps +++ b/inca-translation/languages/TypeLang/models/behavior.mps @@ -7,7 +7,213 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/inca-translation/languages/TypeLang/models/constraints.mps b/inca-translation/languages/TypeLang/models/constraints.mps index 6a4aff7..6ed26f6 100644 --- a/inca-translation/languages/TypeLang/models/constraints.mps +++ b/inca-translation/languages/TypeLang/models/constraints.mps @@ -401,5 +401,9 @@ + + + + diff --git a/inca-translation/languages/TypeLang/models/editor.mps b/inca-translation/languages/TypeLang/models/editor.mps index fdff8c5..db9ba2d 100644 --- a/inca-translation/languages/TypeLang/models/editor.mps +++ b/inca-translation/languages/TypeLang/models/editor.mps @@ -13,9 +13,9 @@ - + @@ -24,12 +24,10 @@ - - @@ -38,7 +36,6 @@ - @@ -86,7 +83,6 @@ - @@ -103,7 +99,6 @@ - @@ -139,7 +134,6 @@ - @@ -195,9 +189,6 @@ - - - @@ -206,14 +197,13 @@ - + - @@ -348,69 +338,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -481,9 +408,6 @@ - - - @@ -1390,5 +1314,13 @@ + + + + + + + + diff --git a/inca-translation/languages/TypeLang/models/structure.mps b/inca-translation/languages/TypeLang/models/structure.mps index e9ed024..f7854fe 100644 --- a/inca-translation/languages/TypeLang/models/structure.mps +++ b/inca-translation/languages/TypeLang/models/structure.mps @@ -585,5 +585,15 @@ + + + + + + + + + + diff --git a/inca-translation/languages/TypeLang/models/typesystem.mps b/inca-translation/languages/TypeLang/models/typesystem.mps index b1a5bd0..08c79fb 100644 --- a/inca-translation/languages/TypeLang/models/typesystem.mps +++ b/inca-translation/languages/TypeLang/models/typesystem.mps @@ -5,7 +5,92 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/inca-translation/solutions/TypeLangTest/models/test.mps b/inca-translation/solutions/TypeLangTest/models/test.mps index 6176877..bf88609 100644 --- a/inca-translation/solutions/TypeLangTest/models/test.mps +++ b/inca-translation/solutions/TypeLangTest/models/test.mps @@ -18,6 +18,7 @@ + @@ -39,6 +40,18 @@ + + + + + + + + + + + + @@ -71,21 +84,21 @@ - + - + - + @@ -96,28 +109,21 @@ - - - - + + + + - + - + - + - - - - - - - - + - + @@ -167,9 +173,30 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -206,17 +233,14 @@ - - - + + + - + - - - @@ -254,7 +278,7 @@ - + @@ -280,7 +304,7 @@ - + @@ -343,17 +367,14 @@ - - - + + + - + - - - @@ -395,98 +416,126 @@ - - - + + + - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + + + + - + - + - + - + - + - + - - + + + + + - - + + + + + + + + + + + + + + + + + + + - - - + + + - + - - + + - - - + + + - + - - + + + + + + + + + + + + + + + + + + + @@ -609,5 +658,543 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.22.2