Merge e268643 into 8c2849d

benchmarks/src/json/index.ts

@@ -4,12 +4,14 @@ import { handlers } from '../@helpers'
 
 import { SAMPLE } from './@sample'
 import { parse as parseParjs } from './parjs'
-import { parse as parseSigma } from './sigma'
+import { parse as parseSigmaDefer } from './sigma'
+import { parse as parseSigmaGrammar } from './sigma-grammar'
 
 suite(
   'JSON :: sigma vs parjs',
 
-  add('sigma', () => parseSigma(SAMPLE)),
+  add('sigma:defer', () => parseSigmaDefer(SAMPLE)),
+  add('sigma:grammar', () => parseSigmaGrammar(SAMPLE)),
   add('parjs', () => parseParjs(SAMPLE)),
 
   ...handlers

benchmarks/src/json/sigma-grammar.ts

@@ -0,0 +1,169 @@
+import { choice, sepBy, optional, map, takeMid, sequence } from '@combinators'
+import { Parser } from '@lib'
+import { float, grammar, integer, regexp, run, string, whitespace } from '@parsers'
+
+import * as Ast from './ast'
+
+/* Tokens. */
+
+const Keywords = {
+  True: 'true',
+  False: 'false',
+  Null: 'null'
+} as const
+
+const Terminals = {
+  OpenBrace: '{',
+  CloseBrace: '}',
+  OpenSquare: '[',
+  CloseSquare: ']',
+  Colon: ':',
+  Comma: ','
+} as const
+
+/* Mapping functions to turn parsed string values into AST nodes. */
+
+function toObject(values: Array<Ast.JsonObjectProp>): Ast.JsonObject {
+  return {
+    type: 'object',
+    values
+  }
+}
+
+function toObjectProp(tuple: [Ast.JsonString, string, Ast.JsonValue]): Ast.JsonObjectProp {
+  const [{ value: name }, _, value] = tuple
+
+  return {
+    type: 'property',
+    name,
+    value
+  }
+}
+
+function toArray(values: Array<Ast.JsonValue>): Ast.JsonArray {
+  return {
+    type: 'array',
+    values
+  }
+}
+
+function toString(text: string): Ast.JsonString {
+  return {
+    type: 'string',
+    value: text.slice(1, -1)
+  }
+}
+
+function toNumber(value: number): Ast.JsonNumber {
+  return {
+    type: 'number',
+    value: value
+  }
+}
+
+function toBoolean(kind: string): Ast.JsonBoolean {
+  switch (kind) {
+    case Keywords.True: {
+      return {
+        type: 'boolean',
+        value: true
+      }
+    }
+
+    case Keywords.False: {
+      return {
+        type: 'boolean',
+        value: false
+      }
+    }
+
+    default: {
+      return {
+        type: 'boolean',
+        value: false
+      }
+    }
+  }
+}
+
+function toNull(): Ast.JsonNull {
+  return {
+    type: 'null',
+    value: null
+  }
+}
+
+/* Parsers. */
+
+// Non-Terminals.
+const NumberLiteral = choice(float(), integer())
+
+const Space = optional(whitespace())
+const StringLiteral = regexp(/"([^"]|\\.)*"/g, 'string')
+
+// Utility.
+const match = (s: string) => takeMid(Space, string(s), Space)
+
+// Grammar.
+const Json = grammar({
+  Root(): Parser<Ast.JsonRoot> {
+    return choice(this.Object, this.Array)
+  },
+  Object(): Parser<Ast.JsonObject> {
+    return map(
+      takeMid(
+        match(Terminals.OpenBrace),
+        sepBy(this.ObjectProp, match(Terminals.Comma)),
+        match(Terminals.CloseBrace)
+      ),
+      toObject
+    )
+  },
+  ObjectProp(): Parser<Ast.JsonObjectProp> {
+    return map(sequence(this.String, match(Terminals.Colon), this.Value), toObjectProp)
+  },
+  Array(): Parser<Ast.JsonArray> {
+    return map(
+      takeMid(
+        match(Terminals.OpenSquare),
+        sepBy(this.Value, match(Terminals.Comma)),
+        match(Terminals.CloseSquare)
+      ),
+      toArray
+    )
+  },
+  String(): Parser<Ast.JsonString> {
+    return map(StringLiteral, toString)
+  },
+  Number(): Parser<Ast.JsonNumber> {
+    return map(NumberLiteral, toNumber)
+  },
+  Boolean(): Parser<Ast.JsonBoolean> {
+    return map(choice(match(Keywords.True), match(Keywords.False)), toBoolean)
+  },
+  Null(): Parser<Ast.JsonNull> {
+    return map(match(Keywords.Null), toNull)
+  },
+  Value(): Parser<Ast.JsonValue> {
+    return choice(this.Object, this.Array, this.String, this.Number, this.Boolean, this.Null)
+  }
+})
+
+/* Wrapper for bench runner. */
+
+export function parse(text: string): Ast.JsonRoot {
+  const result = run(Json.Root).with(text)
+
+  switch (result.isOk) {
+    case true: {
+      return result.value
+    }
+
+    case false: {
+      return {
+        type: 'object',
+        values: []
+      }
+    }
+  }
+}

docs/docs/content/core/grammar.md

@@ -0,0 +1,58 @@
+---
+title: 'grammar'
+kind: 'core'
+description: 'This simplifies the creation of a self-contained grammar.'
+---
+
+# grammar
+
+## Description
+
+`grammar` is used to create a self-contained grammar.
+
+Similarly to [defer], this allows for the creation of mutually recursive parsers,
+but lets you define all of the component parsers within a single call.
+
+The function takes an object with parser initializers, and returns an object with
+all of those parsers initialized. Within the parser initializers, use `this` to
+reference other initialized parsers, as in the example below.
+
+The properties of the resulting object are just regular parsers - you can freely
+destructure these, pass them around individually, or compose them with other
+grammars, parsers or combinators as needed.
+
+## Usage
+
+Here is an example of a simple grammar that recursively matches `ab` sequences:
+
+```ts
+const ab = grammar({
+  a(): Parser<string> {
+    return map(sequence(string('a'), optional(this.b)), ([a, b]) => a + (b || ''))
+  },
+  b(): Parser<string> {
+    return map(sequence(string('b'), choice(this.a, this.b)), ([b, a]) => b + a)
+  }
+})
+```
+
+The individual properties are just regular parsers:
+
+```ts
+const { a } = ab
+
+console.log(run(a).with('abba'))
+```
+
+::: tip Success
+```ts
+{
+  isOk: true,
+  span: [0, 4],
+  pos: 4,
+  value: 'abba'
+}
+```
+:::
+
+[defer]: ../parsers/defer

src/__tests__/core/grammar.spec.ts

@@ -0,0 +1,24 @@
+import { grammar, run } from '@core'
+import { Parser, Success, choice, map, optional, sequence, string } from '@lib'
+import { describe, should, it } from '@testing'
+
+describe(`grammar`, () => {
+  it('should create self-contained grammar', () => {
+    const ab = grammar({
+      a(): Parser<string> {
+        return map(sequence(string('a'), optional(this.b)), ([a, b]) => a + (b || ''))
+      },
+      b(): Parser<string> {
+        return map(sequence(string('b'), choice(this.a, this.b)), ([b, a]) => b + a)
+      }
+    })
+
+    const value = 'abba'
+
+    const actual = run(ab.a).with(value)
+
+    const expected: Success<string> = { isOk: true, value, span: [0, 4], pos: 4 }
+
+    should.beStrictEqual(actual, expected)
+  })
+})

src/core.ts

@@ -1,2 +1,3 @@
 export * from '@core/run'
 export * from '@core/tryRun'
+export * from '@core/grammar'

src/core/grammar.ts

@@ -0,0 +1,78 @@
+import { Parser } from '@lib/types'
+
+/**
+ * This type extracts the return-types from the parser initializers.
+ */
+export type Grammar<T> = {
+  [P in keyof T]: T[P] extends () => unknown ? ReturnType<T[P]> : never
+}
+
+/**
+ * This type injects the initialized parser types into `this`, allowing for
+ * type-safe self-contained and mutually recursive grammars.
+ */
+export type GrammarInit<T> = T & ThisType<Grammar<T>>
+
+/**
+ * This defines the input to the `grammar` function - the parser initializers.
+ */
+export type GrammarType = {
+  [name: string]: () => Parser<unknown>
+}
+
+/**
+ * This is a utility function to simplify the creation of a self-contained grammar.
+ *
+ * Similarly to `defer`, this allows for the creation of mutually recursive parsers,
+ * but lets you define all of the component parsers within a single call.
+ *
+ * The function takes an object with parser initializers, and returns an object with
+ * all of those parsers initialized. Within the parser initializers, use `this` to
+ * reference other initialized parsers, as in the example below.
+ *
+ * The properties of the resulting object are just regular parsers - you can freely
+ * destructure these, pass them around individually, or compose them with other
+ * grammars, parsers or combinators as needed.
+ *
+ * @example
+ *
+ * ```typescript
+ * const tupleGrammar = grammar({
+ *   tupleNumber(): Parser<NumberNode> {
+ *     return map(integer(), (value, span) => ({ type: 'number', span, value }))
+ *   },
+ *   tupleList(): Parser<ListNode> {
+ *     return map(
+ *       takeMid(
+ *         string('('),
+ *         sepBy(choice(this.tupleList, this.tupleNumber), string(',')),
+ *         string(')')
+ *       ),
+ *       (value, span) => ({ type: 'list', span, value })
+ *     )
+ *   }
+ * })
+ *
+ * const result = run(tupleGrammar.tupleList).with('(1,2,(3,4))')
+ * ```
+ *
+ * @param init
+ * @returns
+ */
+export function grammar<T extends GrammarType>(init: GrammarInit<T>): Grammar<T> {
+  const grammar = {} as { [key: string]: Parser<unknown> }
+
+  for (const key in init) {
+    grammar[key] = {
+      parse() {
+        throw new Error()
+      }
+    }
+  }
+
+  for (const key in init) {
+    grammar[key].parse = init[key].apply(grammar).parse
+  }
+
+  return grammar as Grammar<T>
+}