parseman 0.47.0 → 0.48.0

package/src/compiler/token-capability.ts

@@ -0,0 +1,6 @@
+/** Private phase-A capability/normalizer leaf used only by grammar compilers. */
+export {
+  assertLexicalCapabilityClosure,
+  collectLexicalCapabilities,
+  winnerWrapsReference,
+} from './token-alphabet.ts'

package/src/cst/trivia-charscan.ts

@@ -26,6 +26,7 @@
  */
 import type { Combinator } from '../types.ts'
 import { parseClassRanges } from '../regex/classes.ts'
+import { commonCssTriviaVisitor, type CssTriviaVisitor } from './trivia-css-scanner.ts'
 import type { LabeledTriviaSpec } from './trivia-kinds.ts'
 
 export type TriviaArmMatcher = (input: string, pos: number) => number
@@ -220,6 +221,39 @@ function classifyParser(p: Combinator<unknown>): TriviaArmMatcher | null {
   return classifyArm(d.source)
 }
 
+function plainRegexSource(p: Combinator<unknown>): string | null {
+  const d = p._def
+  return d.tag === 'regex' && d.flags === '' ? d.source : null
+}
+
+let visitSpec0: LabeledTriviaSpec | undefined
+let visitSpec1: LabeledTriviaSpec | undefined
+let visitSpec2: LabeledTriviaSpec | undefined
+let visitSpec3: LabeledTriviaSpec | undefined
+let visitValue0: CssTriviaVisitor | null | undefined
+let visitValue1: CssTriviaVisitor | null | undefined
+let visitValue2: CssTriviaVisitor | null | undefined
+let visitValue3: CssTriviaVisitor | null | undefined
+
+/** A direct classified scanner for the four canonical CSS/Less trivia tuples. */
+export function commonLabeledTriviaVisitor(spec: LabeledTriviaSpec): CssTriviaVisitor | null {
+  if (spec === visitSpec0) return visitValue0!
+  if (spec === visitSpec1) return visitValue1!
+  if (spec === visitSpec2) return visitValue2!
+  if (spec === visitSpec3) return visitValue3!
+  const sources = spec.minRepeats <= 1 ? spec.arms.map(arm => plainRegexSource(arm.parser)) : []
+  const visitor = commonCssTriviaVisitor(sources)
+  visitSpec3 = visitSpec2
+  visitValue3 = visitValue2
+  visitSpec2 = visitSpec1
+  visitValue2 = visitValue1
+  visitSpec1 = visitSpec0
+  visitValue1 = visitValue0
+  visitSpec0 = spec
+  visitValue0 = visitor
+  return visitor
+}
+
 let armSpec0: LabeledTriviaSpec | undefined
 let armSpec1: LabeledTriviaSpec | undefined
 let armSpec2: LabeledTriviaSpec | undefined

package/src/cst/trivia-css-scanner.ts

@@ -0,0 +1,142 @@
+export type CssTriviaScanner = (input: string, cur: number) => number
+export type CssTriviaVisitor = (
+  input: string,
+  cur: number,
+  visit: (start: number, end: number, kindIndex: number) => void,
+) => number
+
+const CSS_WS_SOURCE = '[ \\t\\n\\r\\f]+'
+const CSS_LINE_COMMENT_SOURCE = '\\/\\/[^\\n\\r]*'
+const CSS_BLOCK_COMMENT_SOURCE = '\\/\\*(?:[^*]|\\*(?!\\/))*\\*\\/'
+
+function scanWhitespace(input: string, cur: number): number {
+  let pos = cur
+  while (pos < input.length) {
+    const c = input.charCodeAt(pos)
+    if (c !== 32 && c !== 9 && c !== 10 && c !== 13 && c !== 12) break
+    pos++
+  }
+  return pos
+}
+
+function scanLineComment(input: string, cur: number): number {
+  if (input.charCodeAt(cur) !== 47 || input.charCodeAt(cur + 1) !== 47) return cur
+  let pos = cur + 2
+  while (pos < input.length) {
+    const c = input.charCodeAt(pos)
+    if (c === 10 || c === 13) break
+    pos++
+  }
+  return pos
+}
+
+function scanBlockComment(input: string, cur: number): number {
+  if (input.charCodeAt(cur) !== 47 || input.charCodeAt(cur + 1) !== 42) return cur
+  const close = input.indexOf('*/', cur + 2)
+  return close < 0 ? cur : close + 2
+}
+
+function scanWsLineBlockTrivia(input: string, cur: number): number {
+  let pos = cur
+  for (;;) {
+    const ws = scanWhitespace(input, pos)
+    if (ws !== pos) { pos = ws; continue }
+    const line = scanLineComment(input, pos)
+    if (line !== pos) { pos = line; continue }
+    const block = scanBlockComment(input, pos)
+    if (block !== pos) { pos = block; continue }
+    return pos
+  }
+}
+
+function scanWsBlockTrivia(input: string, cur: number): number {
+  let pos = cur
+  for (;;) {
+    const ws = scanWhitespace(input, pos)
+    if (ws !== pos) { pos = ws; continue }
+    const block = scanBlockComment(input, pos)
+    if (block !== pos) { pos = block; continue }
+    return pos
+  }
+}
+
+function scanLineBlockTrivia(input: string, cur: number): number {
+  let pos = cur
+  for (;;) {
+    const line = scanLineComment(input, pos)
+    if (line !== pos) { pos = line; continue }
+    const block = scanBlockComment(input, pos)
+    if (block !== pos) { pos = block; continue }
+    return pos
+  }
+}
+
+function scanBlockTrivia(input: string, cur: number): number {
+  let pos = cur
+  for (;;) {
+    const block = scanBlockComment(input, pos)
+    if (block === pos) return pos
+    pos = block
+  }
+}
+
+function visitWsLineBlock(input: string, cur: number, visit: (start: number, end: number, kindIndex: number) => void): number {
+  let pos = cur
+  for (;;) {
+    let end = scanWhitespace(input, pos)
+    if (end !== pos) { visit(pos, end, 0); pos = end; continue }
+    end = scanLineComment(input, pos)
+    if (end !== pos) { visit(pos, end, 1); pos = end; continue }
+    end = scanBlockComment(input, pos)
+    if (end !== pos) { visit(pos, end, 2); pos = end; continue }
+    return pos
+  }
+}
+
+function visitWsBlock(input: string, cur: number, visit: (start: number, end: number, kindIndex: number) => void): number {
+  let pos = cur
+  for (;;) {
+    let end = scanWhitespace(input, pos)
+    if (end !== pos) { visit(pos, end, 0); pos = end; continue }
+    end = scanBlockComment(input, pos)
+    if (end !== pos) { visit(pos, end, 1); pos = end; continue }
+    return pos
+  }
+}
+
+function visitLineBlock(input: string, cur: number, visit: (start: number, end: number, kindIndex: number) => void): number {
+  let pos = cur
+  for (;;) {
+    let end = scanLineComment(input, pos)
+    if (end !== pos) { visit(pos, end, 0); pos = end; continue }
+    end = scanBlockComment(input, pos)
+    if (end !== pos) { visit(pos, end, 1); pos = end; continue }
+    return pos
+  }
+}
+
+function visitBlock(input: string, cur: number, visit: (start: number, end: number, kindIndex: number) => void): number {
+  let pos = cur
+  for (;;) {
+    const end = scanBlockComment(input, pos)
+    if (end === pos) return pos
+    visit(pos, end, 0)
+    pos = end
+  }
+}
+
+export function commonCssTriviaScanner(sources: readonly (string | null)[]): CssTriviaScanner | null {
+  if (sources.length === 3 && sources[0] === CSS_WS_SOURCE && sources[1] === CSS_LINE_COMMENT_SOURCE && sources[2] === CSS_BLOCK_COMMENT_SOURCE) return scanWsLineBlockTrivia
+  if (sources.length === 2 && sources[0] === CSS_WS_SOURCE && sources[1] === CSS_BLOCK_COMMENT_SOURCE) return scanWsBlockTrivia
+  if (sources.length === 2 && sources[0] === CSS_LINE_COMMENT_SOURCE && sources[1] === CSS_BLOCK_COMMENT_SOURCE) return scanLineBlockTrivia
+  if (sources.length === 1 && sources[0] === CSS_BLOCK_COMMENT_SOURCE) return scanBlockTrivia
+  return null
+}
+
+export function commonCssTriviaVisitor(sources: readonly (string | null)[]): CssTriviaVisitor | null {
+  if (sources.length === 3 && sources[0] === CSS_WS_SOURCE && sources[1] === CSS_LINE_COMMENT_SOURCE && sources[2] === CSS_BLOCK_COMMENT_SOURCE) return visitWsLineBlock
+  if (sources.length === 2 && sources[0] === CSS_WS_SOURCE && sources[1] === CSS_BLOCK_COMMENT_SOURCE) return visitWsBlock
+  if (sources.length === 2 && sources[0] === CSS_LINE_COMMENT_SOURCE && sources[1] === CSS_BLOCK_COMMENT_SOURCE) return visitLineBlock
+  if (sources.length === 1 && sources[0] === CSS_BLOCK_COMMENT_SOURCE) return visitBlock
+  return null
+}

package/src/cst/trivia-kinds.ts

@@ -2,7 +2,7 @@ import type { Combinator, ParseContext } from '../types.ts'
 import { pushCstTriviaEntry, pushTriviaLogEntry } from './capture-buffer.ts'
 import { startsFirstSet } from '../combinators/first-set.ts'
 import { createDetachedParseContext } from '../parse-context.ts'
-import { charArmsFor, charTriviaEnd, charTriviaKindMask, charTriviaVisit } from './trivia-charscan.ts'
+import { charArmsFor, charTriviaEnd, charTriviaKindMask, charTriviaVisit, commonLabeledTriviaVisitor } from './trivia-charscan.ts'
 
 export type TriviaChunk = { start: number; end: number; kindIndex: number }
 
@@ -199,6 +199,8 @@ export function visitLabeledTrivia(
   visit: (start: number, end: number, kindIndex: number) => void,
 ): number | undefined {
   if (spec.minRepeats > 1) return undefined
+  const common = commonLabeledTriviaVisitor(spec)
+  if (common !== null) return common(input, cur, visit)
   const chars = charArmsFor(spec)
   if (chars !== null) return charTriviaVisit(input, cur, chars, visit)
 

package/src/plugin/index.ts

@@ -1625,10 +1625,10 @@ function transformMacroImpl(
         if (compiled !== null) {
           usedTableRuntime = true
           return {
-            replacement: compiled.replacementWithMetadata(staticTableMetadataSource({
-              reflection: compiled.reflection,
-              leaf: true,
-            })),
+            replacement: compiled.replacementWithMetadata(
+              staticTableMetadataSource({ reflection: compiled.reflection, leaf: true }),
+              { precompileDefault: true },
+            ),
             ...(importedFactories.length ? { importedFactories } : {}),
           }
         }