Fixed preprocessor tests

This commit is contained in:
Mattias Hansson 2025-11-01 19:54:01 +01:00
parent 8c0056365e
commit f529835ba8

View file

@ -14,7 +14,7 @@ func TestPreProcess_BasicDefine(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -42,7 +42,7 @@ func TestPreProcess_DefineExpansion(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -71,7 +71,7 @@ func TestPreProcess_IncludeGuard(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("main.c65", reader) lines, _, err := PreProcess("main.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -100,7 +100,7 @@ func TestPreProcess_ASMBlock(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -146,7 +146,7 @@ func TestPreProcess_ScriptBlock(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -190,7 +190,7 @@ func TestPreProcess_CommentStripping(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -229,7 +229,7 @@ func TestPreProcess_CommentInASMBlock(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -257,7 +257,7 @@ func TestPreProcess_CommentInScriptBlock(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -283,7 +283,7 @@ func TestPreProcess_RawTextPreservation(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -334,7 +334,7 @@ func TestPreProcess_MismatchedBlockTerminators(t *testing.T) {
"test.c65": tt.lines, "test.c65": tt.lines,
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -371,7 +371,7 @@ func TestPreProcess_NestedConditionals(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -403,7 +403,7 @@ func TestPreProcess_ConditionalBlocking(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -433,7 +433,7 @@ func TestPreProcess_NestedIncludes(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("a.c65", reader) lines, _, err := PreProcess("a.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -461,7 +461,7 @@ func TestPreProcess_Filename(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("main.c65", reader) lines, _, err := PreProcess("main.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -484,7 +484,7 @@ func TestPreProcess_LineNumbers(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -507,7 +507,7 @@ func TestPreProcess_Undef(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -529,7 +529,7 @@ func TestPreProcess_PragmaWithDefines(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -544,7 +544,7 @@ func TestPreProcess_EmptyFile(t *testing.T) {
"test.c65": {}, "test.c65": {},
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -561,7 +561,7 @@ func TestPreProcess_MissingInclude(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
_, err := PreProcess("test.c65", reader) _, _, err := PreProcess("test.c65", reader)
if err == nil { if err == nil {
t.Error("expected error for missing include") t.Error("expected error for missing include")
} }
@ -576,7 +576,7 @@ func TestPreProcess_HaltDirective(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
_, err := PreProcess("test.c65", reader) _, _, err := PreProcess("test.c65", reader)
if err == nil { if err == nil {
t.Error("expected HaltError") t.Error("expected HaltError")
} }
@ -596,7 +596,7 @@ func TestPreProcess_ConditionalHalt(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -627,7 +627,7 @@ func TestPreProcess_ComplexIncludeGuard(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("main.c65", reader) lines, _, err := PreProcess("main.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -656,7 +656,7 @@ func TestPreProcess_UnbalancedConditionals(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
_, err := PreProcess("test.c65", reader) _, _, err := PreProcess("test.c65", reader)
if err == nil { if err == nil {
t.Error("expected error for unbalanced conditionals") t.Error("expected error for unbalanced conditionals")
} }
@ -680,7 +680,7 @@ func TestPreProcess_FilenameAndLineNumberTracking(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("main.c65", reader) lines, _, err := PreProcess("main.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -730,7 +730,7 @@ func TestPreProcess_PragmaTracking(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -796,7 +796,7 @@ func TestPreProcess_Halt(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err == nil { if err == nil {
t.Fatal("expected HaltError, got nil") t.Fatal("expected HaltError, got nil")
@ -833,7 +833,7 @@ func TestPreProcess_HaltInInclude(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("main.c65", reader) lines, _, err := PreProcess("main.c65", reader)
if err == nil { if err == nil {
t.Fatal("expected HaltError, got nil") t.Fatal("expected HaltError, got nil")
@ -871,7 +871,7 @@ func TestPreProcess_MixedBlocksAndComments(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -909,7 +909,7 @@ func TestPreProcess_EmptyASMBlock(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }
@ -933,7 +933,7 @@ func TestPreProcess_EmptyScriptBlock(t *testing.T) {
}, },
} }
reader := NewMockFileReader(files) reader := NewMockFileReader(files)
lines, err := PreProcess("test.c65", reader) lines, _, err := PreProcess("test.c65", reader)
if err != nil { if err != nil {
t.Fatalf("PreProcess failed: %v", err) t.Fatalf("PreProcess failed: %v", err)
} }