Skip to content

Commit 66d3dff

Browse files
committed
Rename ArchInfo to Architecture
1 parent 8a20bb0 commit 66d3dff

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

gen/argument_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func TestUndefinedRegisterArgument(t *testing.T) {
1414
node := parse.RegisterNode{UnmanagedSourceView: src.Unmanaged()}
1515

1616
ctx := gen.GenerationContext[Instruction]{
17-
ArchInfo: gen.ArchInfo{PointerSize: 8},
17+
Architecture: gen.ArchitectureInfo{PointerSize: 8},
1818
SourceContext: src.Ctx(),
1919
Types: &TypeMap{},
2020
Registers: &RegisterMap{},

gen/generator.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"alon.kr/x/usm/core"
77
)
88

9-
type ArchInfo struct {
9+
type ArchitectureInfo struct {
1010
PointerSize core.UsmUint // The size of a pointer in bytes.
1111
}
1212

@@ -16,9 +16,8 @@ type ArchInfo struct {
1616
// with information as the code generation process continues, while iterating
1717
// over the AST nodes.
1818
type GenerationContext[InstT BaseInstruction] struct {
19-
ArchInfo
2019
core.SourceContext
21-
20+
Architecture ArchitectureInfo
2221
Instructions InstructionManager[InstT]
2322
Types TypeManager
2423
Registers RegisterManager

gen/instruction_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func TestInstructionCreateTarget(t *testing.T) {
8989
}
9090

9191
ctx := &gen.GenerationContext[Instruction]{
92-
ArchInfo: gen.ArchInfo{PointerSize: 8},
92+
Architecture: gen.ArchitectureInfo{PointerSize: 8},
9393
SourceContext: src.Ctx(),
9494
Types: &types,
9595
Registers: &registers,

gen/target_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestTargetRegisterAlreadyDefined(t *testing.T) {
2929
}
3030

3131
ctx := gen.GenerationContext[Instruction]{
32-
ArchInfo: gen.ArchInfo{PointerSize: 8},
32+
Architecture: gen.ArchitectureInfo{PointerSize: 8},
3333
SourceContext: src.Ctx(),
3434
Types: &types,
3535
Registers: &registers,

gen/types_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func TestPointerTypeDeclaration(t *testing.T) {
7373

7474
genCtx := gen.GenerationContext[gen.BaseInstruction]{
7575
SourceContext: view.Ctx(),
76-
ArchInfo: gen.ArchInfo{PointerSize: 1337},
76+
Architecture: gen.ArchitectureInfo{PointerSize: 1337},
7777
Types: &typeManager,
7878
}
7979

0 commit comments

Comments
 (0)