From 0ab1c830e324d4656944f86453c4a12591a07562 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 19 Jul 2023 22:38:07 +0100 Subject: Rename generateName to allocateName --- .../org/shedlang/compiler/backends/llvm/LlvmCodeGenContext.java | 4 ++-- .../java/org/shedlang/compiler/backends/llvm/NameAllocator.java | 6 +++--- .../org/shedlang/compiler/backends/wasm/WasmCodeGenContext.java | 4 ++-- src/main/java/org/shedlang/compiler/patio/PatioCodeGenContext.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenContext.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenContext.java index b73d7138..d0fea22f 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenContext.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenContext.java @@ -42,7 +42,7 @@ public record LlvmCodeGenContext( LlvmCodeGenTopLevelEntitySpace space, Optional name ) { - return NameAllocator.generateName( + return NameAllocator.allocateName( topLevelEntitiesByName::containsKey, "shed__" + space, name @@ -201,7 +201,7 @@ public record LlvmCodeGenContext( LlvmCodeGenLocalVariableSpace space, Optional name ) { - var result = localVariableNames.generateName(space, name); + var result = localVariableNames.allocateName(space, name); return new FunctionContext( stack, shedLocalNameToOperand, diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/NameAllocator.java b/src/main/java/org/shedlang/compiler/backends/llvm/NameAllocator.java index 845397a9..90228a02 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/NameAllocator.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/NameAllocator.java @@ -11,16 +11,16 @@ public record NameAllocator(PSet existingNames) { return new NameAllocator<>(Empty.set()); } - public Result generateName( + public Result allocateName( TPrefix prefix, Optional name ) { - var fullName = generateName(existingNames::contains, prefix, name); + var fullName = allocateName(existingNames::contains, prefix, name); var newAllocator = new NameAllocator(existingNames.plus(fullName)); return new Result<>(fullName, newAllocator); } - public static String generateName( + public static String allocateName( Predicate isUsed, TPrefix prefix, Optional name diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/WasmCodeGenContext.java b/src/main/java/org/shedlang/compiler/backends/wasm/WasmCodeGenContext.java index afce597f..02761563 100644 --- a/src/main/java/org/shedlang/compiler/backends/wasm/WasmCodeGenContext.java +++ b/src/main/java/org/shedlang/compiler/backends/wasm/WasmCodeGenContext.java @@ -102,7 +102,7 @@ public record WasmCodeGenContext( } public String generateSymbolName(WasmCodeGenGlobalSpace space, Optional name) { - return NameAllocator.generateName( + return NameAllocator.allocateName( symbolNames::contains, "shed__" + space, name @@ -225,7 +225,7 @@ public record WasmCodeGenContext( public Result generateLocal(WasmCodeGenLocalSpace space, Optional name) { var localIndex = new WasmLocalIndex(locals.size()); - var localName = NameAllocator.generateName( + var localName = NameAllocator.allocateName( x -> locals.containsKey(x), space, name diff --git a/src/main/java/org/shedlang/compiler/patio/PatioCodeGenContext.java b/src/main/java/org/shedlang/compiler/patio/PatioCodeGenContext.java index 471ca600..dbb1b686 100644 --- a/src/main/java/org/shedlang/compiler/patio/PatioCodeGenContext.java +++ b/src/main/java/org/shedlang/compiler/patio/PatioCodeGenContext.java @@ -28,7 +28,7 @@ public record PatioCodeGenContext( } public Result allocateLocal(PatioCodeGenLocalSpace space, Optional name) { - var result = this.localNames.generateName(space, name); + var result = this.localNames.allocateName(space, name); return new FunctionContext( this.instructions, -- cgit v1.2.3