From c6889be4e7d0d59930b1174ff65525015af4e1da Mon Sep 17 00:00:00 2001 From: Grigorii Kirgizov Date: Thu, 6 Feb 2020 01:02:50 +0300 Subject: [PATCH] Consider possible errors at rule generation stage as non fatal and produce Program with some rules dropped (fixes MPSCR-38) New Result.RECOVERED case-class is added which collects errors but doesn't fail. Currently errors are collected but not reported. --- .../jetbrains.mps.lang.coderules.eval.mps | 337 ++++++++++ .../jetbrains.mps.lang.coderules.program.mps | 628 ++++++++++++------ .../models/service.mps | 37 ++ 3 files changed, 815 insertions(+), 187 deletions(-) diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps index 7b448b98..0289638d 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps @@ -2419,6 +2419,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2609,6 +2677,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps index a79f387c..621fbb57 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps @@ -4701,105 +4701,131 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -4851,60 +4877,83 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - + - - - - - - - - + + + + + + - - + + + + + + + + + + + + + + + + + - - + + - + - - - + + @@ -10216,18 +10265,243 @@ - + - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10262,77 +10536,59 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - + + + + - - - + + + - - + + - + - - + + - + - - - - + + + + - - - - + + + + - + - + - - + + @@ -10340,20 +10596,16 @@ - - - - - - - - - - - - - + + + + + + + + + @@ -10362,6 +10614,7 @@ + @@ -10370,6 +10623,7 @@ + @@ -10461,7 +10715,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps index 0d249117..7d4e0882 100644 --- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps +++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps @@ -891,6 +891,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +