diff options
author | Kristóf Marussy <kristof@marussy.com> | 2024-01-31 02:00:09 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2024-01-31 18:45:13 +0100 |
commit | c63126d2f1ce5f571c316b37e00fb43d2da7c7d3 (patch) | |
tree | 16e9dd04624565f7c9ccedd17749a9f264e89cb0 /subprojects/language-web/src | |
parent | fix(build): avoid cyclic dependency (diff) | |
download | refinery-c63126d2f1ce5f571c316b37e00fb43d2da7c7d3.tar.gz refinery-c63126d2f1ce5f571c316b37e00fb43d2da7c7d3.tar.zst refinery-c63126d2f1ce5f571c316b37e00fb43d2da7c7d3.zip |
refactor(language): module and node declarations
* New default file extension: .refinery (.problem is also supported).
* Add module keyword for self-contained modules.
* Rename indiv declarations to atom declaration.
* Add node and multi declarations for explicitly declared nodes and
multi-objects, respectively.
Diffstat (limited to 'subprojects/language-web/src')
3 files changed, 5 insertions, 7 deletions
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/MetadataCreator.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/MetadataCreator.java index f05abc45..1f49b0d0 100644 --- a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/MetadataCreator.java +++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/MetadataCreator.java | |||
@@ -87,14 +87,12 @@ public class MetadataCreator { | |||
87 | } | 87 | } |
88 | 88 | ||
89 | private NodeKind getNodeKind(Node node) { | 89 | private NodeKind getNodeKind(Node node) { |
90 | if (ProblemUtil.isImplicitNode(node)) { | 90 | if (ProblemUtil.isAtomNode(node)) { |
91 | return NodeKind.IMPLICIT; | ||
92 | } else if (ProblemUtil.isIndividualNode(node)) { | ||
93 | return NodeKind.INDIVIDUAL; | 91 | return NodeKind.INDIVIDUAL; |
94 | } else if (ProblemUtil.isNewNode(node)) { | 92 | } else if (ProblemUtil.isMultiNode(node)) { |
95 | return NodeKind.NEW; | 93 | return NodeKind.NEW; |
96 | } else { | 94 | } else { |
97 | throw new TracedException(node, "Unknown node type"); | 95 | return NodeKind.IMPLICIT; |
98 | } | 96 | } |
99 | } | 97 | } |
100 | 98 | ||
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java index 889a55cb..dd5d8a03 100644 --- a/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java +++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java | |||
@@ -129,7 +129,7 @@ class ProblemWebSocketServletIntegrationTest { | |||
129 | case 4 -> //noinspection TextBlockMigration | 129 | case 4 -> //noinspection TextBlockMigration |
130 | session.sendText( | 130 | session.sendText( |
131 | "{\"id\":\"bar\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\"," + | 131 | "{\"id\":\"bar\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\"," + |
132 | "\"requiredStateId\":\"-80000000\",\"deltaText\":\"indiv q.\nnode(q).\n\"," + | 132 | "\"requiredStateId\":\"-80000000\",\"deltaText\":\"atom q.\nnode(q).\n\"," + |
133 | "\"deltaOffset\":\"0\",\"deltaReplaceLength\":\"0\"}}", | 133 | "\"deltaOffset\":\"0\",\"deltaReplaceLength\":\"0\"}}", |
134 | Callback.NOOP | 134 | Callback.NOOP |
135 | ); | 135 | ); |
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java index 22ce1b47..265723ff 100644 --- a/subprojects/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java +++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java | |||
@@ -97,7 +97,7 @@ class TransactionExecutorTest { | |||
97 | var stateId = updateFullText(); | 97 | var stateId = updateFullText(); |
98 | var responseHandler = sendRequestAndWaitForAllResponses( | 98 | var responseHandler = sendRequestAndWaitForAllResponses( |
99 | new XtextWebRequest("bar", Map.of("resource", RESOURCE_NAME, "serviceType", "update", "requiredStateId", | 99 | new XtextWebRequest("bar", Map.of("resource", RESOURCE_NAME, "serviceType", "update", "requiredStateId", |
100 | stateId, "deltaText", "indiv q.\nnode(q).\n", "deltaOffset", "0", "deltaReplaceLength", | 100 | stateId, "deltaText", "atom q.\nnode(q).\n", "deltaOffset", "0", "deltaReplaceLength", |
101 | "0"))); | 101 | "0"))); |
102 | 102 | ||
103 | var captor = newCaptor(); | 103 | var captor = newCaptor(); |