From 6b7075eccf7ddaccc797ffbdd855dd4b0bbad0d4 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sat, 6 Nov 2021 16:39:42 +0100 Subject: chore(lang): shorten keyword individual -> indiv --- language/src/main/java/tools/refinery/language/Problem.xtext | 4 ++-- .../java/tools/refinery/language/validation/ProblemValidator.java | 2 +- .../java/tools/refinery/language/tests/ProblemParsingTest.xtend | 2 +- .../tools/refinery/language/tests/scoping/NodeScopingTest.xtend | 6 +++--- .../refinery/language/tests/serializer/ProblemSerializerTest.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'language') diff --git a/language/src/main/java/tools/refinery/language/Problem.xtext b/language/src/main/java/tools/refinery/language/Problem.xtext index b7562759..e2723b55 100644 --- a/language/src/main/java/tools/refinery/language/Problem.xtext +++ b/language/src/main/java/tools/refinery/language/Problem.xtext @@ -174,7 +174,7 @@ ExactMultiplicity: exactValue=INT; IndividualDeclaration: - "individual" nodes+=EnumLiteral ("," nodes+=EnumLiteral)* "."; + "indiv" nodes+=EnumLiteral ("," nodes+=EnumLiteral)* "."; UpperBound returns ecore::EInt: INT | "*"; @@ -184,7 +184,7 @@ QualifiedName hidden(): Identifier: ID | "true" | "false" | "unknown" | "error" | "class" | "abstract" | "extends" | "enum" | "pred" | - "individual" | "problem" | "new" | "delete" | "direct" | "rule"; + "indiv" | "problem" | "new" | "delete" | "direct" | "rule"; Integer returns ecore::EInt hidden(): "-"? INT; diff --git a/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java b/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java index 3c10d39e..975fdca2 100644 --- a/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java +++ b/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java @@ -53,7 +53,7 @@ public class ProblemValidator extends AbstractProblemValidator { var variableOrNode = argument.getVariableOrNode(); if (variableOrNode instanceof Node node && !ProblemUtil.isIndividualNode(node)) { var name = node.getName(); - var message = "Only individual nodes can be referenced in predicates. Mark '%s' as individual with the declaration 'individual %s.'" + var message = "Only individual nodes can be referenced in predicates. Mark '%s' as individual with the declaration 'indiv %s.'" .formatted(name, name); error(message, argument, ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE, INSIGNIFICANT_INDEX, NON_INDIVIDUAL_NODE_ISSUE); diff --git a/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend b/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend index 9e357529..53d31a6c 100644 --- a/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend +++ b/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend @@ -46,7 +46,7 @@ class ProblemParsingTest { error invalidTaxStatus(Person p) <-> taxStatus(p, child), children(p, _q). - individual family. + indiv family. Family(family). members(family, anne): true. members(family, bob). diff --git a/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend b/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend index 5f669847..3a046341 100644 --- a/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend +++ b/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend @@ -81,7 +81,7 @@ class NodeScopingTest { def void individualNodeInAssertionTest(String qualifiedNamePrefix, boolean namedProblem) { val it = parseHelper.parse(''' «IF namedProblem»problem test.«ENDIF» - individual a, b. + indiv a, b. pred predicate(node x, node y) <-> node(x). predicate(«qualifiedNamePrefix»a, «qualifiedNamePrefix»a). ?predicate(«qualifiedNamePrefix»a, «qualifiedNamePrefix»b). @@ -99,7 +99,7 @@ class NodeScopingTest { def void individualNodeInNodeValueAssertionTest(String qualifiedNamePrefix, boolean namedProblem) { val it = parseHelper.parse(''' «IF namedProblem»problem test.«ENDIF» - individual a. + indiv a. «qualifiedNamePrefix»a: 16. ''') assertThat(errors, empty) @@ -112,7 +112,7 @@ class NodeScopingTest { def void individualNodeInPredicateTest(String qualifiedNamePrefix, boolean namedProblem) { val it = parseHelper.parse(''' «IF namedProblem»problem test.«ENDIF» - individual b. + indiv b. pred predicate(node a) <-> node(«qualifiedNamePrefix»b). ''') assertThat(errors, empty) diff --git a/language/src/test/java/tools/refinery/language/tests/serializer/ProblemSerializerTest.java b/language/src/test/java/tools/refinery/language/tests/serializer/ProblemSerializerTest.java index 34c1d14b..303da50f 100644 --- a/language/src/test/java/tools/refinery/language/tests/serializer/ProblemSerializerTest.java +++ b/language/src/test/java/tools/refinery/language/tests/serializer/ProblemSerializerTest.java @@ -74,7 +74,7 @@ public class ProblemSerializerTest { problem.getStatements().add(individualDeclaration); createAssertion(pred, node); - assertSerializedResult("pred foo ( node p ) . individual a . foo ( a ) : true ."); + assertSerializedResult("pred foo ( node p ) . indiv a . foo ( a ) : true ."); } private PredicateDefinition createPred() { -- cgit v1.2.3-54-g00ecf