From fc3b953a8ebac4f325eee361837bd0b44fd8de65 Mon Sep 17 00:00:00 2001
From: yakomaxa <47655565+yakomaxa@users.noreply.github.com>
Date: Wed, 17 Aug 2022 11:55:45 +0900
Subject: [PATCH] Added whitespace remover to prefixRemoveKet in helper.ts and
update rasmol.spec.ts
---
src/mol-script/transpilers/_spec/rasmol.spec.ts | 5 +++--
src/mol-script/transpilers/helper.ts | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/mol-script/transpilers/_spec/rasmol.spec.ts b/src/mol-script/transpilers/_spec/rasmol.spec.ts
index f8206d87b..77b42605e 100644
--- a/src/mol-script/transpilers/_spec/rasmol.spec.ts
+++ b/src/mol-script/transpilers/_spec/rasmol.spec.ts
@@ -29,14 +29,15 @@ const general = {
' [ALA] and [VAL] ',
' [ALA] and [VAL]',
// within with whitespaces
- 'within ( 5 , [HEM]) ',
+ 'within ( 5 , [HEM] ) ',
],
unsupported: [
// un-braketed residue name
'LEU and ILE',
// un-parenthesized residue index
'100-120',
- // un-parenthesized within in the head or middle of sentence
+ // within in the head or the middle of sentence
+ 'within ( 5 , [HEM] ) and backbone',
]
};
diff --git a/src/mol-script/transpilers/helper.ts b/src/mol-script/transpilers/helper.ts
index ae5976abd..39791def6 100644
--- a/src/mol-script/transpilers/helper.ts
+++ b/src/mol-script/transpilers/helper.ts
@@ -31,7 +31,7 @@ export function prefix(opParser: P.MonadicParser<any>, nextParser: P.MonadicPars
export function prefixRemoveKet(opParser: P.MonadicParser<any>, nextParser: P.MonadicParser<any>, mapFn: any) {
const parser: P.MonadicParser<any> = P.MonadicParser.lazy(() => {
- return P.MonadicParser.seq(opParser, parser.skip(P.MonadicParser.regexp(/\)/)))
+ return P.MonadicParser.seq(opParser, parser.skip(P.MonadicParser.regexp(/\s*\)/)))
.map(x => mapFn(...x))
.or(nextParser);
});
--
GitLab