From 5dcc71d2a55b9e4b1f716ffe719a690744bd748a Mon Sep 17 00:00:00 2001 From: Grigorii Kirgizov Date: Mon, 20 Apr 2020 22:26:00 +0300 Subject: [PATCH] Separate typing or return statement from checking its compatibility with method type For convenience: to always get typeOf(return) to unconditionally match on it (eg in closures lang) --- .../jetbrains.mps.baseLanguageExt.types.mps | 418 ++++++++++-------- 1 file changed, 241 insertions(+), 177 deletions(-) diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps index 36c5b000..9c54990e 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps @@ -11684,8 +11684,127 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11693,170 +11812,115 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + @@ -17669,6 +17733,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -17700,28 +17786,6 @@ - - - - - - - - - - - - - - - - - - - - - -