space-as-terminal

src/execute/lex-pipe.ts

@@ -45,6 +45,13 @@ export class LexPipe extends Frame implements IFinish, IPerformer {
           parser.finish(value)
           break
         }
+        case 'bind': {
+          break
+          const next_parser = parser.bind()
+          this.set(Frame.kOUT, next_parser)
+          this.level += 1
+          break
+        }
         case 'push': {
           const next_parser = parser.push(value)
           this.set(Frame.kOUT, next_parser)

src/execute/lex.ts

@@ -57,8 +57,9 @@ export class Lex extends Frame implements ISourced {
     const end = this.isEnd(char)
     const terminal = Lex.isTerminal(char)
     const not_quote = !this.isQuote()
+    const not_space = char != ' '
 
-    if (end && terminal) { // ends token on a terminal
+    if (end && terminal && not_space) { // ends token on a terminal
       return this.finish(argument, true)
     }
     if (end) { // ends token, but not on a terminal
@@ -67,7 +68,7 @@ export class Lex extends Frame implements ISourced {
       return result
     }
 
-    if (terminal && not_quote) { // unquoted terminal implicitly ends token
+    if (terminal && not_quote && not_space) { // unquoted terminal implicitly ends token
       return this.finish(argument, true)
     }
 
@@ -123,7 +124,7 @@ export class Lex extends Frame implements ISourced {
     const output: Token = this.makeFrame()
     const out = this.get(Frame.kOUT)
     if (output.isSpace()) {
-      return out
+      return out // ignore [if not a Terminal]
     }
     const result = out.call(output)
     return result

src/execute/parse-pipe.ts

@@ -1,4 +1,4 @@
-import { Context, Frame, FrameArray, FrameExpr } from '../frames.js'
+import { Context, Frame, FrameArray, FrameBind, FrameExpr } from '../frames.js'
 import { IFinish, Terminal } from './terminals.js'
 
 export class ParsePipe extends FrameArray implements IFinish {
@@ -15,6 +15,7 @@ export class ParsePipe extends FrameArray implements IFinish {
   }
 
   public next (statement: boolean = false): Frame {
+    this.unbind()
     if (this.length() === 0) {
       return this
     }
@@ -28,6 +29,18 @@ export class ParsePipe extends FrameArray implements IFinish {
     return this
   }
 
+  public bind(_Factory: any = undefined): Frame {
+    return this.push(FrameBind)
+  }
+
+  public unbind(): boolean {
+    if (this.Factory === FrameBind) {
+      this.pop(FrameBind)
+      return true
+    }
+    return false
+  }
+
   public push (Factory: any): Frame {
     const child = new ParsePipe(this, Factory)
     return child
@@ -40,6 +53,7 @@ export class ParsePipe extends FrameArray implements IFinish {
   }
 
   public canPop (Factory: any): boolean {
+    this.unbind()
     const match = (this.Factory.name === Factory.name)
     if (!match) {
       console.error(`ParsePipe.canPop.failed: ${Factory.name} cannot pop ${this.Factory.name}`)

src/execute/terminals.ts

@@ -68,6 +68,7 @@ terminals[Frame.kEND] = Terminal.end()
 addTerminal('\n', 'end')
 addTerminal(',', 'next')
 addTerminal(';', 'semi-next')
+addTerminal(' ', 'bind')
 addGroup(FrameArray)
 addGroup(FrameGroup)
 addGroup(FrameLazy)

src/frames.ts

@@ -9,7 +9,7 @@ export { FrameBlob } from './frames/frame-blob.js'
 export { FrameBytes } from './frames/frame-bytes.js'
 export { FrameComment } from './frames/frame-comment.js'
 export { FrameDoc } from './frames/frame-doc.js'
-export { FrameExpr } from './frames/frame-expr.js'
+export { FrameBind, FrameExpr } from './frames/frame-expr.js'
 export { FrameGroup } from './frames/frame-group.js'
 export { FrameLazy } from './frames/frame-lazy.js'
 export { FrameList, IArrayConstructor } from './frames/frame-list.js'

src/frames/frame-expr.ts

@@ -34,3 +34,6 @@ export class FrameExpr extends FrameList {
     return [array.join(' ') + ',']
   }
 };
+
+export class FrameBind extends FrameExpr {
+}

test/execute/lex-pipe-spec.ts

@@ -5,14 +5,17 @@ import { Lex } from '../../src/execute/lex.js'
 import { LexBytes } from '../../src/execute/lex-bytes.js'
 import { LexPipe } from '../../src/execute/lex-pipe.js'
 import * as frame from '../../src/frames.js'
+import { ParsePipe } from '../../src/execute/parse-pipe.js'
 
 describe('LexPipe', () => {
   const success = new frame.FrameString('success!')
-  let out: frame.FrameArray
+  let final: frame.FrameArray
+  let out: ParsePipe
   let pipe: LexPipe
 
   beforeEach(() => {
-    out = new frame.FrameArray([])
+    final = new frame.FrameArray([])
+    out = new ParsePipe(final, frame.FrameArray)
     out.set(frame.Frame.kEND, success)
     pipe = new LexPipe(out)
   })
@@ -29,4 +32,22 @@ describe('LexPipe', () => {
     const result = pipe.finish(frame.Frame.nil)
     expect(result).to.equal(pipe)
   })
+
+  it('changes output on push', () => {
+    const out = pipe.get(frame.Frame.kOUT)
+    const result = pipe.perform({ push: frame.FrameExpr })
+    const out2 = pipe.get(frame.Frame.kOUT)
+    expect(out2).to.not.equal(out)
+    expect(result).to.equal(pipe)
+    expect(pipe.level).to.equal(1)
+  })
+
+  it.skip('changes output on bind', () => {
+    const out = pipe.get(frame.Frame.kOUT)
+    const result = pipe.perform({ bind: frame.FrameBind })
+    const out2 = pipe.get(frame.Frame.kOUT)
+    expect(out2).to.not.equal(out)
+    expect(result).to.equal(pipe)
+    expect(pipe.level).to.equal(1)
+  })
 })

test/execute/parse-spec.ts

@@ -75,7 +75,7 @@ describe('Parse', () => {
       expect(group.toString()).to.equal(`((${content}))`)
     })
 
-    it('joins Grouped strings', () => {
+    it('joins strings in Grouped', () => {
       pipe.call(token)
       pipe.call(token)
       pipe.call(frame.FrameSymbol.end())