Skip to content

[DNM] Switch to using a deque for DSLList storage #863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
natecook1000 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[DNM] Switch to using a deque for DSLList storage #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions Sources/_StringProcessing/ByteCodeGen+DSLList.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ fileprivate extension Compiler.ByteCodeGen {
/// In particular, non-required groups and option-setting groups are
/// inconclusive about where they can match.
private mutating func _canOnlyMatchAtStartImpl(
_ list: inout ArraySlice<DSLTree.Node>
_ list: inout Deque<DSLTree.Node>.SubSequence
) -> Bool? {
guard let node = list.popFirst() else { return false }
switch node {
Expand Down Expand Up @@ -164,10 +164,10 @@ fileprivate extension Compiler.ByteCodeGen {
}

mutating func emitAlternationGen<T>(
_ elements: inout ArraySlice<T>,
_ elements: inout Deque<T>.SubSequence,
alternationCount: Int,
withBacktracking: Bool,
_ body: (inout Compiler.ByteCodeGen, inout ArraySlice<T>) throws -> Void
_ body: (inout Compiler.ByteCodeGen, inout Deque<T>.SubSequence) throws -> Void
) rethrows {
// Alternation: p0 | p1 | ... | pn
// save next_p1
Expand Down Expand Up @@ -201,15 +201,15 @@ fileprivate extension Compiler.ByteCodeGen {
}

mutating func emitAlternation(
_ list: inout ArraySlice<DSLTree.Node>,
_ list: inout Deque<DSLTree.Node>.SubSequence,
alternationCount count: Int
) throws {
try emitAlternationGen(&list, alternationCount: count, withBacktracking: true) {
try $0.emitNode(&$1)
}
}

mutating func emitPositiveLookahead(_ list: inout ArraySlice<DSLTree.Node>) throws {
mutating func emitPositiveLookahead(_ list: inout Deque<DSLTree.Node>.SubSequence) throws {
/*
save(restoringAt: success)
save(restoringAt: intercept)
Expand Down Expand Up @@ -238,7 +238,7 @@ fileprivate extension Compiler.ByteCodeGen {
builder.label(success)
}

mutating func emitNegativeLookahead(_ list: inout ArraySlice<DSLTree.Node>) throws {
mutating func emitNegativeLookahead(_ list: inout Deque<DSLTree.Node>.SubSequence) throws {
/*
save(restoringAt: success)
save(restoringAt: intercept)
Expand Down Expand Up @@ -269,7 +269,7 @@ fileprivate extension Compiler.ByteCodeGen {

mutating func emitLookaround(
_ kind: (forwards: Bool, positive: Bool),
_ list: inout ArraySlice<DSLTree.Node>
_ list: inout Deque<DSLTree.Node>.SubSequence
) throws {
guard kind.forwards else {
throw Unsupported("backwards assertions")
Expand All @@ -282,7 +282,7 @@ fileprivate extension Compiler.ByteCodeGen {
}

mutating func emitAtomicNoncapturingGroup(
_ list: inout ArraySlice<DSLTree.Node>
_ list: inout Deque<DSLTree.Node>.SubSequence
) throws {
/*
save(continuingAt: success)
Expand Down Expand Up @@ -315,7 +315,7 @@ fileprivate extension Compiler.ByteCodeGen {

mutating func emitNoncapturingGroup(
_ kind: AST.Group.Kind,
_ list: inout ArraySlice<DSLTree.Node>
_ list: inout Deque<DSLTree.Node>.SubSequence
) throws {
assert(!kind.isCapturing)

Expand Down Expand Up @@ -351,7 +351,7 @@ fileprivate extension Compiler.ByteCodeGen {
}
}

func _guaranteesForwardProgressImpl(_ list: ArraySlice<DSLTree.Node>, position: inout Int) -> Bool {
func _guaranteesForwardProgressImpl(_ list: Deque<DSLTree.Node>.SubSequence, position: inout Int) -> Bool {
guard position < list.endIndex else { return false }
let node = list[position]
position += 1
Expand Down Expand Up @@ -404,15 +404,15 @@ fileprivate extension Compiler.ByteCodeGen {
}
}

func guaranteesForwardProgress(_ list: ArraySlice<DSLTree.Node>) -> Bool {
func guaranteesForwardProgress(_ list: Deque<DSLTree.Node>.SubSequence) -> Bool {
var pos = list.startIndex
return _guaranteesForwardProgressImpl(list, position: &pos)
}

mutating func emitQuantification(
_ amount: AST.Quantification.Amount,
_ kind: DSLTree.QuantificationKind,
_ list: inout ArraySlice<DSLTree.Node>
_ list: inout Deque<DSLTree.Node>.SubSequence
) throws {
let updatedKind = kind.applying(options: options)

Expand Down Expand Up @@ -652,7 +652,7 @@ fileprivate extension Compiler.ByteCodeGen {
/// - single grapheme consumgin built in character classes
/// - .any, .anyNonNewline, .dot
mutating func tryEmitFastQuant(
_ list: inout ArraySlice<DSLTree.Node>,
_ list: inout Deque<DSLTree.Node>.SubSequence,
_ kind: AST.Quantification.Kind,
_ minTrips: Int,
_ maxExtraTrips: Int?
Expand Down Expand Up @@ -736,7 +736,7 @@ fileprivate extension Compiler.ByteCodeGen {
}

mutating func emitConcatenation(
_ list: inout ArraySlice<DSLTree.Node>,
_ list: inout Deque<DSLTree.Node>.SubSequence,
componentCount: Int
) throws {
// Unlike the tree-based bytecode generator, in a DSLList concatenations
Expand All @@ -747,7 +747,7 @@ fileprivate extension Compiler.ByteCodeGen {
}

@discardableResult
mutating func emitNode(_ list: inout ArraySlice<DSLTree.Node>) throws -> ValueRegister? {
mutating func emitNode(_ list: inout Deque<DSLTree.Node>.SubSequence) throws -> ValueRegister? {
guard let node = list.popFirst() else { return nil }
switch node {

Expand Down Expand Up @@ -845,7 +845,7 @@ fileprivate extension Compiler.ByteCodeGen {

extension Compiler.ByteCodeGen {
mutating func skipNode(
_ list: inout ArraySlice<DSLTree.Node>,
_ list: inout Deque<DSLTree.Node>.SubSequence,
preservingCaptures: Bool = true
) throws {
guard let node = list.popFirst() else { return }
Expand Down
Loading
Loading