diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/ConstraintOccurrence.java b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/ConstraintOccurrence.java index b28eb16a..fea6f4de 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/ConstraintOccurrence.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/ConstraintOccurrence.java @@ -7,8 +7,8 @@ import java.util.List; public interface ConstraintOccurrence { - public Constraint constraint(); + Constraint constraint(); - public List arguments(); + List arguments(); } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java index b4492726..16419de2 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java @@ -60,9 +60,9 @@ public abstract class EvaluationSession { protected static interface Backend { - public EvaluationSession current(); + EvaluationSession current(); - public EvaluationSession.Config createConfig(Program program); + EvaluationSession.Config createConfig(Program program); } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java index 64e7b63b..518c16ab 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java @@ -5,34 +5,34 @@ package jetbrains.mps.logic.reactor.evaluation; public interface EvaluationTrace { - public void activate(ConstraintOccurrence occurrence); + void activate(ConstraintOccurrence occurrence); - public void reactivate(ConstraintOccurrence occurrence); + void reactivate(ConstraintOccurrence occurrence); - public void suspend(ConstraintOccurrence occurrence); + void suspend(ConstraintOccurrence occurrence); - public void discard(ConstraintOccurrence occurrence); + void discard(ConstraintOccurrence occurrence); - public void trying(MatchRule matchRule); + void trying(MatchRule matchRule); - public void reject(MatchRule matchRule); + void reject(MatchRule matchRule); - public void trigger(MatchRule matchRule); + void trigger(MatchRule matchRule); - public void retry(MatchRule matchRule); + void retry(MatchRule matchRule); - public void finish(MatchRule matchRule); + void finish(MatchRule matchRule); - public void tell(PredicateInvocation invocation); + void tell(PredicateInvocation invocation); - public void ask(boolean result, PredicateInvocation invocation); + void ask(boolean result, PredicateInvocation invocation); - public void failure(EvaluationFailureException fail); + void failure(EvaluationFailureException fail); @Deprecated - public void reportFailure(String message); + void reportFailure(String message); - public static final EvaluationTrace NULL = new EvaluationTrace() { + EvaluationTrace NULL = new EvaluationTrace() { public void activate(ConstraintOccurrence occurrence) { } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/Instructible.java b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/Instructible.java index fe84aa62..0feafd56 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/Instructible.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/Instructible.java @@ -5,6 +5,6 @@ package jetbrains.mps.logic.reactor.evaluation; public interface Instructible { - public void tell(PredicateInvocation invocation); + void tell(PredicateInvocation invocation); } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/MatchRule.java b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/MatchRule.java index c848a4b0..49ab22a4 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/MatchRule.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/MatchRule.java @@ -6,10 +6,10 @@ import jetbrains.mps.logic.reactor.program.Rule; public interface MatchRule { - public Rule rule(); + Rule rule(); - public Iterable matchHeadKept(); + Iterable matchHeadKept(); - public Iterable matchHeadReplaced(); + Iterable matchHeadReplaced(); } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/PredicateInvocation.java b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/PredicateInvocation.java index 1f563298..82a5a166 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/PredicateInvocation.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/PredicateInvocation.java @@ -7,8 +7,8 @@ import java.util.List; public interface PredicateInvocation { - public Predicate predicate(); + Predicate predicate(); - public List arguments(); + List arguments(); } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/Queryable.java b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/Queryable.java index 428536c2..ee387efc 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/Queryable.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/Queryable.java @@ -5,6 +5,6 @@ package jetbrains.mps.logic.reactor.evaluation; public interface Queryable extends Instructible { - public boolean ask(PredicateInvocation invocation); + boolean ask(PredicateInvocation invocation); } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/trace.info b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/trace.info index 51e5035f..1ab42c97 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/trace.info +++ b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/trace.info @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -135,7 +135,7 @@ - + @@ -437,5 +437,5 @@ - + diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/Logical.java b/reactor/API/src/jetbrains/mps/logic/reactor/logical/Logical.java index ca512719..a4c7bc24 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/logical/Logical.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/logical/Logical.java @@ -5,14 +5,14 @@ package jetbrains.mps.logic.reactor.logical; public interface Logical { - public String name(); + String name(); /** * Returns the representative logical instance. * * TODO: rename to 'find()' */ - public Logical findRoot(); + Logical findRoot(); /** * Returns the value associated with this logical instance. @@ -21,15 +21,15 @@ public interface Logical { * * FIXME: must return the representative's value */ - public T value(); + T value(); /** * True iff the representative has a non-null value. */ - public boolean isBound(); + boolean isBound(); - public boolean isWildcard(); + boolean isWildcard(); - public MetaLogical metaLogical(); + MetaLogical metaLogical(); } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalContext.java b/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalContext.java index 892097c3..90298fa0 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalContext.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalContext.java @@ -5,6 +5,6 @@ package jetbrains.mps.logic.reactor.logical; public interface LogicalContext { - public Logical variable(MetaLogical metaLogical); + Logical variable(MetaLogical metaLogical); } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalOwner.java b/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalOwner.java new file mode 100644 index 00000000..40829adb --- /dev/null +++ b/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalOwner.java @@ -0,0 +1,10 @@ +package jetbrains.mps.logic.reactor.logical; + +/*Generated by MPS */ + + +public interface LogicalOwner { + + Logical logical(); + +} diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalUnification.java b/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalUnification.java index a35a06ca..a078c2b5 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalUnification.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalUnification.java @@ -6,10 +6,10 @@ import jetbrains.mps.unification.Term; public interface LogicalUnification { - public TERM asRoot(TERM term); + TERM asRoot(TERM term); - public SolverLogical logical(TERM var); + SolverLogical logical(TERM var); - public boolean isLogical(Term term); + boolean isLogical(Term term); } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/SolverLogical.java b/reactor/API/src/jetbrains/mps/logic/reactor/logical/SolverLogical.java index c31ac145..0ca7da93 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/logical/SolverLogical.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/logical/SolverLogical.java @@ -8,29 +8,29 @@ public interface SolverLogical extends Logical { /** * Covariant override. */ - public SolverLogical findRoot(); + SolverLogical findRoot(); /** * Unions two equivalence classes of logicals. * Both the receiver and the {@code other} parameter are expected to be representatives. * The one with the highest rank becomes the representative for the new class. */ - public void union(SolverLogical other, SolverLogical.ValueReconciler reconciler); + void union(SolverLogical other, SolverLogical.ValueReconciler reconciler); /** * Calls {@link jetbrains.mps.logic.reactor.logical.SolverLogical#union(SolverLogical, SolverLogical.ValueReconciler) } with the default value reconciler. * The default reconciler throws {@link java.lang.IllegalArgumentException } if the two values are not equal. */ - public void union(SolverLogical other); + void union(SolverLogical other); /** * Should only be called on a representative. */ - public void setValue(T newValue); + void setValue(T newValue); - public static interface ValueReconciler { + static interface ValueReconciler { - public void reconcile(T valueA, T valueB); + void reconcile(T valueA, T valueB); } 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 f7c98367..4ed934dc 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/logical/trace.info +++ b/reactor/API/src/jetbrains/mps/logic/reactor/logical/trace.info @@ -1,14 +1,14 @@ - - - - - - - - - - + + + + + + + + + + @@ -26,6 +26,13 @@ + + + + + + + @@ -162,5 +169,5 @@ - + diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/AndItem.java b/reactor/API/src/jetbrains/mps/logic/reactor/program/AndItem.java index cc04f66e..8f16f05c 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/program/AndItem.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/program/AndItem.java @@ -6,8 +6,8 @@ import java.util.Collection; public interface AndItem { - public Symbol symbol(); + Symbol symbol(); - public Collection arguments(); + Collection arguments(); } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/Constraint.java b/reactor/API/src/jetbrains/mps/logic/reactor/program/Constraint.java index 3605c275..fb743f76 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/program/Constraint.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/program/Constraint.java @@ -11,17 +11,17 @@ import jetbrains.mps.logic.reactor.logical.LogicalContext; */ public interface Constraint extends AndItem { - public ConstraintSymbol symbol(); + ConstraintSymbol symbol(); - public List> argumentTypes(); + List> argumentTypes(); - public Collection occurrenceArguments(LogicalContext logicalContext); + Collection occurrenceArguments(LogicalContext logicalContext); /** * Returns the collection of predicates that need to be applied after a successful match of this collection by a * rule's head. * This method only returns meaningful results for constraints that serve as patterns in a rule's head. */ - public Collection patternPredicates(); + Collection patternPredicates(); } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/Predicate.java b/reactor/API/src/jetbrains/mps/logic/reactor/program/Predicate.java index fab43e86..9dc9757b 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/program/Predicate.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/program/Predicate.java @@ -10,9 +10,9 @@ import jetbrains.mps.logic.reactor.logical.LogicalContext; */ public interface Predicate extends AndItem { - public PredicateSymbol symbol(); + PredicateSymbol symbol(); - public Collection invocationArguments(LogicalContext logicalContext); + Collection invocationArguments(LogicalContext logicalContext); } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/PredicateFactory.java b/reactor/API/src/jetbrains/mps/logic/reactor/program/PredicateFactory.java index e89d829c..fc8cb0bb 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/program/PredicateFactory.java +++ b/reactor/API/src/jetbrains/mps/logic/reactor/program/PredicateFactory.java @@ -5,6 +5,6 @@ package jetbrains.mps.logic.reactor.program; public interface PredicateFactory { - public Predicate predicate(PredicateSymbol predicateSymbol, Object... args); + Predicate predicate(PredicateSymbol predicateSymbol, Object... args); } diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/trace.info b/reactor/API/src/jetbrains/mps/logic/reactor/program/trace.info index 8c219d6a..ebd3b905 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/program/trace.info +++ b/reactor/API/src/jetbrains/mps/logic/reactor/program/trace.info @@ -1,16 +1,16 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -248,5 +248,5 @@ - +