diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/constraint/AbstractConstraint.java b/reactor/API/src/jetbrains/mps/logic/reactor/constraint/AbstractConstraint.java index 0e90337f..f79f8d11 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/constraint/AbstractConstraint.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/constraint/AbstractConstraint.java @@ -8,6 +8,7 @@ import java.util.Arrays; import java.util.List; import java.util.ArrayList; import jetbrains.mps.logic.reactor.logical.LogicalPattern; +import jetbrains.mps.logic.reactor.logical.LogicalContext; public class AbstractConstraint implements Constraint { @@ -36,6 +37,11 @@ public class AbstractConstraint implements Constraint { return types; } + public ConstraintOccurrence occurrence(LogicalContext context) { + // FIXME: implement me + throw new UnsupportedOperationException("not implemented"); + } + private ConstraintSymbol symbol; private Object[] arguments; } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/constraint/Constraint.java b/reactor/API/src/jetbrains/mps/logic/reactor/constraint/Constraint.java index 6d1cbf70..d51cc927 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/constraint/Constraint.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/constraint/Constraint.java @@ -3,11 +3,10 @@ package jetbrains.mps.logic.reactor.constraint; /*Generated by MPS */ import java.util.List; +import jetbrains.mps.logic.reactor.logical.LogicalContext; /** * A constraint provided by a handler. Can only be told. - * FIXME: should be merely a factory for ConstraintOccurrence's - * FIXME: should be provided by the session (from ConstraintSymbol) */ public interface Constraint extends AndItem { @@ -15,4 +14,6 @@ public interface Constraint extends AndItem { public List> argumentTypes(); + public ConstraintOccurrence occurrence(LogicalContext context); + } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/constraint/trace.info b/reactor/API/src/jetbrains/mps/logic/reactor/constraint/trace.info index 57c07954..4380f53e 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/constraint/trace.info +++ b/reactor/API/src/jetbrains/mps/logic/reactor/constraint/trace.info @@ -9,6 +9,7 @@ + @@ -26,7 +27,7 @@ - + @@ -77,9 +78,9 @@ - + - + @@ -109,11 +110,11 @@ - + - + @@ -154,7 +155,7 @@ - + @@ -179,12 +180,12 @@ - - - - - - + + + + + + @@ -204,49 +205,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + - + - - + + - + @@ -305,7 +313,7 @@ - + @@ -393,10 +401,10 @@ - + - + @@ -442,11 +450,15 @@ - - - - - + + + + + + + + + diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalContext.java b/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalContext.java new file mode 100644 index 00000000..7be2f3e3 --- /dev/null +++ b/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalContext.java @@ -0,0 +1,10 @@ +package jetbrains.mps.logic.reactor.logical; + +/*Generated by MPS */ + + +public interface LogicalContext { + + public Object valueFor(LogicalPattern logicalPattern); + +} diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/trace.info b/reactor/API/src/jetbrains/mps/logic/reactor/logical/trace.info index 9eaab8bd..9dc6d8a5 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/logical/trace.info +++ b/reactor/API/src/jetbrains/mps/logic/reactor/logical/trace.info @@ -103,5 +103,14 @@ + + + + + + + + +