diff --git a/src/mol-script/transpilers/_spec/rasmol.spec.ts b/src/mol-script/transpilers/_spec/rasmol.spec.ts index c7d3c662da320240a785c459a9f11ab3302d430f..87865f3e3ec7773e61071e4ed619c7eba42ba50d 100644 --- a/src/mol-script/transpilers/_spec/rasmol.spec.ts +++ b/src/mol-script/transpilers/_spec/rasmol.spec.ts @@ -36,10 +36,10 @@ const general = { '100-120,220', // un-parenthesized residue index '20', - ], - unsupported: [ // within in the head or the middle of sentence 'within ( 5 , [HEM] ) and backbone', + ], + unsupported: [ ] }; diff --git a/src/mol-script/transpilers/rasmol/parser.ts b/src/mol-script/transpilers/rasmol/parser.ts index d51059b19dca8dfa39928cbd7afb2b7a0ef7e3bd..6b9e5ff9555aa2ec160956480f1db5c3ddd28eb0 100644 --- a/src/mol-script/transpilers/rasmol/parser.ts +++ b/src/mol-script/transpilers/rasmol/parser.ts @@ -116,7 +116,6 @@ function atomSelectionQuery2(x: any) { function atomExpressionQuery(x: any[]) { const [resnorange, resno, inscode, chainname, atomname, altloc] = x[1]; - // const [resnorange, inscode, chainname, atomname, altloc] = x[1]; const tests: AtomGroupArgs = {}; if (chainname) { @@ -149,7 +148,6 @@ function atomExpressionQuery(x: any[]) { function resnorangeExpressionQuery(x: any[]) { const [resnorange, chainname] = x; - // const [resnorange, inscode, chainname, atomname, altloc] = x[1]; const tests: AtomGroupArgs = {}; if (chainname) { @@ -326,8 +324,7 @@ const lang = P.MonadicParser.createLanguage({ }, Operator: function (r: any) { - return h.combineOperators(operators, P.MonadicParser.alt(r.Parens, r.Expression, r.Operator)); - //return h.combineOperators(operators, P.MonadicParser.alt(r.Parens, r.Expression)); + return h.combineOperators(operators, P.MonadicParser.alt(r.Parens, r.Expression, r.Operator)); }, AtomExpression: function (r: any) { @@ -372,7 +369,7 @@ const lang = P.MonadicParser.createLanguage({ ResnoRange: function (r: any) { return P.MonadicParser.regex(/-?[0-9,-]+/).map(listOrRangeMap).desc('resnorange'); // // 123-200 - // // -12--3 + // // -12--3 }, Keywords: () => P.MonadicParser.alt(...h.getKeywordRules(keywords)),