From 7b49463297eb8197490b1bc51392cdc42f649c2c Mon Sep 17 00:00:00 2001
From: yakomaxa <47655565+yakomaxa@users.noreply.github.com>
Date: Sun, 7 Aug 2022 06:16:29 +0900
Subject: [PATCH] NamedAtomProperties was added to vmd parser
---
src/mol-script/transpilers/vmd/parser.ts | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/mol-script/transpilers/vmd/parser.ts b/src/mol-script/transpilers/vmd/parser.ts
index 30be59e1c..3fc999e79 100644
--- a/src/mol-script/transpilers/vmd/parser.ts
+++ b/src/mol-script/transpilers/vmd/parser.ts
@@ -123,11 +123,16 @@ const lang = P.MonadicParser.createLanguage({
Expression: function (r:any) {
return P.MonadicParser.alt(
r.RangeListProperty,
+ r.NamedAtomProperties,
r.ValueQuery,
r.Keywords,
);
},
+ NamedAtomProperties: function () {
+ return P.MonadicParser.alt(...h.getNamedPropertyRules(properties));
+ },
+
Keywords: () => P.MonadicParser.alt(...h.getKeywordRules(keywords)),
ValueRange: function (r:any) {
@@ -171,8 +176,9 @@ const lang = P.MonadicParser.createLanguage({
test = rangeTest ? rangeTest : listTest;
}
- // return B.struct.generator.atomGroups({ [h.testLevel(property)]: test });
- // h.testLevel is not working for unknown reasons
+ // return B.struct.generator.atomGroups({ [h.testLevel(property)]: test });
+ // h.testLevel is not working for unknown reason, so relaced it by hardcoded 'atom-test'
+// console.log(h.testLevel(property));
return B.struct.generator.atomGroups({ 'atom-test': test });
});
},
--
GitLab