1. processLookahead/BacktrackPosition created separate entry objects for each glyph at each position (O(N^M) with N glyphs, M positions). Now all glyphs at a position share one entry object. 2. cloneEntry, cloneTree, flattenEntry, and mergeTreeEntry could infinitely recurse or duplicate work on shared/cyclic references. Added visited/merged tracking maps to cache results. Note that parsing CommitMono locks up the renderer for some time still so there is still a performance issue here, this fixes the OOM though. This was mostly defensive generated code since the codebase is unfamiliar to me. Fixes #5570
41 lines
1.1 KiB
TypeScript
41 lines
1.1 KiB
TypeScript
import { ILookupTree, IFlattenedLookupTree, ILookupTreeEntry, IFlattenedLookupTreeEntry } from './types';
|
|
|
|
export default function flatten(tree: ILookupTree, visited: Map<ILookupTreeEntry, IFlattenedLookupTreeEntry> = new Map()): IFlattenedLookupTree {
|
|
const result: IFlattenedLookupTree = {};
|
|
for (const [glyphId, entry] of Object.entries(tree.individual)) {
|
|
result[glyphId] = flattenEntry(entry, visited);
|
|
}
|
|
|
|
for (const { range, entry } of tree.range) {
|
|
const flattened = flattenEntry(entry, visited);
|
|
for (let glyphId = range[0]; glyphId < range[1]; glyphId++) {
|
|
result[glyphId] = flattened;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
function flattenEntry(entry: ILookupTreeEntry, visited: Map<ILookupTreeEntry, IFlattenedLookupTreeEntry>): IFlattenedLookupTreeEntry {
|
|
if (visited.has(entry)) {
|
|
return visited.get(entry)!;
|
|
}
|
|
|
|
const result: IFlattenedLookupTreeEntry = {};
|
|
visited.set(entry, result);
|
|
|
|
if (entry.forward) {
|
|
result.forward = flatten(entry.forward, visited);
|
|
}
|
|
|
|
if (entry.reverse) {
|
|
result.reverse = flatten(entry.reverse, visited);
|
|
}
|
|
|
|
if (entry.lookup) {
|
|
result.lookup = entry.lookup;
|
|
}
|
|
|
|
return result;
|
|
}
|