Skip to content

Rename core.Pool to core.Arena #3300

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

Merged
jakebailey merged 3 commits into from
Apr 10, 2026
Merged

Rename core.Pool to core.Arena #3300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
697f032
Rename core.Pool to core.Arena
jakebailey Mar 29, 2026
d5c35e5
Update internal/core/arena.go
jakebailey Apr 3, 2026
9f031ee
Merge branch 'main' into jabaile/pool-rename-to-arena
jakebailey Apr 10, 2026
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
92 changes: 46 additions & 46 deletions _scripts/ast.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions _scripts/ast.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,9 @@
"$ref": "#/definitions/member"
}
},
"pool": {
"arena": {
"type": "boolean",
"description": "Whether this node uses an object pool for allocation."
"description": "Whether this node uses an object arena for allocation."
},
"handWrittenVisitor": {
"type": "boolean",
Expand Down
22 changes: 11 additions & 11 deletions _scripts/generate-go-ast.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,17 @@ class CodeWriter {
}

function generateNodeFactoryStruct(w: CodeWriter) {
const poolFields: { fieldName: string; typeName: string; }[] = [];
const arenaFields: { fieldName: string; typeName: string; }[] = [];
for (const node of api.nodes()) {
if (!node.pool) continue;
poolFields.push({
fieldName: `${api.uncapitalize(node.name)}Pool`,
if (!node.arena) continue;
arenaFields.push({
fieldName: `${api.uncapitalize(node.name)}Arena`,
typeName: node.name,
});
}
poolFields.push({ fieldName: "modifierListPool", typeName: "ModifierList" });
poolFields.push({ fieldName: "nodeListPool", typeName: "NodeList" });
poolFields.sort((a, b) => a.fieldName.localeCompare(b.fieldName));
arenaFields.push({ fieldName: "modifierListArena", typeName: "ModifierList" });
arenaFields.push({ fieldName: "nodeListArena", typeName: "NodeList" });
arenaFields.sort((a, b) => a.fieldName.localeCompare(b.fieldName));

w.write("// ──────────────────────────────────────────────────────────────────────");
w.write("// NodeFactory");
Expand All @@ -108,8 +108,8 @@ function generateNodeFactoryStruct(w: CodeWriter) {
w.write("type NodeFactory struct {");
w.push();
w.write("hooks NodeFactoryHooks");
for (const { fieldName, typeName } of poolFields) {
w.write(`${fieldName} core.Pool[${typeName}]`);
for (const { fieldName, typeName } of arenaFields) {
w.write(`${fieldName} core.Arena[${typeName}]`);
}
w.write("");
w.write("nodeCount int");
Expand Down Expand Up @@ -292,8 +292,8 @@ function emitNewFactory(
w.write(`func (f *NodeFactory) ${funcName}(${params}) *Node {`);
w.push();

if (node.pool) {
w.write(`data := f.${api.uncapitalize(structName)}Pool.New()`);
if (node.arena) {
w.write(`data := f.${api.uncapitalize(structName)}Arena.New()`);
}
else {
w.write(`data := &${structName}{}`);
Expand Down
6 changes: 3 additions & 3 deletions _scripts/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export interface NodeDef {
extends: string[];
members?: Member[];
generateSubtreeFacts?: boolean;
pool?: boolean;
arena?: boolean;
handWritten?: boolean;
handWrittenVisitor?: boolean;
typeParameters?: { name: string; constraint: string; default?: string; }[];
Expand Down Expand Up @@ -235,8 +235,8 @@ export class NodeType extends TypeBase {
return this.fieldsCache;
}

get pool(): boolean {
return this.def?.pool || false;
get arena(): boolean {
return this.def?.arena || false;
}

get handWritten(): boolean {
Expand Down
6 changes: 3 additions & 3 deletions internal/ast/ast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ type NodeList struct {
}

func (f *NodeFactory) NewNodeList(nodes []*Node) *NodeList {
list := f.nodeListPool.New()
list := f.nodeListArena.New()
list.Loc = core.UndefinedTextRange()
list.Nodes = nodes
return list
Expand Down Expand Up @@ -156,15 +156,15 @@ type ModifierList struct {
}

func (f *NodeFactory) NewModifierList(nodes []*Node) *ModifierList {
list := f.modifierListPool.New()
list := f.modifierListArena.New()
list.Loc = core.UndefinedTextRange()
list.Nodes = nodes
list.ModifierFlags = ModifiersToFlags(nodes)
return list
}

func (list *ModifierList) Clone(f *NodeFactory) *ModifierList {
res := f.modifierListPool.New()
res := f.modifierListArena.New()
res.Loc = list.Loc
res.Nodes = list.Nodes
res.ModifierFlags = list.ModifierFlags
Expand Down
Loading
Loading