From ff95a22ef329e311032834f402a889844f603613 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Thu, 12 Nov 2015 11:42:26 +0100 Subject: [PATCH] Better constraints printing in external runner --- ....lang.typesystem2.samplechecker.runner.msd | 22 +- .../lang/typesystem2/samplechecker/runner.mps | 355 +++++++++++++----- 2 files changed, 270 insertions(+), 107 deletions(-) diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd index 1a75e6bb..7cf0c47d 100644 --- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd +++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd @@ -7,14 +7,10 @@ - b6db9382-d342-43fd-8051-5b6af3c0c80a(jetbrains.mps.lang.typesystem2.samplechecker.handler) - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime) - 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - 3ddddf69-9ff0-426b-9365-51ae7356fb82(jetbrains.mps.lang.typesystem2.sample) 7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom) - b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime) 26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime) + f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) @@ -26,24 +22,26 @@ - - - - - + + + + + + + + + - - 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 e2766b11..19778920 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 @@ -2,11 +2,8 @@ - - - @@ -21,7 +18,6 @@ - @@ -54,6 +50,9 @@ + + + @@ -1457,7 +1456,7 @@ - + @@ -1492,7 +1491,7 @@ - + @@ -1598,81 +1597,107 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + + + - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + - - - - - - - + - - + + @@ -1718,49 +1743,57 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + + + + - - - + + + + + + @@ -1798,7 +1831,7 @@ - + @@ -1863,8 +1896,16 @@ - - + + + + + + + + + + @@ -1969,6 +2010,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +