Merge pull request #2 from JalonSolov/fix_var_shadow

felipensp · web-flow · commit 5f38988095ca · 2025-01-02T07:54:25.000-03:00
fix: change local var to no longer shadow global
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,7 @@ vtcc
 log
 **.out
 vlang
+
+# Intellij files
+.idea/
+*.iml
diff --git a/src/tcctools.v b/src/tcctools.v
@@ -79,7 +79,7 @@ fn tcc_tool_ar(s1 &TCCState, argc int, argv &&u8) int {
 	tfile := [260]char{}
 	stmp := [20]char{}
 
-	file := &char(0)
+	cur_file := &char(0)
 	name := &char(0)
 
 	ret := 2
@@ -256,9 +256,9 @@ fn tcc_tool_ar(s1 &TCCState, argc int, argv &&u8) int {
 				}
 			}
 		}
-		file = argv[i_obj]
+		cur_file = argv[i_obj]
 		unsafe {
-			for name = C.strchr(file, 0); name > file && name[-1] != `/` && name[-1] != `\\`; name-- {
+			for name = C.strchr(cur_file, 0); name > cur_file && name[-1] != `/` && name[-1] != `\\`; name-- {
 			}
 		}
 		istrlen = C.strlen(name)

-Original file line number
+Diff line change
 log
 **.out
 vlang
++
 +# Intellij files
 +.idea/
 +*.iml
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ fn tcc_tool_ar(s1 &TCCState, argc int, argv &&u8) int {`
`79`	`79`	`tfile := [260]char{}`
`80`	`80`	`stmp := [20]char{}`
`81`	`81`
`82`		`- file := &char(0)`
	`82`	`+ cur_file := &char(0)`
`83`	`83`	`name := &char(0)`
`84`	`84`
`85`	`85`	`ret := 2`
`@@ -256,9 +256,9 @@ fn tcc_tool_ar(s1 &TCCState, argc int, argv &&u8) int {`
`256`	`256`	`}`
`257`	`257`	`}`
`258`	`258`	`}`
`259`		`- file = argv[i_obj]`
	`259`	`+ cur_file = argv[i_obj]`
`260`	`260`	`unsafe {`
`261`		- for name = C.strchr(file, 0); name > file && name[-1] != `/` && name[-1] != `\\`; name-- {
	`261`	+ for name = C.strchr(cur_file, 0); name > cur_file && name[-1] != `/` && name[-1] != `\\`; name-- {
`262`	`262`	`}`
`263`	`263`	`}`
`264`	`264`	`istrlen = C.strlen(name)`