Browse Source

Vet core library

gingerBill 6 years ago
parent
commit
1c9656aedb
3 changed files with 8 additions and 9 deletions
  1. 0 1
      core/os/os_windows.odin
  2. 4 4
      core/strings/strings.odin
  3. 4 4
      core/unicode/utf8/utf8.odin

+ 0 - 1
core/os/os_windows.odin

@@ -218,7 +218,6 @@ last_write_time :: proc(fd: Handle) -> (File_Time, Errno) {
 }
 
 last_write_time_by_name :: proc(name: string) -> (File_Time, Errno) {
-	last_write_time: win32.Filetime;
 	data: win32.File_Attribute_Data;
 
 	wide_path := win32.utf8_to_wstring(name);

+ 4 - 4
core/strings/strings.odin

@@ -283,8 +283,8 @@ replace :: proc(s, old, new: string, n: int, allocator := context.allocator) ->
 		j := start;
 		if len(old) == 0 {
 			if i > 0 {
-				_, w := utf8.decode_rune_in_string(s[start:]);
-				j += w;
+				_, width := utf8.decode_rune_in_string(s[start:]);
+				j += width;
 			}
 		} else {
 			j += index(s[start:], old);
@@ -381,8 +381,8 @@ index_rune :: proc(s: string, r: rune) -> int {
 		return index_byte(s, byte(r));
 
 	case r == utf8.RUNE_ERROR:
-		for r, i in s {
-			if r == utf8.RUNE_ERROR {
+		for c, i in s {
+			if c == utf8.RUNE_ERROR {
 				return i;
 			}
 		}

+ 4 - 4
core/unicode/utf8/utf8.odin

@@ -201,11 +201,11 @@ valid_string :: proc(s: string) -> bool {
 			return false;
 		} else if size == 2 {
 			// Okay
-		} else if b := s[i+2]; b < 0x80 || 0xbf < b {
+		} else if c := s[i+2]; c < 0x80 || 0xbf < c {
 			return false;
 		} else if size == 3 {
 			// Okay
-		} else if b := s[i+3]; b < 0x80 || 0xbf < b {
+		} else if d := s[i+3]; b < 0x80 || 0xbf < d {
 			return false;
 		}
 		i += size;
@@ -242,11 +242,11 @@ rune_count :: proc(s: []u8) -> int {
 			size = 1;
 		} else if size == 2 {
 			// Okay
-		} else if b := s[i+2]; b < 0x80 || 0xbf < b {
+		} else if c := s[i+2]; c < 0x80 || 0xbf < c {
 			size = 1;
 		} else if size == 3 {
 			// Okay
-		} else if b := s[i+3]; b < 0x80 || 0xbf < b {
+		} else if d := s[i+3]; d < 0x80 || 0xbf < d {
 			size = 1;
 		}
 		i += size;