From 98a71dc8b905df322fe064aa6e39f9a18959859b Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Tue, 5 Aug 2014 17:00:45 +0200 Subject: [PATCH] Better integration of JCHR rules into Java: handler type and constraint operations --- .../generator/template/main@generator.mps | 546 ++++++++++++++++++ .../jetbrains.mps.jchr/jetbrains.mps.jchr.mpl | 4 + .../languageModels/actions.mps | 295 +++++++++- .../languageModels/behavior.mps | 170 +++++- .../languageModels/constraints.mps | 226 ++++++++ .../languageModels/editor.mps | 133 ++++- .../languageModels/plugin.mps | 2 +- .../languageModels/structure.mps | 110 +++- .../languageModels/textGen.mps | 13 +- .../languageModels/typesystem.mps | 337 ++++++++++- .../models/jetbrains/mps/jchr/sandbox.mps | 2 +- .../generator/template/main@generator.mps | 6 +- .../jetbrains/mps/unification/sandbox.mps | 4 +- .../models/jetbrains/mps/unification/util.mps | 4 +- .../jetbrains.mps.logic.sandbox.runner.msd | 2 + .../mps/logic/sandbox/runner/typeof.mps | 240 ++++---- 16 files changed, 1955 insertions(+), 139 deletions(-) diff --git a/languages/jetbrains.mps.jchr/generator/template/main@generator.mps b/languages/jetbrains.mps.jchr/generator/template/main@generator.mps index d10b0af1..5592ed17 100644 --- a/languages/jetbrains.mps.jchr/generator/template/main@generator.mps +++ b/languages/jetbrains.mps.jchr/generator/template/main@generator.mps @@ -5,11 +5,557 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl b/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl index e8cd6360..03e9b749 100644 --- a/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl +++ b/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl @@ -18,9 +18,11 @@ + df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal) 894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr) b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator) d7706f63-9be2-479c-a3da-ae92af1e64d5(jetbrains.mps.lang.generator.generationContext) + 7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -49,7 +51,9 @@ f3347d8a-0e79-4f35-8ac9-1574f25c986f(jetbrains.mps.execution.commands) 63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access) 0272d3b4-4cc8-481e-9e2f-07793fbfcb41(jetbrains.mps.lang.editor.table) + d4615e3b-d671-4ba9-af01-2b78369b0ba7(jetbrains.mps.lang.pattern) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) + 13744753-c81f-424a-9c1b-cf8943bf4e86(jetbrains.mps.lang.sharedConcepts) 9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable) 696c1165-4a59-463b-bc5d-902caab85dd0(jetbrains.mps.make.facet) 95f8a3e6-f994-4ca0-a65e-763c9bae2d3b(jetbrains.mps.make.script) diff --git a/languages/jetbrains.mps.jchr/languageModels/actions.mps b/languages/jetbrains.mps.jchr/languageModels/actions.mps index a76c8a97..65508423 100644 --- a/languages/jetbrains.mps.jchr/languageModels/actions.mps +++ b/languages/jetbrains.mps.jchr/languageModels/actions.mps @@ -3,14 +3,16 @@ + - - + + + @@ -18,6 +20,7 @@ + @@ -1935,5 +1938,293 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.jchr/languageModels/behavior.mps b/languages/jetbrains.mps.jchr/languageModels/behavior.mps index 0a950703..b521560a 100644 --- a/languages/jetbrains.mps.jchr/languageModels/behavior.mps +++ b/languages/jetbrains.mps.jchr/languageModels/behavior.mps @@ -1,9 +1,9 @@ - + - + @@ -16,7 +16,9 @@ + + @@ -35,6 +37,7 @@ + @@ -68,6 +71,7 @@ + @@ -101,6 +105,7 @@ + @@ -149,6 +154,7 @@ + @@ -1150,5 +1156,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.jchr/languageModels/constraints.mps b/languages/jetbrains.mps.jchr/languageModels/constraints.mps index 5dfe736a..78331418 100644 --- a/languages/jetbrains.mps.jchr/languageModels/constraints.mps +++ b/languages/jetbrains.mps.jchr/languageModels/constraints.mps @@ -3,5 +3,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.jchr/languageModels/editor.mps b/languages/jetbrains.mps.jchr/languageModels/editor.mps index 94f6c060..f9f89cc5 100644 --- a/languages/jetbrains.mps.jchr/languageModels/editor.mps +++ b/languages/jetbrains.mps.jchr/languageModels/editor.mps @@ -5,9 +5,9 @@ - + - + @@ -19,6 +19,7 @@ + @@ -27,7 +28,7 @@ - + @@ -75,6 +76,7 @@ + @@ -82,6 +84,7 @@ + @@ -93,6 +96,7 @@ + @@ -111,6 +115,7 @@ + @@ -122,6 +127,7 @@ + @@ -178,6 +184,7 @@ + @@ -234,6 +241,7 @@ + @@ -296,6 +304,7 @@ + @@ -322,6 +331,7 @@ + @@ -453,6 +463,7 @@ + @@ -565,10 +576,11 @@ + - + @@ -631,6 +643,7 @@ + @@ -648,6 +661,7 @@ + @@ -697,5 +711,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.jchr/languageModels/plugin.mps b/languages/jetbrains.mps.jchr/languageModels/plugin.mps index 4f08ae49..2812f270 100644 --- a/languages/jetbrains.mps.jchr/languageModels/plugin.mps +++ b/languages/jetbrains.mps.jchr/languageModels/plugin.mps @@ -17,7 +17,7 @@ - + diff --git a/languages/jetbrains.mps.jchr/languageModels/structure.mps b/languages/jetbrains.mps.jchr/languageModels/structure.mps index 1f737079..10c15900 100644 --- a/languages/jetbrains.mps.jchr/languageModels/structure.mps +++ b/languages/jetbrains.mps.jchr/languageModels/structure.mps @@ -1,17 +1,22 @@ - + + - - + + + + + + @@ -42,6 +47,7 @@ + @@ -63,6 +69,7 @@ + @@ -85,6 +92,7 @@ + @@ -97,6 +105,7 @@ + @@ -109,6 +118,7 @@ + @@ -125,6 +135,7 @@ + @@ -135,6 +146,7 @@ + @@ -148,6 +160,7 @@ + @@ -158,6 +171,7 @@ + @@ -168,6 +182,7 @@ + @@ -178,6 +193,7 @@ + @@ -188,6 +204,7 @@ + @@ -211,6 +228,7 @@ + @@ -227,9 +245,11 @@ + + @@ -257,5 +277,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.jchr/languageModels/textGen.mps b/languages/jetbrains.mps.jchr/languageModels/textGen.mps index fc3998c1..d3077982 100644 --- a/languages/jetbrains.mps.jchr/languageModels/textGen.mps +++ b/languages/jetbrains.mps.jchr/languageModels/textGen.mps @@ -10,13 +10,14 @@ - + + @@ -306,6 +307,7 @@ + @@ -399,6 +401,7 @@ + @@ -516,6 +519,7 @@ + @@ -609,6 +613,7 @@ + @@ -667,6 +672,7 @@ + @@ -684,6 +690,7 @@ + @@ -748,6 +755,7 @@ + @@ -833,6 +841,7 @@ + @@ -870,6 +879,7 @@ + @@ -908,6 +918,7 @@ + diff --git a/languages/jetbrains.mps.jchr/languageModels/typesystem.mps b/languages/jetbrains.mps.jchr/languageModels/typesystem.mps index 362e90b2..d127a24e 100644 --- a/languages/jetbrains.mps.jchr/languageModels/typesystem.mps +++ b/languages/jetbrains.mps.jchr/languageModels/typesystem.mps @@ -2,17 +2,23 @@ + - + + + + + + @@ -265,5 +271,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps b/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps index 8524cce6..00dbfc9d 100644 --- a/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps +++ b/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps @@ -12,7 +12,7 @@ - + diff --git a/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/languages/jetbrains.mps.logic/generator/template/main@generator.mps index c2b8ee58..39a6d701 100644 --- a/languages/jetbrains.mps.logic/generator/template/main@generator.mps +++ b/languages/jetbrains.mps.logic/generator/template/main@generator.mps @@ -10,15 +10,15 @@ - + + + - - diff --git a/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/sandbox.mps b/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/sandbox.mps index 6625c485..4cd2722f 100644 --- a/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/sandbox.mps +++ b/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/sandbox.mps @@ -3,16 +3,14 @@ - - - + diff --git a/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/util.mps b/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/util.mps index b3a2711d..90deb3dc 100644 --- a/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/util.mps +++ b/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/util.mps @@ -3,12 +3,14 @@ + + + - diff --git a/languages/jetbrains.mps.logic/sandbox/runner/jetbrains.mps.logic.sandbox.runner.msd b/languages/jetbrains.mps.logic/sandbox/runner/jetbrains.mps.logic.sandbox.runner.msd index edcb582f..35acca04 100644 --- a/languages/jetbrains.mps.logic/sandbox/runner/jetbrains.mps.logic.sandbox.runner.msd +++ b/languages/jetbrains.mps.logic/sandbox/runner/jetbrains.mps.logic.sandbox.runner.msd @@ -14,6 +14,8 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal) + 894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr) + 35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic) diff --git a/languages/jetbrains.mps.logic/sandbox/runner/models/jetbrains/mps/logic/sandbox/runner/typeof.mps b/languages/jetbrains.mps.logic/sandbox/runner/models/jetbrains/mps/logic/sandbox/runner/typeof.mps index 9022538f..2f8f6f98 100644 --- a/languages/jetbrains.mps.logic/sandbox/runner/models/jetbrains/mps/logic/sandbox/runner/typeof.mps +++ b/languages/jetbrains.mps.logic/sandbox/runner/models/jetbrains/mps/logic/sandbox/runner/typeof.mps @@ -3,160 +3,165 @@ + + + - - - - - + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - + - - - - - - - - + + + - - + + - - - - + + + + - + - - - + + + - + @@ -165,7 +170,8 @@ - + +