refactor: update resolving test stages and configuration

Simplify and consolidate resolving test stages in Makefile, stages_test.go, and tester_definition.go. Adjust stage slugs and test cases to focus on core identifier resolution and variable scoping functionality.

Author: ryan-gang

Makefile

@@ -153,23 +153,13 @@ test_functions_w_jlox: build
 	$(shell pwd)/dist/main.out
 
 test_resolving_w_jlox: build
-	CODECRAFTERS_REPOSITORY_DIR=./craftinginterpreters/build/gen/chap10_functions \
+	CODECRAFTERS_REPOSITORY_DIR=./craftinginterpreters/build/gen/chap11_resolving \
 	CODECRAFTERS_TEST_CASES_JSON="[ \
-		{\"slug\":\"r1\",\"tester_log_prefix\":\"stage_701\",\"title\":\"Stage #701: Resolving: Scope Resolution\"}, \
-		{\"slug\":\"r4\",\"tester_log_prefix\":\"stage_704\",\"title\":\"Stage #704: Resolving: Self Initialization\"}, \
-		{\"slug\":\"r5\",\"tester_log_prefix\":\"stage_705\",\"title\":\"Stage #705: Resolving: Empty Return\"}, \
-		{\"slug\":\"r6\",\"tester_log_prefix\":\"stage_706\",\"title\":\"Stage #706: Resolving: Undeclared Variables\"}, \
-		{\"slug\":\"r7\",\"tester_log_prefix\":\"stage_707\",\"title\":\"Stage #707: Resolving: Variable Re-declaration\"} \
+		{\"slug\":\"r1\",\"tester_log_prefix\":\"stage_701\",\"title\":\"Stage #701: Resolving: Identifier Resolution\"}, \
+		{\"slug\":\"r2\",\"tester_log_prefix\":\"stage_704\",\"title\":\"Stage #704: Resolving: Self Initialization\"}, \
+		{\"slug\":\"r3\",\"tester_log_prefix\":\"stage_707\",\"title\":\"Stage #707: Resolving: Variable Re-declaration\"}, \
+		{\"slug\":\"r4\",\"tester_log_prefix\":\"stage_705\",\"title\":\"Stage #705: Resolving: Invalid Return\"} \
 	]" \
 	$(shell pwd)/dist/main.out
 
 test_all: test_scanning_w_jlox test_parsing_w_jlox test_evaluation_w_jlox test_statements_w_jlox test_control_flow_w_jlox test_functions_w_jlox test_resolving_w_jlox
-
-# Scope / Environment Resolution (Identifiers are resolved in different types of scopes)
-# Identifier Resolution (Variables, Functions, etc)
-# Static Analysis
-# Resolution and Binding
-# Lexical Environment / Scoping
-
-# Basic Scope Resolution
-# Advanced Scope Resolution

internal/stages_test.go

@@ -76,14 +76,14 @@ func TestStages(t *testing.T) {
 			NormalizeOutputFunc: normalizeTesterOutput,
 		},
 		"pass_resolving_inprogress_jlox": {
-			StageSlugs:          []string{"r1", "r4", "r5", "r6", "r7"},
+			StageSlugs:          []string{"r1", "r2", "r3", "r4"},
 			CodePath:            "../craftinginterpreters/build/gen/chap11_resolving",
 			ExpectedExitCode:    0,
 			StdoutFixturePath:   "./test_helpers/fixtures/pass_resolving",
 			NormalizeOutputFunc: normalizeTesterOutput,
 		},
 		"pass_resolving_completed_jlox": {
-			StageSlugs:          []string{"r1", "r4", "r5", "r6", "r7"},
+			StageSlugs:          []string{"r1", "r2", "r3", "r4"},
 			CodePath:            "../craftinginterpreters/build/gen/chap13_inheritance",
 			ExpectedExitCode:    0,
 			StdoutFixturePath:   "./test_helpers/fixtures/pass_resolving_final",

internal/tester_definition.go

@@ -278,20 +278,16 @@ var testerDefinition = tester_definition.TesterDefinition{
 			TestFunc: createTestForRunCommandStage("r1"),
 		},
 		{
-			Slug:     "r4",
-			TestFunc: createTestForRunCommandStage("r4"),
-		},
-		{
-			Slug:     "r5",
-			TestFunc: createTestForRunCommandStage("r5"),
+			Slug:     "r2",
+			TestFunc: createTestForRunCommandStage("r2"),
 		},
 		{
-			Slug:     "r6",
-			TestFunc: createTestForRunCommandStage("r6"),
+			Slug:     "r3",
+			TestFunc: createTestForRunCommandStage("r3"),
 		},
 		{
-			Slug:     "r7",
-			TestFunc: createTestForRunCommandStage("r7"),
+			Slug:     "r4",
+			TestFunc: createTestForRunCommandStage("r4"),
 		},
 	},
 }