diff --git a/src/mol-script/transpilers/vmd/parser.ts b/src/mol-script/transpilers/vmd/parser.ts index 30be59e1ca9c463048492c2213dfa1341c3265b5..3fc999e790b783cf5abdcf86edbb1901be98f8ef 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 }); }); },