diff options
author | Kristóf Marussy <kristof@marussy.com> | 2024-06-30 21:09:12 +0200 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2024-06-30 21:51:40 +0200 |
commit | 031932e139d00ec5993b742d734eb11645b762b7 (patch) | |
tree | 3501427e25aab0daf5731b69d82e726447fe5251 /subprojects/language/src | |
parent | feat(language): computed value validation (diff) | |
download | refinery-031932e139d00ec5993b742d734eb11645b762b7.tar.gz refinery-031932e139d00ec5993b742d734eb11645b762b7.tar.zst refinery-031932e139d00ec5993b742d734eb11645b762b7.zip |
refactor(language): change computed value symbol
Diffstat (limited to 'subprojects/language/src')
3 files changed, 4 insertions, 4 deletions
diff --git a/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext b/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext index 5adc50eb..8d7d485b 100644 --- a/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext +++ b/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext | |||
@@ -200,7 +200,7 @@ CastExprBody returns Expr: | |||
200 | 200 | ||
201 | Atom: | 201 | Atom: |
202 | relation=[Relation|QualifiedName] | 202 | relation=[Relation|QualifiedName] |
203 | computed?="<-"? | 203 | computed?="$"? |
204 | transitiveClosure?=TRANSITIVE_CLOSURE? | 204 | transitiveClosure?=TRANSITIVE_CLOSURE? |
205 | "(" (arguments+=Expr ("," arguments+=Expr)*)? ")"; | 205 | "(" (arguments+=Expr ("," arguments+=Expr)*)? ")"; |
206 | 206 | ||
diff --git a/subprojects/language/src/main/java/tools/refinery/language/parser/antlr/ProblemTokenSource.java b/subprojects/language/src/main/java/tools/refinery/language/parser/antlr/ProblemTokenSource.java index e483517a..d47863da 100644 --- a/subprojects/language/src/main/java/tools/refinery/language/parser/antlr/ProblemTokenSource.java +++ b/subprojects/language/src/main/java/tools/refinery/language/parser/antlr/ProblemTokenSource.java | |||
@@ -88,7 +88,7 @@ public class ProblemTokenSource implements TokenSource { | |||
88 | } | 88 | } |
89 | 89 | ||
90 | protected boolean isComputed(Token token) { | 90 | protected boolean isComputed(Token token) { |
91 | return token.getType() == InternalProblemParser.LessThanSignHyphenMinus; | 91 | return token.getType() == InternalProblemParser.DollarSign; |
92 | } | 92 | } |
93 | 93 | ||
94 | protected boolean isVisibleToken(Token token) { | 94 | protected boolean isVisibleToken(Token token) { |
diff --git a/subprojects/language/src/test/java/tools/refinery/language/tests/parser/antlr/ProblemTokenSourceTest.java b/subprojects/language/src/test/java/tools/refinery/language/tests/parser/antlr/ProblemTokenSourceTest.java index 5ea928d7..02a31534 100644 --- a/subprojects/language/src/test/java/tools/refinery/language/tests/parser/antlr/ProblemTokenSourceTest.java +++ b/subprojects/language/src/test/java/tools/refinery/language/tests/parser/antlr/ProblemTokenSourceTest.java | |||
@@ -67,8 +67,8 @@ class ProblemTokenSourceTest { | |||
67 | "equals+(a, b)", | 67 | "equals+(a, b)", |
68 | "equals + (a, b)", | 68 | "equals + (a, b)", |
69 | "equals+(a::x, b)", | 69 | "equals+(a::x, b)", |
70 | "equals<-+(a, b)", | 70 | "equals$+(a, b)", |
71 | "equals<- + (a, b)" | 71 | "equals$ + (a, b)" |
72 | }) | 72 | }) |
73 | void transitiveClosureInTokenStreamTest(String text) { | 73 | void transitiveClosureInTokenStreamTest(String text) { |
74 | var tokenList = createTokenList(text); | 74 | var tokenList = createTokenList(text); |