From 20a0bedd81e901d62f26b3df32b7f82f33653ce8 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Fri, 13 Oct 2023 17:45:35 +0200 Subject: [PATCH] Refactor call macro cstr: keep arguments in binding list The idea is to have default parameters in (regular) macro definition. Refactoring and corresponding migration. --- .../generator/template/main@generator.mps | 220 +++++++++++-- .../jetbrains.mps.lang.coderules.mpl | 2 +- .../languageModels/constraints.mps | 86 ++++- .../languageModels/editor.mps | 140 +++++++++ .../languageModels/migration.mps | 294 ++++++++++++++++++ .../languageModels/structure.mps | 33 ++ .../languageModels/typesystem.mps | 54 ++++ 7 files changed, 791 insertions(+), 38 deletions(-) diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps index 9091a91d..6de24907 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps @@ -458,6 +458,7 @@ + @@ -10310,49 +10311,200 @@ - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl index fee895c5..34ef5e2f 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl +++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl @@ -1,5 +1,5 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps index 4b8da84d..8b9daf99 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps @@ -2381,9 +2381,89 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps index 3c526106..4b0fa5be 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps @@ -3439,6 +3439,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4211,6 +4240,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9493,5 +9551,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps index 4de210be..3355d688 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps @@ -171,6 +171,9 @@ + + + @@ -181,6 +184,7 @@ + @@ -236,6 +240,10 @@ + + + + @@ -247,7 +255,18 @@ + + + + + + + + + + + @@ -2350,5 +2369,280 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps index 022713c9..c82809ab 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps @@ -1081,6 +1081,12 @@ + + + + + + @@ -1357,6 +1363,14 @@ + + + + + + + + @@ -1811,5 +1825,24 @@ + + + + + + + + + + + + + + + + + + + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps index e3a3f28e..82a968f9 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps @@ -1604,5 +1604,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +