Until

Author: sinclairzx81

src/compile/func/func.ts

@@ -87,7 +87,7 @@ function FromConst(options: Options, name: string, value: string): string {
 // ------------------------------------------------------------------
 function FromUntil(options: Options, name: string, values: string[]): string {
   const escaped = values.map(value => `'${Escape(value)}'`)
-  return `Runtime.Token.Until('${escaped.join(', ')}', input)`
+  return `Runtime.Token.Until(${escaped.join(', ')}, input)`
 }
 // ------------------------------------------------------------------
 // Ident

test/__tests__/runtime/token.ts

@@ -176,4 +176,20 @@ Deno.test('Until: Newline-Multi-Whitespace', () => {
   Assert(Runtime.Token.Until(['\n  '], '  \n  A '), ['  ', '\n  A '])
   Assert(Runtime.Token.Until(['\n  '], '  \n  AA'), ['  ', '\n  AA'])
   Assert(Runtime.Token.Until(['\n  '], '  \n  AA '), ['  ', '\n  AA '])
+})
+
+Deno.test('Until: Multi Sentinal Test', () => {
+  Assert(Runtime.Token.Until(['A', 'B'], ''), [])
+  Assert(Runtime.Token.Until(['A', 'B'], 'A'), ['', 'A'])
+  Assert(Runtime.Token.Until(['A', 'B'], 'B'), ['', 'B'])
+  Assert(Runtime.Token.Until(['A', 'B'], 'AB'), ['', 'AB'])
+  Assert(Runtime.Token.Until(['A', 'B'], 'BA'), ['', 'BA'])
+  Assert(Runtime.Token.Until(['A', 'B'], '   AB'), ['   ', 'AB'])
+  Assert(Runtime.Token.Until(['A', 'B'], '   BA'), ['   ', 'BA'])
+  Assert(Runtime.Token.Until(['A', ' B'], '   BA'), ['  ', ' BA'])
+  Assert(Runtime.Token.Until([' A', 'B'], '   BA'), ['   ', 'BA'])
+  Assert(Runtime.Token.Until(['B', 'A'], '   AB'), ['   ', 'AB'])
+  Assert(Runtime.Token.Until(['B', 'A'], '   BA'), ['   ', 'BA'])
+  Assert(Runtime.Token.Until(['B', ' A'], '   BA'), ['   ', 'BA'])
+  Assert(Runtime.Token.Until([' B', 'A'], '   BA'), ['  ', ' BA'])
 })

test/__tests__/static/token.ts

@@ -210,4 +210,22 @@ Assert<Static.Token.Until<['\n  '], '  \nAA '>, []>
 Assert<Static.Token.Until<['\n  '], '\n  A'>, ['', '\n  A']>
 Assert<Static.Token.Until<['\n  '], '  \n  A '>, ['  ', '\n  A ']>
 Assert<Static.Token.Until<['\n  '], '  \n  AA'>, ['  ', '\n  AA']>
-Assert<Static.Token.Until<['\n  '], '  \n  AA '>, ['  ', '\n  AA ']>
+Assert<Static.Token.Until<['\n  '], '  \n  AA '>, ['  ', '\n  AA ']>
+
+// ------------------------------------------------------------------
+// Until: Multi Sentinal Test
+// ------------------------------------------------------------------
+Assert<Static.Token.Until<['A', 'B'], ''>, []>
+Assert<Static.Token.Until<['A', 'B'], 'A'>, ['', 'A']>
+Assert<Static.Token.Until<['A', 'B'], 'B'>, ['', 'B']>
+Assert<Static.Token.Until<['A', 'B'], 'AB'>, ['', 'AB']>
+Assert<Static.Token.Until<['A', 'B'], 'BA'>, ['', 'BA']>
+Assert<Static.Token.Until<['A', 'B'], '   AB'>, ['   ', 'AB']>
+Assert<Static.Token.Until<['A', 'B'], '   BA'>, ['   ', 'BA']>
+Assert<Static.Token.Until<['A', ' B'], '   BA'>, ['  ', ' BA']>
+Assert<Static.Token.Until<[' A', 'B'], '   BA'>, ['   ', 'BA']>
+Assert<Static.Token.Until<['B', 'A'], '   AB'>, ['   ', 'AB']>
+Assert<Static.Token.Until<['B', 'A'], '   BA'>, ['   ', 'BA']>
+Assert<Static.Token.Until<['B', ' A'], '   BA'>, ['   ', 'BA']>
+Assert<Static.Token.Until<[' B', 'A'], '   BA'>, ['  ', ' BA']>
+