From 95653e38a8627292d8eb68cf68f27643d4203fc7 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Mon, 4 Aug 2014 21:58:17 +0200 Subject: [PATCH] Made propagation rules work (BUG in JCHR) --- .../languageModels/plugin.mps | 9 ++ .../jetbrains/mps/unification/sandbox.mps | 83 +++++++++---------- .../mps/logic/sandbox/runner/typeof.mps | 19 ++++- 3 files changed, 64 insertions(+), 47 deletions(-) diff --git a/languages/jetbrains.mps.jchr/languageModels/plugin.mps b/languages/jetbrains.mps.jchr/languageModels/plugin.mps index 23db328c..4f08ae49 100644 --- a/languages/jetbrains.mps.jchr/languageModels/plugin.mps +++ b/languages/jetbrains.mps.jchr/languageModels/plugin.mps @@ -767,6 +767,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 8e20df5f..6625c485 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 @@ -10,104 +10,101 @@ + + - - - + + + - - + + - + - + - - + + - + - - + + + - + - + - + - - - - - - - - - - - + - - + + - - + + - + - + - + - + - - + + - + - + - - + + - + - - + + + + + + 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 19daef17..9022538f 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 @@ -8,6 +8,7 @@ + @@ -69,8 +70,13 @@ - - + + + + + + + @@ -89,8 +95,13 @@ - - + + + + + + +