From 020d625940402f5898e0635e1f6d0af65a2d4c7e Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Mon, 28 Jul 2014 10:44:47 +0200 Subject: [PATCH] Support for local variables in rule's body. Minor fixes. Updated the args4j library --- .../jetbrains.mps.jchr/jetbrains.mps.jchr.mpl | 4 + .../languageModels/actions.mps | 192 ++++- .../languageModels/behavior.mps | 688 +++++++++++++++++- .../languageModels/editor.mps | 216 +++++- .../languageModels/plugin.mps | 172 ++++- .../languageModels/structure.mps | 58 ++ .../languageModels/textGen.mps | 233 +++++- .../runtime/jetbrains.mps.jchr.runtime.msd | 6 +- .../sandbox/jetbrains.mps.jchr.sandbox.msd | 1 + .../models/jetbrains/mps/jchr/sandbox.mps | 325 +++++++++ 10 files changed, 1876 insertions(+), 19 deletions(-) diff --git a/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl b/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl index 2754c7ae..03e7355b 100644 --- a/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl +++ b/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl @@ -32,6 +32,9 @@ 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) 22250116-183c-4e90-8450-b6a13dd8998b(jetbrains.mps.baseLanguage.execution.util) + b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime) + 258bd2f6-0d02-411d-86b2-5a5ea083e6d2(jetbrains.mps.lang.editor.table.runtime) + 86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project) f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets) a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime) df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources) @@ -42,6 +45,7 @@ f2801650-65d5-424e-bb1b-463a8781b786(jetbrains.mps.baseLanguage.javadoc) 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) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) 9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable) 696c1165-4a59-463b-bc5d-902caab85dd0(jetbrains.mps.make.facet) diff --git a/languages/jetbrains.mps.jchr/languageModels/actions.mps b/languages/jetbrains.mps.jchr/languageModels/actions.mps index c5541d01..fadb7f0d 100644 --- a/languages/jetbrains.mps.jchr/languageModels/actions.mps +++ b/languages/jetbrains.mps.jchr/languageModels/actions.mps @@ -5,14 +5,15 @@ + + - - + @@ -493,5 +494,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.jchr/languageModels/behavior.mps b/languages/jetbrains.mps.jchr/languageModels/behavior.mps index fffc3227..95ebdf96 100644 --- a/languages/jetbrains.mps.jchr/languageModels/behavior.mps +++ b/languages/jetbrains.mps.jchr/languageModels/behavior.mps @@ -4,11 +4,18 @@ - - + + + + + + + + + @@ -141,5 +148,682 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.jchr/languageModels/editor.mps b/languages/jetbrains.mps.jchr/languageModels/editor.mps index a09e3edf..0a725ed0 100644 --- a/languages/jetbrains.mps.jchr/languageModels/editor.mps +++ b/languages/jetbrains.mps.jchr/languageModels/editor.mps @@ -2,15 +2,21 @@ + + + + + + + - - - + + @@ -268,6 +274,9 @@ + + + @@ -307,6 +316,19 @@ + + + + + + + + + + + + + @@ -371,6 +393,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -384,5 +428,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.jchr/languageModels/plugin.mps b/languages/jetbrains.mps.jchr/languageModels/plugin.mps index 214b1b3b..692287a7 100644 --- a/languages/jetbrains.mps.jchr/languageModels/plugin.mps +++ b/languages/jetbrains.mps.jchr/languageModels/plugin.mps @@ -33,6 +33,8 @@ + + @@ -71,6 +73,11 @@ + + + + + @@ -84,6 +91,11 @@ + + + + + @@ -113,6 +125,7 @@ + @@ -261,6 +274,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -279,6 +344,9 @@ + + + @@ -296,9 +364,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -342,6 +452,7 @@ + @@ -379,6 +490,23 @@ + + + + + + + + + + + + + + + + + @@ -394,14 +522,35 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + @@ -413,6 +562,15 @@ + + + + + + + + + @@ -428,7 +586,7 @@ - + @@ -700,7 +858,7 @@ - + @@ -854,7 +1012,7 @@ - + diff --git a/languages/jetbrains.mps.jchr/languageModels/structure.mps b/languages/jetbrains.mps.jchr/languageModels/structure.mps index c8ce8d44..ee0f351c 100644 --- a/languages/jetbrains.mps.jchr/languageModels/structure.mps +++ b/languages/jetbrains.mps.jchr/languageModels/structure.mps @@ -15,12 +15,24 @@ + + + + + + + + + + + + @@ -155,5 +167,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.jchr/languageModels/textGen.mps b/languages/jetbrains.mps.jchr/languageModels/textGen.mps index 15309401..52b56d6f 100644 --- a/languages/jetbrains.mps.jchr/languageModels/textGen.mps +++ b/languages/jetbrains.mps.jchr/languageModels/textGen.mps @@ -9,11 +9,13 @@ + + - + @@ -54,6 +56,15 @@ + + + + + + + + + @@ -175,6 +186,14 @@ + + + + + + + + @@ -233,6 +252,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -676,5 +747,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd b/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd index 36364bfd..3c5b1cd2 100644 --- a/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd +++ b/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd @@ -1,18 +1,16 @@ - - - + - + diff --git a/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd b/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd index a9bf80d4..c26225c0 100644 --- a/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd +++ b/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd @@ -11,6 +11,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal) 894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 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 c92d6573..7574f7ac 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 @@ -4,10 +4,16 @@ + + + + + + @@ -73,5 +79,324 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +