From 0511d3e59980cce042239402148f4c69fff2610f Mon Sep 17 00:00:00 2001
From: yakomaxa <47655565+yakomaxa@users.noreply.github.com>
Date: Sun, 21 Aug 2022 16:51:38 +0900
Subject: [PATCH] Unparenthesized residue range enabled in RasMol and
parenthesized was un-activated
---
src/mol-script/transpilers/rasmol/parser.ts | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/mol-script/transpilers/rasmol/parser.ts b/src/mol-script/transpilers/rasmol/parser.ts
index c62790188..efb537dda 100644
--- a/src/mol-script/transpilers/rasmol/parser.ts
+++ b/src/mol-script/transpilers/rasmol/parser.ts
@@ -132,7 +132,8 @@ const lang = P.MonadicParser.createLanguage({
r.Parens,
r.Operator,
r.Expression
- ).wrap(P.MonadicParser.regexp(/\(\s+/), P.MonadicParser.regexp(/\s+\)/));
+ ).wrap(P.MonadicParser.string("("), P.MonadicParser.string(")"));
+// ).wrap(P.MonadicParser.regexp(/\(\s+/), P.MonadicParser.regexp(/\s+\)/));
},
Expression: function (r: any) {
@@ -189,17 +190,6 @@ const lang = P.MonadicParser.createLanguage({
orNull(propertiesDict.chain)
).map(x => { return { chain: x[0] }; }),
)),
- // 1-100,201
- bra.then(P.MonadicParser.alt(
- P.MonadicParser.alt(
- P.MonadicParser.seq(
- propertiesDict.resi.skip(ket),
- ).map(x => {
- return { resi: x[0] }
- ;
- })
- )
- )),
// [lys]10:a.ca [lys]10:a [lys]10 [lys]10.ca
// [lys]:a.ca [lys]:a [lys] [lys].ca
commu.then(P.MonadicParser.alt(
--
GitLab