refactor: consistent naming

nikolay · nikolay · commit ba656c3ada30 · 2021-12-22T03:04:57.000-08:00
diff --git a/2021/22/part2.go b/2021/22/part2.go
@@ -95,7 +95,7 @@ func main() {
 	}
 	defer file.Close()
 
-	r := regexp.MustCompile(`^(on|off) x=([-]?\d+)..([-]?\d+),y=([-]?\d+)..([-]?\d+),z=([-]?\d+)..([-]?\d+)$`)
+	cuboidRegexp := regexp.MustCompile(`^(on|off) x=([-]?\d+)..([-]?\d+),y=([-]?\d+)..([-]?\d+),z=([-]?\d+)..([-]?\d+)$`)
 
 	space := Space{}
 
@@ -105,7 +105,7 @@ func main() {
 		if len(line) == 0 {
 			continue
 		}
-		matches := r.FindStringSubmatch(line)
+		matches := cuboidRegexp.FindStringSubmatch(line)
 		if len(matches) > 0 {
 			state := false
 			if matches[1] == "on" {

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func main() {`
`95`	`95`	`}`
`96`	`96`	`defer file.Close()`
`97`	`97`
`98`		- r := regexp.MustCompile(`^(on\|off) x=([-]?\d+)..([-]?\d+),y=([-]?\d+)..([-]?\d+),z=([-]?\d+)..([-]?\d+)$`)
	`98`	+ cuboidRegexp := regexp.MustCompile(`^(on\|off) x=([-]?\d+)..([-]?\d+),y=([-]?\d+)..([-]?\d+),z=([-]?\d+)..([-]?\d+)$`)
`99`	`99`
`100`	`100`	`space := Space{}`
`101`	`101`
`@@ -105,7 +105,7 @@ func main() {`
`105`	`105`	`if len(line) == 0 {`
`106`	`106`	`continue`
`107`	`107`	`}`
`108`		`- matches := r.FindStringSubmatch(line)`
	`108`	`+ matches := cuboidRegexp.FindStringSubmatch(line)`
`109`	`109`	`if len(matches) > 0 {`
`110`	`110`	`state := false`
`111`	`111`	`if matches[1] == "on" {`