From 4845e120e903510da5cce1e4e87446fe62a988ab Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Mon, 13 Apr 2020 10:08:18 +0200 Subject: [PATCH] Introduce termlist type, rename multilogical type to logical[]. --- .../generator/template/main@generator.mps | 16 ++ .../jetbrains.mps.logic.mpl | 2 +- .../languageModels/editor.mps | 66 +++++++- .../languageModels/migration.mps | 153 ++++++++++++++++++ .../languageModels/structure.mps | 14 +- .../languageModels/typesystem.mps | 19 ++- 6 files changed, 265 insertions(+), 5 deletions(-) diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps index 3e36fd0a..c6f0fd46 100644 --- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps +++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps @@ -3390,6 +3390,22 @@ + + + + + + + + + + + + + + + + diff --git a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl index a998a5a3..3e78eebf 100644 --- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl +++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl @@ -1,5 +1,5 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps index d710044d..6d298d46 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps @@ -4538,7 +4538,7 @@ - + @@ -5295,5 +5295,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps index e8dda0ac..d2fc6a61 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps @@ -22,6 +22,7 @@ + @@ -135,6 +136,22 @@ + + + + + + + + + + + + + + + + @@ -167,6 +184,7 @@ + @@ -2428,5 +2446,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps index de8b54ac..8c918867 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps @@ -368,9 +368,12 @@ - + + + + @@ -778,7 +781,7 @@ - + @@ -858,5 +861,12 @@ + + + + + + + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps index 9c430479..e5eb0086 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps @@ -1399,7 +1399,7 @@ - + @@ -1558,5 +1558,22 @@ + + + + + + + + + + + + + + + + +