Переглянути джерело

Added whitespace remover to prefixRemoveKet in helper.ts and update rasmol.spec.ts

yakomaxa 2 роки тому
батько
коміт
fc3b953a8e

+ 3 - 2
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',
     ]
 };
 

+ 1 - 1
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);
     });