From ac08fa840d2c833443d212d126244b87709aa7a6 Mon Sep 17 00:00:00 2001 From: Andre Pacak Date: Sat, 30 Nov 2019 10:14:18 +0100 Subject: [PATCH] insert conversion premise right under the premise that binds converted metavar --- .../template/TypeLang.generator.util.mps | 314 ++++++++---------- .../generator/template/main@generator.mps | 160 +++++++-- .../languages/TypeLang/models/behavior.mps | 71 ++++ 3 files changed, 339 insertions(+), 206 deletions(-) diff --git a/inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps b/inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps index b228335..fbf2d07 100644 --- a/inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps +++ b/inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps @@ -392,7 +392,6 @@ - @@ -4647,184 +4646,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5307,6 +5128,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8408,6 +8341,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/inca-translation/languages/TypeLang/generator/template/main@generator.mps b/inca-translation/languages/TypeLang/generator/template/main@generator.mps index c13b2dc..143eb57 100644 --- a/inca-translation/languages/TypeLang/generator/template/main@generator.mps +++ b/inca-translation/languages/TypeLang/generator/template/main@generator.mps @@ -18,6 +18,7 @@ + @@ -65,6 +66,7 @@ + @@ -88,7 +90,9 @@ - + + + @@ -268,6 +272,9 @@ + + + @@ -305,7 +312,6 @@ - @@ -742,11 +748,11 @@ - + - + @@ -818,7 +824,9 @@ - + + + @@ -2121,17 +2129,6 @@ - - - - - - - - - - - @@ -2296,31 +2293,140 @@ - - - - - + + + + + + + + + - - + + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/inca-translation/languages/TypeLang/models/behavior.mps b/inca-translation/languages/TypeLang/models/behavior.mps index f6653e0..8ea8292 100644 --- a/inca-translation/languages/TypeLang/models/behavior.mps +++ b/inca-translation/languages/TypeLang/models/behavior.mps @@ -8456,5 +8456,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab