From e93144d7efdc4f7da8a1fe23553c514b5f3f8311 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Thu, 18 Jun 2015 18:30:47 +0200 Subject: [PATCH] Fixed running the rules handler, better tracing of evaluated constraints --- .../lang/typesystem2/samplechecker/runner.mps | 111 ++++++++++-------- .../lang/typesystem2/sampleplugin/plugin.mps | 103 +++++++++++++++- 2 files changed, 160 insertions(+), 54 deletions(-) diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps index 284a87d6..0e55cd03 100644 --- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps +++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps @@ -23,6 +23,7 @@ + @@ -393,70 +394,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + + - + - + - - + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -769,18 +770,26 @@ - + - - + + - + + + + + + + + + diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps index 316630d9..844d877c 100644 --- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps +++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps @@ -28,7 +28,7 @@ - + @@ -62,6 +62,7 @@ + @@ -293,6 +294,9 @@ + + + @@ -596,7 +600,7 @@ - + @@ -616,7 +620,7 @@ - + @@ -1911,6 +1915,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3752,6 +3841,14 @@ + + + + + + + +