2
0
Эх сурвалжийг харах

Deprecate old @(deprecated) things.

Jeroen van Rijn 3 сар өмнө
parent
commit
4b36306674

+ 1 - 1
core/math/big/private.odin

@@ -1370,8 +1370,8 @@ _private_int_div_recursive :: proc(quotient, remainder, a, b: ^Int, allocator :=
 
 
 /*
 /*
 	Slower bit-bang division... also smaller.
 	Slower bit-bang division... also smaller.
+	Prefer `_int_div_school` for speed.
 */
 */
-@(deprecated="Use `_int_div_school`, it's 3.5x faster.")
 _private_int_div_small :: proc(quotient, remainder, numerator, denominator: ^Int) -> (err: Error) {
 _private_int_div_small :: proc(quotient, remainder, numerator, denominator: ^Int) -> (err: Error) {
 
 
 	ta, tb, tq, q := &Int{}, &Int{}, &Int{}, &Int{}
 	ta, tb, tq, q := &Int{}, &Int{}, &Int{}, &Int{}

+ 0 - 46
core/sort/sort.odin

@@ -30,14 +30,6 @@ sort :: proc(it: Interface) {
 	_quick_sort(it, 0, n, max_depth(n))
 	_quick_sort(it, 0, n, max_depth(n))
 }
 }
 
 
-
-@(deprecated="use slice.sort")
-slice :: proc(array: $T/[]$E) where ORD(E) {
-	_slice.sort(array)
-	// s := array;
-	// sort(slice_interface(&s));
-}
-
 slice_interface :: proc(s: ^$T/[]$E) -> Interface where ORD(E) {
 slice_interface :: proc(s: ^$T/[]$E) -> Interface where ORD(E) {
 	return Interface{
 	return Interface{
 		collection = rawptr(s),
 		collection = rawptr(s),
@@ -80,31 +72,6 @@ reverse_sort :: proc(it: Interface) {
 	sort(reverse_interface(&it))
 	sort(reverse_interface(&it))
 }
 }
 
 
-@(deprecated="use slice.reverse")
-reverse_slice :: proc(array: $T/[]$E) where ORD(E) {
-	_slice.reverse(array)
-	/*
-	s := array;
-	sort(Interface{
-		collection = rawptr(&s),
-		len = proc(it: Interface) -> int {
-			s := (^T)(it.collection);
-			return len(s^);
-		},
-		less = proc(it: Interface, i, j: int) -> bool {
-			s := (^T)(it.collection);
-			return s[j] < s[i]; // manual set up
-		},
-		swap = proc(it: Interface, i, j: int) {
-			s := (^T)(it.collection);
-			s[i], s[j] = s[j], s[i];
-		},
-	});
-	*/
-}
-
-
-
 is_sorted :: proc(it: Interface) -> bool {
 is_sorted :: proc(it: Interface) -> bool {
 	n := it->len()
 	n := it->len()
 	for i := n-1; i > 0; i -= 1 {
 	for i := n-1; i > 0; i -= 1 {
@@ -294,11 +261,6 @@ _insertion_sort :: proc(it: Interface, a, b: int) {
 	}
 	}
 }
 }
 
 
-
-
-
-
-// @(deprecated="use sort.sort or slice.sort_by")
 bubble_sort_proc :: proc(array: $A/[]$T, f: proc(T, T) -> int) {
 bubble_sort_proc :: proc(array: $A/[]$T, f: proc(T, T) -> int) {
 	assert(f != nil)
 	assert(f != nil)
 	count := len(array)
 	count := len(array)
@@ -327,7 +289,6 @@ bubble_sort_proc :: proc(array: $A/[]$T, f: proc(T, T) -> int) {
 	}
 	}
 }
 }
 
 
-// @(deprecated="use sort.sort_slice or slice.sort")
 bubble_sort :: proc(array: $A/[]$T) where intrinsics.type_is_ordered(T) {
 bubble_sort :: proc(array: $A/[]$T) where intrinsics.type_is_ordered(T) {
 	count := len(array)
 	count := len(array)
 
 
@@ -355,7 +316,6 @@ bubble_sort :: proc(array: $A/[]$T) where intrinsics.type_is_ordered(T) {
 	}
 	}
 }
 }
 
 
-// @(deprecated="use sort.sort or slice.sort_by")
 quick_sort_proc :: proc(array: $A/[]$T, f: proc(T, T) -> int) {
 quick_sort_proc :: proc(array: $A/[]$T, f: proc(T, T) -> int) {
 	assert(f != nil)
 	assert(f != nil)
 	a := array
 	a := array
@@ -384,7 +344,6 @@ quick_sort_proc :: proc(array: $A/[]$T, f: proc(T, T) -> int) {
 	quick_sort_proc(a[i:n], f)
 	quick_sort_proc(a[i:n], f)
 }
 }
 
 
-// @(deprecated="use sort.sort_slice or slice.sort")
 quick_sort :: proc(array: $A/[]$T) where intrinsics.type_is_ordered(T) {
 quick_sort :: proc(array: $A/[]$T) where intrinsics.type_is_ordered(T) {
 	a := array
 	a := array
 	n := len(a)
 	n := len(a)
@@ -420,7 +379,6 @@ _log2 :: proc(x: int) -> int {
 	return res
 	return res
 }
 }
 
 
-// @(deprecated="use sort.sort or slice.sort_by")
 merge_sort_proc :: proc(array: $A/[]$T, f: proc(T, T) -> int) {
 merge_sort_proc :: proc(array: $A/[]$T, f: proc(T, T) -> int) {
 	merge :: proc(a: A, start, mid, end: int, f: proc(T, T) -> int) {
 	merge :: proc(a: A, start, mid, end: int, f: proc(T, T) -> int) {
 		s, m := start, mid
 		s, m := start, mid
@@ -462,7 +420,6 @@ merge_sort_proc :: proc(array: $A/[]$T, f: proc(T, T) -> int) {
 	internal_sort(array, 0, len(array)-1, f)
 	internal_sort(array, 0, len(array)-1, f)
 }
 }
 
 
-// @(deprecated="use sort.sort_slice or slice.sort")
 merge_sort :: proc(array: $A/[]$T) where intrinsics.type_is_ordered(T) {
 merge_sort :: proc(array: $A/[]$T) where intrinsics.type_is_ordered(T) {
 	merge :: proc(a: A, start, mid, end: int) {
 	merge :: proc(a: A, start, mid, end: int) {
 		s, m := start, mid
 		s, m := start, mid
@@ -504,8 +461,6 @@ merge_sort :: proc(array: $A/[]$T) where intrinsics.type_is_ordered(T) {
 	internal_sort(array, 0, len(array)-1)
 	internal_sort(array, 0, len(array)-1)
 }
 }
 
 
-
-// @(deprecated="use sort.sort or slice.sort_by")
 heap_sort_proc :: proc(array: $A/[]$T, f: proc(T, T) -> int) {
 heap_sort_proc :: proc(array: $A/[]$T, f: proc(T, T) -> int) {
 	sift_proc :: proc(a: A, pi: int, n: int, f: proc(T, T) -> int) #no_bounds_check {
 	sift_proc :: proc(a: A, pi: int, n: int, f: proc(T, T) -> int) #no_bounds_check {
 		p := pi
 		p := pi
@@ -540,7 +495,6 @@ heap_sort_proc :: proc(array: $A/[]$T, f: proc(T, T) -> int) {
 	}
 	}
 }
 }
 
 
-// @(deprecated="use sort.sort_slice or slice.sort")
 heap_sort :: proc(array: $A/[]$T) where intrinsics.type_is_ordered(T) {
 heap_sort :: proc(array: $A/[]$T) where intrinsics.type_is_ordered(T) {
 	sift :: proc(a: A, pi: int, n: int) #no_bounds_check {
 	sift :: proc(a: A, pi: int, n: int) #no_bounds_check {
 		p := pi
 		p := pi

+ 82 - 64
core/strings/strings.odin

@@ -28,24 +28,7 @@ clone :: proc(s: string, allocator := context.allocator, loc := #caller_location
 	copy(c, s)
 	copy(c, s)
 	return string(c), nil
 	return string(c), nil
 }
 }
-/*
-Clones a string safely (returns early with an allocation error on failure)
-
-*Allocates Using Provided Allocator*
-
-Inputs:
-- s: The string to be cloned
-- allocator: (default: context.allocator)
-- loc: The caller location for debugging purposes (default: #caller_location)
 
 
-Returns:
-- res: The cloned string
-- err: An allocator error if one occured, `nil` otherwise
-*/
-@(deprecated="Prefer clone. It now returns an optional allocator error")
-clone_safe :: proc(s: string, allocator := context.allocator, loc := #caller_location) -> (res: string, err: mem.Allocator_Error) {
-	return clone(s, allocator, loc)
-}
 /*
 /*
 Clones a string and appends a null-byte to make it a cstring
 Clones a string and appends a null-byte to make it a cstring
 
 
@@ -66,6 +49,7 @@ clone_to_cstring :: proc(s: string, allocator := context.allocator, loc := #call
 	c[len(s)] = 0
 	c[len(s)] = 0
 	return cstring(&c[0]), nil
 	return cstring(&c[0]), nil
 }
 }
+
 /*
 /*
 Transmutes a raw pointer into a string. Non-allocating.
 Transmutes a raw pointer into a string. Non-allocating.
 
 
@@ -81,6 +65,7 @@ Returns:
 string_from_ptr :: proc(ptr: ^byte, len: int) -> (res: string) {
 string_from_ptr :: proc(ptr: ^byte, len: int) -> (res: string) {
 	return transmute(string)mem.Raw_String{ptr, len}
 	return transmute(string)mem.Raw_String{ptr, len}
 }
 }
+
 /*
 /*
 Transmutes a raw pointer (null-terminated) into a string. Non-allocating. Searches for a null-byte from `0..<len`, otherwise `len` will be the end size
 Transmutes a raw pointer (null-terminated) into a string. Non-allocating. Searches for a null-byte from `0..<len`, otherwise `len` will be the end size
 
 
@@ -99,20 +84,7 @@ string_from_null_terminated_ptr :: proc "contextless" (ptr: [^]byte, len: int) -
 	s = truncate_to_byte(s, 0)
 	s = truncate_to_byte(s, 0)
 	return s
 	return s
 }
 }
-/*
-Gets the raw byte pointer for the start of a string `str`
 
 
-Inputs:
-- str: The input string
-
-Returns:
-- res: A pointer to the start of the string's bytes
-*/
-@(deprecated="Prefer the builtin raw_data.")
-ptr_from_string :: proc(str: string) -> (res: ^byte) {
-	d := transmute(mem.Raw_String)str
-	return d.data
-}
 /*
 /*
 Converts a string `str` to a cstring
 Converts a string `str` to a cstring
 
 
@@ -128,6 +100,7 @@ unsafe_string_to_cstring :: proc(str: string) -> (res: cstring) {
 	d := transmute(mem.Raw_String)str
 	d := transmute(mem.Raw_String)str
 	return cstring(d.data)
 	return cstring(d.data)
 }
 }
+
 /*
 /*
 Truncates a string `str` at the first occurrence of char/byte `b`
 Truncates a string `str` at the first occurrence of char/byte `b`
 
 
@@ -147,6 +120,7 @@ truncate_to_byte :: proc "contextless" (str: string, b: byte) -> (res: string) {
 	}
 	}
 	return str[:n]
 	return str[:n]
 }
 }
+
 /*
 /*
 Truncates a string `str` at the first occurrence of rune `r` as a slice of the original, entire string if not found
 Truncates a string `str` at the first occurrence of rune `r` as a slice of the original, entire string if not found
 
 
@@ -164,6 +138,7 @@ truncate_to_rune :: proc(str: string, r: rune) -> (res: string) {
 	}
 	}
 	return str[:n]
 	return str[:n]
 }
 }
+
 /*
 /*
 Clones a byte array `s` and appends a null-byte
 Clones a byte array `s` and appends a null-byte
 
 
@@ -184,6 +159,7 @@ clone_from_bytes :: proc(s: []byte, allocator := context.allocator, loc := #call
 	c[len(s)] = 0
 	c[len(s)] = 0
 	return string(c[:len(s)]), nil
 	return string(c[:len(s)]), nil
 }
 }
+
 /*
 /*
 Clones a cstring `s` as a string
 Clones a cstring `s` as a string
 
 
@@ -201,6 +177,7 @@ Returns:
 clone_from_cstring :: proc(s: cstring, allocator := context.allocator, loc := #caller_location) -> (res: string, err: mem.Allocator_Error) #optional_allocator_error {
 clone_from_cstring :: proc(s: cstring, allocator := context.allocator, loc := #caller_location) -> (res: string, err: mem.Allocator_Error) #optional_allocator_error {
 	return clone(string(s), allocator, loc)
 	return clone(string(s), allocator, loc)
 }
 }
+
 /*
 /*
 Clones a string from a byte pointer `ptr` and a byte length `len`
 Clones a string from a byte pointer `ptr` and a byte length `len`
 
 
@@ -222,6 +199,7 @@ clone_from_ptr :: proc(ptr: ^byte, len: int, allocator := context.allocator, loc
 	s := string_from_ptr(ptr, len)
 	s := string_from_ptr(ptr, len)
 	return clone(s, allocator, loc)
 	return clone(s, allocator, loc)
 }
 }
+
 // Overloaded procedure to clone from a string, `[]byte`, `cstring` or a `^byte` + length
 // Overloaded procedure to clone from a string, `[]byte`, `cstring` or a `^byte` + length
 clone_from :: proc{
 clone_from :: proc{
 	clone,
 	clone,
@@ -229,6 +207,7 @@ clone_from :: proc{
 	clone_from_cstring,
 	clone_from_cstring,
 	clone_from_ptr,
 	clone_from_ptr,
 }
 }
+
 /*
 /*
 Clones a string from a null-terminated cstring `ptr` and a byte length `len`
 Clones a string from a null-terminated cstring `ptr` and a byte length `len`
 
 
@@ -251,6 +230,7 @@ clone_from_cstring_bounded :: proc(ptr: cstring, len: int, allocator := context.
 	s = truncate_to_byte(s, 0)
 	s = truncate_to_byte(s, 0)
 	return clone(s, allocator, loc)
 	return clone(s, allocator, loc)
 }
 }
+
 /*
 /*
 Compares two strings, returning a value representing which one comes first lexicographically.
 Compares two strings, returning a value representing which one comes first lexicographically.
 -1 for `lhs`; 1 for `rhs`, or 0 if they are equal.
 -1 for `lhs`; 1 for `rhs`, or 0 if they are equal.
@@ -265,6 +245,7 @@ Returns:
 compare :: proc "contextless" (lhs, rhs: string) -> (result: int) {
 compare :: proc "contextless" (lhs, rhs: string) -> (result: int) {
 	return mem.compare(transmute([]byte)lhs, transmute([]byte)rhs)
 	return mem.compare(transmute([]byte)lhs, transmute([]byte)rhs)
 }
 }
+
 /*
 /*
 Checks if rune `r` in the string `s`
 Checks if rune `r` in the string `s`
 
 
@@ -283,6 +264,7 @@ contains_rune :: proc(s: string, r: rune) -> (result: bool) {
 	}
 	}
 	return false
 	return false
 }
 }
+
 /*
 /*
 Returns true when the string `substr` is contained inside the string `s`
 Returns true when the string `substr` is contained inside the string `s`
 
 
@@ -314,6 +296,7 @@ Output:
 contains :: proc(s, substr: string) -> (res: bool) {
 contains :: proc(s, substr: string) -> (res: bool) {
 	return index(s, substr) >= 0
 	return index(s, substr) >= 0
 }
 }
+
 /*
 /*
 Returns `true` when the string `s` contains any of the characters inside the string `chars`
 Returns `true` when the string `s` contains any of the characters inside the string `chars`
 
 
@@ -386,6 +369,7 @@ Output:
 rune_count :: proc(s: string) -> (res: int) {
 rune_count :: proc(s: string) -> (res: int) {
 	return utf8.rune_count_in_string(s)
 	return utf8.rune_count_in_string(s)
 }
 }
+
 /*
 /*
 Returns whether the strings `u` and `v` are the same alpha characters, ignoring different casings
 Returns whether the strings `u` and `v` are the same alpha characters, ignoring different casings
 Works with UTF-8 string content
 Works with UTF-8 string content
@@ -508,6 +492,7 @@ prefix_length :: proc "contextless" (a, b: string) -> (n: int) {
 	}
 	}
 	return
 	return
 }
 }
+
 /*
 /*
 Returns the common prefix between strings `a` and `b`
 Returns the common prefix between strings `a` and `b`
 
 
@@ -540,6 +525,7 @@ Output:
 common_prefix :: proc(a, b: string) -> string {
 common_prefix :: proc(a, b: string) -> string {
 	return a[:prefix_length(a, b)]
 	return a[:prefix_length(a, b)]
 }
 }
+
 /*
 /*
 Determines if a string `s` starts with a given `prefix`
 Determines if a string `s` starts with a given `prefix`
 
 
@@ -661,24 +647,7 @@ join :: proc(a: []string, sep: string, allocator := context.allocator, loc := #c
 	}
 	}
 	return string(b), nil
 	return string(b), nil
 }
 }
-/*
-Joins a slice of strings `a` with a `sep` string, returns an error on allocation failure
-
-*Allocates Using Provided Allocator*
 
 
-Inputs:
-- a: A slice of strings to join
-- sep: The separator string
-- allocator: (default is context.allocator)
-
-Returns:
-- str: A combined string from the slice of strings `a` separated with the `sep` string
-- err: An allocator error if one occured, `nil` otherwise
-*/
-@(deprecated="Prefer join. It now returns an optional allocator error")
-join_safe :: proc(a: []string, sep: string, allocator := context.allocator) -> (res: string, err: mem.Allocator_Error) {
-	return join(a, sep, allocator)
-}
 /*
 /*
 Returns a combined string from the slice of strings `a` without a separator
 Returns a combined string from the slice of strings `a` without a separator
 
 
@@ -723,22 +692,6 @@ concatenate :: proc(a: []string, allocator := context.allocator, loc := #caller_
 	}
 	}
 	return string(b), nil
 	return string(b), nil
 }
 }
-/*
-Returns a combined string from the slice of strings `a` without a separator, or an error if allocation fails
-
-*Allocates Using Provided Allocator*
-
-Inputs:
-- a: A slice of strings to concatenate
-- allocator: (default is context.allocator)
-
-Returns:
-The concatenated string, and an error if allocation fails
-*/
-@(deprecated="Prefer concatenate. It now returns an optional allocator error")
-concatenate_safe :: proc(a: []string, allocator := context.allocator) -> (res: string, err: mem.Allocator_Error) {
-	return concatenate(a, allocator)
-}
 
 
 /*
 /*
 Returns a substring of the input string `s` with the specified rune offset and length
 Returns a substring of the input string `s` with the specified rune offset and length
@@ -901,6 +854,7 @@ _split :: proc(s_, sep: string, sep_save, n_: int, allocator := context.allocato
 
 
 	return res[:i+1], nil
 	return res[:i+1], nil
 }
 }
+
 /*
 /*
 Splits a string into parts based on a separator.
 Splits a string into parts based on a separator.
 
 
@@ -936,6 +890,7 @@ Output:
 split :: proc(s, sep: string, allocator := context.allocator) -> (res: []string, err: mem.Allocator_Error) #optional_allocator_error {
 split :: proc(s, sep: string, allocator := context.allocator) -> (res: []string, err: mem.Allocator_Error) #optional_allocator_error {
 	return _split(s, sep, 0, -1, allocator)
 	return _split(s, sep, 0, -1, allocator)
 }
 }
+
 /*
 /*
 Splits a string into parts based on a separator. If n < count of seperators, the remainder of the string is returned in the last entry.
 Splits a string into parts based on a separator. If n < count of seperators, the remainder of the string is returned in the last entry.
 
 
@@ -972,6 +927,7 @@ Output:
 split_n :: proc(s, sep: string, n: int, allocator := context.allocator) -> (res: []string, err: mem.Allocator_Error) #optional_allocator_error {
 split_n :: proc(s, sep: string, n: int, allocator := context.allocator) -> (res: []string, err: mem.Allocator_Error) #optional_allocator_error {
 	return _split(s, sep, 0, n, allocator)
 	return _split(s, sep, 0, n, allocator)
 }
 }
+
 /*
 /*
 Splits a string into parts after the separator, retaining it in the substrings.
 Splits a string into parts after the separator, retaining it in the substrings.
 
 
@@ -1007,6 +963,7 @@ Output:
 split_after :: proc(s, sep: string, allocator := context.allocator) -> (res: []string, err: mem.Allocator_Error) #optional_allocator_error {
 split_after :: proc(s, sep: string, allocator := context.allocator) -> (res: []string, err: mem.Allocator_Error) #optional_allocator_error {
 	return _split(s, sep, len(sep), -1, allocator)
 	return _split(s, sep, len(sep), -1, allocator)
 }
 }
+
 /*
 /*
 Splits a string into a total of `n` parts after the separator.
 Splits a string into a total of `n` parts after the separator.
 
 
@@ -1043,6 +1000,7 @@ Output:
 split_after_n :: proc(s, sep: string, n: int, allocator := context.allocator) -> (res: []string, err: mem.Allocator_Error) #optional_allocator_error {
 split_after_n :: proc(s, sep: string, n: int, allocator := context.allocator) -> (res: []string, err: mem.Allocator_Error) #optional_allocator_error {
 	return _split(s, sep, len(sep), n, allocator)
 	return _split(s, sep, len(sep), n, allocator)
 }
 }
+
 /*
 /*
 Searches for the first occurrence of `sep` in the given string and returns the substring
 Searches for the first occurrence of `sep` in the given string and returns the substring
 up to (but not including) the separator, as well as a boolean indicating success.
 up to (but not including) the separator, as well as a boolean indicating success.
@@ -1083,6 +1041,7 @@ _split_iterator :: proc(s: ^string, sep: string, sep_save: int) -> (res: string,
 	}
 	}
 	return
 	return
 }
 }
+
 /*
 /*
 Splits the input string by the byte separator in an iterator fashion.
 Splits the input string by the byte separator in an iterator fashion.
 
 
@@ -1129,6 +1088,7 @@ split_by_byte_iterator :: proc(s: ^string, sep: u8) -> (res: string, ok: bool) {
 	}
 	}
 	return
 	return
 }
 }
+
 /*
 /*
 Splits the input string by the separator string in an iterator fashion.
 Splits the input string by the separator string in an iterator fashion.
 
 
@@ -1164,6 +1124,7 @@ Output:
 split_iterator :: proc(s: ^string, sep: string) -> (res: string, ok: bool) {
 split_iterator :: proc(s: ^string, sep: string) -> (res: string, ok: bool) {
 	return _split_iterator(s, sep, 0)
 	return _split_iterator(s, sep, 0)
 }
 }
+
 /*
 /*
 Splits the input string after every separator string in an iterator fashion.
 Splits the input string after every separator string in an iterator fashion.
 
 
@@ -1199,6 +1160,7 @@ Output:
 split_after_iterator :: proc(s: ^string, sep: string) -> (res: string, ok: bool) {
 split_after_iterator :: proc(s: ^string, sep: string) -> (res: string, ok: bool) {
 	return _split_iterator(s, sep, len(sep))
 	return _split_iterator(s, sep, len(sep))
 }
 }
+
 /*
 /*
 Trims the carriage return character from the end of the input string.
 Trims the carriage return character from the end of the input string.
 
 
@@ -1220,6 +1182,7 @@ _trim_cr :: proc(s: string) -> (res: string) {
 	}
 	}
 	return s
 	return s
 }
 }
+
 /*
 /*
 Splits the input string at every line break `\n`.
 Splits the input string at every line break `\n`.
 
 
@@ -1257,6 +1220,7 @@ split_lines :: proc(s: string, allocator := context.allocator) -> (res: []string
 	}
 	}
 	return lines, nil
 	return lines, nil
 }
 }
+
 /*
 /*
 Splits the input string at every line break `\n` for `n` parts.
 Splits the input string at every line break `\n` for `n` parts.
 
 
@@ -1297,6 +1261,7 @@ split_lines_n :: proc(s: string, n: int, allocator := context.allocator) -> (res
 	}
 	}
 	return lines, nil
 	return lines, nil
 }
 }
+
 /*
 /*
 Splits the input string at every line break `\n` leaving the `\n` in the resulting strings.
 Splits the input string at every line break `\n` leaving the `\n` in the resulting strings.
 
 
@@ -1336,6 +1301,7 @@ split_lines_after :: proc(s: string, allocator := context.allocator) -> (res: []
 	}
 	}
 	return lines, nil
 	return lines, nil
 }
 }
+
 /*
 /*
 Splits the input string at every line break `\n` leaving the `\n` in the resulting strings.
 Splits the input string at every line break `\n` leaving the `\n` in the resulting strings.
 Only runs for n parts.
 Only runs for n parts.
@@ -1377,6 +1343,7 @@ split_lines_after_n :: proc(s: string, n: int, allocator := context.allocator) -
 	}
 	}
 	return lines, nil
 	return lines, nil
 }
 }
+
 /*
 /*
 Splits the input string at every line break `\n`.
 Splits the input string at every line break `\n`.
 Returns the current split string every iteration until the string is consumed.
 Returns the current split string every iteration until the string is consumed.
@@ -1411,6 +1378,7 @@ split_lines_iterator :: proc(s: ^string) -> (line: string, ok: bool) {
 	line = _split_iterator(s, sep, 0) or_return
 	line = _split_iterator(s, sep, 0) or_return
 	return _trim_cr(line), true
 	return _trim_cr(line), true
 }
 }
+
 /*
 /*
 Splits the input string at every line break `\n`.
 Splits the input string at every line break `\n`.
 Returns the current split string with line breaks included every iteration until the string is consumed.
 Returns the current split string with line breaks included every iteration until the string is consumed.
@@ -1448,6 +1416,7 @@ split_lines_after_iterator :: proc(s: ^string) -> (line: string, ok: bool) {
 	line = _split_iterator(s, sep, len(sep)) or_return
 	line = _split_iterator(s, sep, len(sep)) or_return
 	return _trim_cr(line), true
 	return _trim_cr(line), true
 }
 }
+
 /*
 /*
 Returns the byte offset of the first byte `c` in the string s it finds, -1 when not found.
 Returns the byte offset of the first byte `c` in the string s it finds, -1 when not found.
 NOTE: Can't find UTF-8 based runes.
 NOTE: Can't find UTF-8 based runes.
@@ -1482,6 +1451,7 @@ Output:
 index_byte :: proc "contextless" (s: string, c: byte) -> (res: int) {
 index_byte :: proc "contextless" (s: string, c: byte) -> (res: int) {
 	return #force_inline bytes.index_byte(transmute([]u8)s, c)
 	return #force_inline bytes.index_byte(transmute([]u8)s, c)
 }
 }
+
 /*
 /*
 Returns the byte offset of the last byte `c` in the string `s`, -1 when not found.
 Returns the byte offset of the last byte `c` in the string `s`, -1 when not found.
 
 
@@ -1517,6 +1487,7 @@ Output:
 last_index_byte :: proc "contextless" (s: string, c: byte) -> (res: int) {
 last_index_byte :: proc "contextless" (s: string, c: byte) -> (res: int) {
 	return #force_inline bytes.last_index_byte(transmute([]u8)s, c)
 	return #force_inline bytes.last_index_byte(transmute([]u8)s, c)
 }
 }
+
 /*
 /*
 Returns the byte offset of the first rune `r` in the string `s` it finds, -1 when not found.
 Returns the byte offset of the first rune `r` in the string `s` it finds, -1 when not found.
 Invalid runes return -1
 Invalid runes return -1
@@ -1657,6 +1628,7 @@ index :: proc "contextless" (s, substr: string) -> (res: int) {
 	}
 	}
 	return -1
 	return -1
 }
 }
+
 /*
 /*
 Returns the last byte offset of the string `substr` in the string `s`, -1 when not found.
 Returns the last byte offset of the string `substr` in the string `s`, -1 when not found.
 
 
@@ -1734,6 +1706,7 @@ last_index :: proc(s, substr: string) -> (res: int) {
 	}
 	}
 	return -1
 	return -1
 }
 }
+
 /*
 /*
 Returns the index of any first char of `chars` found in `s`, -1 if not found.
 Returns the index of any first char of `chars` found in `s`, -1 if not found.
 
 
@@ -1797,6 +1770,7 @@ index_any :: proc(s, chars: string) -> (res: int) {
 	}
 	}
 	return -1
 	return -1
 }
 }
+
 /*
 /*
 Finds the last occurrence of any character in `chars` within `s`. Iterates in reverse.
 Finds the last occurrence of any character in `chars` within `s`. Iterates in reverse.
 
 
@@ -1878,6 +1852,7 @@ last_index_any :: proc(s, chars: string) -> (res: int) {
 	}
 	}
 	return -1
 	return -1
 }
 }
+
 /*
 /*
 Finds the first occurrence of any substring in `substrs` within `s`
 Finds the first occurrence of any substring in `substrs` within `s`
 
 
@@ -1919,6 +1894,7 @@ index_multi :: proc(s: string, substrs: []string) -> (idx: int, width: int) {
 	}
 	}
 	return
 	return
 }
 }
+
 /*
 /*
 Counts the number of non-overlapping occurrences of `substr` in `s`
 Counts the number of non-overlapping occurrences of `substr` in `s`
 
 
@@ -1985,6 +1961,7 @@ count :: proc(s, substr: string) -> (res: int) {
 	}
 	}
 	return n
 	return n
 }
 }
+
 /*
 /*
 Repeats the string `s` `count` times, concatenating the result
 Repeats the string `s` `count` times, concatenating the result
 
 
@@ -2030,6 +2007,7 @@ repeat :: proc(s: string, count: int, allocator := context.allocator, loc := #ca
 	}
 	}
 	return string(b), nil
 	return string(b), nil
 }
 }
+
 /*
 /*
 Replaces all occurrences of `old` in `s` with `new`
 Replaces all occurrences of `old` in `s` with `new`
 
 
@@ -2063,9 +2041,11 @@ Output:
 	zzzz true
 	zzzz true
 
 
 */
 */
+
 replace_all :: proc(s, old, new: string, allocator := context.allocator) -> (output: string, was_allocation: bool) {
 replace_all :: proc(s, old, new: string, allocator := context.allocator) -> (output: string, was_allocation: bool) {
 	return replace(s, old, new, -1, allocator)
 	return replace(s, old, new, -1, allocator)
 }
 }
+
 /*
 /*
 Replaces n instances of old in the string s with the new string
 Replaces n instances of old in the string s with the new string
 
 
@@ -2144,6 +2124,7 @@ replace :: proc(s, old, new: string, n: int, allocator := context.allocator, loc
 	output = string(t[0:w])
 	output = string(t[0:w])
 	return
 	return
 }
 }
+
 /*
 /*
 Removes the key string `n` times from the `s` string
 Removes the key string `n` times from the `s` string
 
 
@@ -2182,6 +2163,7 @@ Output:
 remove :: proc(s, key: string, n: int, allocator := context.allocator) -> (output: string, was_allocation: bool) {
 remove :: proc(s, key: string, n: int, allocator := context.allocator) -> (output: string, was_allocation: bool) {
 	return replace(s, key, "", n, allocator)
 	return replace(s, key, "", n, allocator)
 }
 }
+
 /*
 /*
 Removes all the `key` string instances from the `s` string
 Removes all the `key` string instances from the `s` string
 
 
@@ -2217,6 +2199,7 @@ Output:
 remove_all :: proc(s, key: string, allocator := context.allocator) -> (output: string, was_allocation: bool) {
 remove_all :: proc(s, key: string, allocator := context.allocator) -> (output: string, was_allocation: bool) {
 	return remove(s, key, -1, allocator)
 	return remove(s, key, -1, allocator)
 }
 }
+
 // Returns true if is an ASCII space character ('\t', '\n', '\v', '\f', '\r', ' ')
 // Returns true if is an ASCII space character ('\t', '\n', '\v', '\f', '\r', ' ')
 @(private) _ascii_space := [256]bool{'\t' = true, '\n' = true, '\v' = true, '\f' = true, '\r' = true, ' ' = true}
 @(private) _ascii_space := [256]bool{'\t' = true, '\n' = true, '\v' = true, '\f' = true, '\r' = true, ' ' = true}
 
 
@@ -2320,6 +2303,7 @@ index_proc :: proc(s: string, p: proc(rune) -> bool, truth := true) -> (res: int
 	}
 	}
 	return -1
 	return -1
 }
 }
+
 // Same as `index_proc`, but the procedure p takes a raw pointer for state
 // Same as `index_proc`, but the procedure p takes a raw pointer for state
 index_proc_with_state :: proc(s: string, p: proc(rawptr, rune) -> bool, state: rawptr, truth := true) -> (res: int) {
 index_proc_with_state :: proc(s: string, p: proc(rawptr, rune) -> bool, state: rawptr, truth := true) -> (res: int) {
 	for r, i in s {
 	for r, i in s {
@@ -2329,6 +2313,7 @@ index_proc_with_state :: proc(s: string, p: proc(rawptr, rune) -> bool, state: r
 	}
 	}
 	return -1
 	return -1
 }
 }
+
 // Finds the index of the *last* rune in the string s for which the procedure p returns the same value as truth
 // Finds the index of the *last* rune in the string s for which the procedure p returns the same value as truth
 last_index_proc :: proc(s: string, p: proc(rune) -> bool, truth := true) -> (res: int) {
 last_index_proc :: proc(s: string, p: proc(rune) -> bool, truth := true) -> (res: int) {
 	// TODO(bill): Probably use Rabin-Karp Search
 	// TODO(bill): Probably use Rabin-Karp Search
@@ -2341,6 +2326,7 @@ last_index_proc :: proc(s: string, p: proc(rune) -> bool, truth := true) -> (res
 	}
 	}
 	return -1
 	return -1
 }
 }
+
 // Same as `index_proc_with_state`, runs through the string in reverse
 // Same as `index_proc_with_state`, runs through the string in reverse
 last_index_proc_with_state :: proc(s: string, p: proc(rawptr, rune) -> bool, state: rawptr, truth := true) -> (res: int) {
 last_index_proc_with_state :: proc(s: string, p: proc(rawptr, rune) -> bool, state: rawptr, truth := true) -> (res: int) {
 	// TODO(bill): Probably use Rabin-Karp Search
 	// TODO(bill): Probably use Rabin-Karp Search
@@ -2353,6 +2339,7 @@ last_index_proc_with_state :: proc(s: string, p: proc(rawptr, rune) -> bool, sta
 	}
 	}
 	return -1
 	return -1
 }
 }
+
 /*
 /*
 Trims the input string `s` from the left until the procedure `p` returns false
 Trims the input string `s` from the left until the procedure `p` returns false
 
 
@@ -2387,6 +2374,7 @@ trim_left_proc :: proc(s: string, p: proc(rune) -> bool) -> (res: string) {
 	}
 	}
 	return s[i:]
 	return s[i:]
 }
 }
+
 /*
 /*
 Trims the input string `s` from the left until the procedure `p` with state returns false
 Trims the input string `s` from the left until the procedure `p` with state returns false
 
 
@@ -2405,6 +2393,7 @@ trim_left_proc_with_state :: proc(s: string, p: proc(rawptr, rune) -> bool, stat
 	}
 	}
 	return s[i:]
 	return s[i:]
 }
 }
+
 /*
 /*
 Trims the input string `s` from the right until the procedure `p` returns `false`
 Trims the input string `s` from the right until the procedure `p` returns `false`
 
 
@@ -2442,6 +2431,7 @@ trim_right_proc :: proc(s: string, p: proc(rune) -> bool) -> (res: string) {
 	}
 	}
 	return s[0:i]
 	return s[0:i]
 }
 }
+
 /*
 /*
 Trims the input string `s` from the right until the procedure `p` with state returns `false`
 Trims the input string `s` from the right until the procedure `p` with state returns `false`
 
 
@@ -2463,6 +2453,7 @@ trim_right_proc_with_state :: proc(s: string, p: proc(rawptr, rune) -> bool, sta
 	}
 	}
 	return s[0:i]
 	return s[0:i]
 }
 }
+
 // Procedure for `trim_*_proc` variants, which has a string rawptr cast + rune comparison
 // Procedure for `trim_*_proc` variants, which has a string rawptr cast + rune comparison
 is_in_cutset :: proc(state: rawptr, r: rune) -> (res: bool) {
 is_in_cutset :: proc(state: rawptr, r: rune) -> (res: bool) {
 	cutset := (^string)(state)^
 	cutset := (^string)(state)^
@@ -2473,6 +2464,7 @@ is_in_cutset :: proc(state: rawptr, r: rune) -> (res: bool) {
 	}
 	}
 	return false
 	return false
 }
 }
+
 /*
 /*
 Trims the cutset string from the `s` string
 Trims the cutset string from the `s` string
 
 
@@ -2490,6 +2482,7 @@ trim_left :: proc(s: string, cutset: string) -> (res: string) {
 	state := cutset
 	state := cutset
 	return trim_left_proc_with_state(s, is_in_cutset, &state)
 	return trim_left_proc_with_state(s, is_in_cutset, &state)
 }
 }
+
 /*
 /*
 Trims the cutset string from the `s` string from the right
 Trims the cutset string from the `s` string from the right
 
 
@@ -2507,6 +2500,7 @@ trim_right :: proc(s: string, cutset: string) -> (res: string) {
 	state := cutset
 	state := cutset
 	return trim_right_proc_with_state(s, is_in_cutset, &state)
 	return trim_right_proc_with_state(s, is_in_cutset, &state)
 }
 }
+
 /*
 /*
 Trims the cutset string from the `s` string, both from left and right
 Trims the cutset string from the `s` string, both from left and right
 
 
@@ -2520,6 +2514,7 @@ Returns:
 trim :: proc(s: string, cutset: string) -> (res: string) {
 trim :: proc(s: string, cutset: string) -> (res: string) {
 	return trim_right(trim_left(s, cutset), cutset)
 	return trim_right(trim_left(s, cutset), cutset)
 }
 }
+
 /*
 /*
 Trims until a valid non-space rune from the left, "\t\txyz\t\t" -> "xyz\t\t"
 Trims until a valid non-space rune from the left, "\t\txyz\t\t" -> "xyz\t\t"
 
 
@@ -2532,6 +2527,7 @@ Returns:
 trim_left_space :: proc(s: string) -> (res: string) {
 trim_left_space :: proc(s: string) -> (res: string) {
 	return trim_left_proc(s, is_space)
 	return trim_left_proc(s, is_space)
 }
 }
+
 /*
 /*
 Trims from the right until a valid non-space rune, "\t\txyz\t\t" -> "\t\txyz"
 Trims from the right until a valid non-space rune, "\t\txyz\t\t" -> "\t\txyz"
 
 
@@ -2544,6 +2540,7 @@ Returns:
 trim_right_space :: proc(s: string) -> (res: string) {
 trim_right_space :: proc(s: string) -> (res: string) {
 	return trim_right_proc(s, is_space)
 	return trim_right_proc(s, is_space)
 }
 }
+
 /*
 /*
 Trims from both sides until a valid non-space rune, "\t\txyz\t\t" -> "xyz"
 Trims from both sides until a valid non-space rune, "\t\txyz\t\t" -> "xyz"
 
 
@@ -2556,6 +2553,7 @@ Returns:
 trim_space :: proc(s: string) -> (res: string) {
 trim_space :: proc(s: string) -> (res: string) {
 	return trim_right_space(trim_left_space(s))
 	return trim_right_space(trim_left_space(s))
 }
 }
+
 /*
 /*
 Trims null runes from the left, "\x00\x00testing\x00\x00" -> "testing\x00\x00"
 Trims null runes from the left, "\x00\x00testing\x00\x00" -> "testing\x00\x00"
 
 
@@ -2568,6 +2566,7 @@ Returns:
 trim_left_null :: proc(s: string) -> (res: string) {
 trim_left_null :: proc(s: string) -> (res: string) {
 	return trim_left_proc(s, is_null)
 	return trim_left_proc(s, is_null)
 }
 }
+
 /*
 /*
 Trims null runes from the right, "\x00\x00testing\x00\x00" -> "\x00\x00testing"
 Trims null runes from the right, "\x00\x00testing\x00\x00" -> "\x00\x00testing"
 
 
@@ -2580,6 +2579,7 @@ Returns:
 trim_right_null :: proc(s: string) -> (res: string) {
 trim_right_null :: proc(s: string) -> (res: string) {
 	return trim_right_proc(s, is_null)
 	return trim_right_proc(s, is_null)
 }
 }
+
 /*
 /*
 Trims null runes from both sides, "\x00\x00testing\x00\x00" -> "testing"
 Trims null runes from both sides, "\x00\x00testing\x00\x00" -> "testing"
 
 
@@ -2591,6 +2591,7 @@ Returns:
 trim_null :: proc(s: string) -> (res: string) {
 trim_null :: proc(s: string) -> (res: string) {
 	return trim_right_null(trim_left_null(s))
 	return trim_right_null(trim_left_null(s))
 }
 }
+
 /*
 /*
 Trims a `prefix` string from the start of the `s` string and returns the trimmed string
 Trims a `prefix` string from the start of the `s` string and returns the trimmed string
 
 
@@ -2623,6 +2624,7 @@ trim_prefix :: proc(s, prefix: string) -> (res: string) {
 	}
 	}
 	return s
 	return s
 }
 }
+
 /*
 /*
 Trims a `suffix` string from the end of the `s` string and returns the trimmed string
 Trims a `suffix` string from the end of the `s` string and returns the trimmed string
 
 
@@ -2655,6 +2657,7 @@ trim_suffix :: proc(s, suffix: string) -> (res: string) {
 	}
 	}
 	return s
 	return s
 }
 }
+
 /*
 /*
 Splits the input string `s` by all possible `substrs` and returns an allocated array of strings
 Splits the input string `s` by all possible `substrs` and returns an allocated array of strings
 
 
@@ -2727,6 +2730,7 @@ split_multi :: proc(s: string, substrs: []string, allocator := context.allocator
 	assert(len(results) == n)
 	assert(len(results) == n)
 	return results[:], nil
 	return results[:], nil
 }
 }
+
 /*
 /*
 Splits the input string `s` by all possible `substrs` in an iterator fashion. The full string is returned if no match.
 Splits the input string `s` by all possible `substrs` in an iterator fashion. The full string is returned if no match.
 
 
@@ -2786,6 +2790,7 @@ split_multi_iterate :: proc(it: ^string, substrs: []string) -> (res: string, ok:
 	ok = true
 	ok = true
 	return
 	return
 }
 }
+
 /*
 /*
 Replaces invalid UTF-8 characters in the input string with a specified replacement string. Adjacent invalid bytes are only replaced once.
 Replaces invalid UTF-8 characters in the input string with a specified replacement string. Adjacent invalid bytes are only replaced once.
 
 
@@ -2846,6 +2851,7 @@ scrub :: proc(s: string, replacement: string, allocator := context.allocator) ->
 
 
 	return to_string(b), nil
 	return to_string(b), nil
 }
 }
+
 /*
 /*
 Reverses the input string `s`
 Reverses the input string `s`
 
 
@@ -2889,6 +2895,7 @@ reverse :: proc(s: string, allocator := context.allocator, loc := #caller_locati
 	}
 	}
 	return string(buf), nil
 	return string(buf), nil
 }
 }
+
 /*
 /*
 Expands the input string by replacing tab characters with spaces to align to a specified tab size
 Expands the input string by replacing tab characters with spaces to align to a specified tab size
 
 
@@ -2920,6 +2927,7 @@ Output:
 	abc1    abc2    abc3
 	abc1    abc2    abc3
 
 
 */
 */
+
 expand_tabs :: proc(s: string, tab_size: int, allocator := context.allocator) -> (res: string, err: mem.Allocator_Error) #optional_allocator_error {
 expand_tabs :: proc(s: string, tab_size: int, allocator := context.allocator) -> (res: string, err: mem.Allocator_Error) #optional_allocator_error {
 	if tab_size <= 0 {
 	if tab_size <= 0 {
 		panic("tab size must be positive")
 		panic("tab size must be positive")
@@ -2961,6 +2969,7 @@ expand_tabs :: proc(s: string, tab_size: int, allocator := context.allocator) ->
 
 
 	return to_string(b), nil
 	return to_string(b), nil
 }
 }
+
 /*
 /*
 Splits the input string `str` by the separator `sep` string and returns 3 parts. The values are slices of the original string.
 Splits the input string `str` by the separator `sep` string and returns 3 parts. The values are slices of the original string.
 
 
@@ -3011,8 +3020,10 @@ partition :: proc(str, sep: string) -> (head, match, tail: string) {
 	tail = str[i+len(sep):]
 	tail = str[i+len(sep):]
 	return
 	return
 }
 }
+
 // Alias for centre_justify
 // Alias for centre_justify
 center_justify :: centre_justify // NOTE(bill): Because Americans exist
 center_justify :: centre_justify // NOTE(bill): Because Americans exist
+
 /*
 /*
 Centers the input string within a field of specified length by adding pad string on both sides, if its length is less than the target length.
 Centers the input string within a field of specified length by adding pad string on both sides, if its length is less than the target length.
 
 
@@ -3048,6 +3059,7 @@ centre_justify :: proc(str: string, length: int, pad: string, allocator := conte
 
 
 	return to_string(b), nil
 	return to_string(b), nil
 }
 }
+
 /*
 /*
 Left-justifies the input string within a field of specified length by adding pad string on the right side, if its length is less than the target length.
 Left-justifies the input string within a field of specified length by adding pad string on the right side, if its length is less than the target length.
 
 
@@ -3082,6 +3094,7 @@ left_justify :: proc(str: string, length: int, pad: string, allocator := context
 
 
 	return to_string(b), nil
 	return to_string(b), nil
 }
 }
+
 /*
 /*
 Right-justifies the input string within a field of specified length by adding pad string on the left side, if its length is less than the target length.
 Right-justifies the input string within a field of specified length by adding pad string on the left side, if its length is less than the target length.
 
 
@@ -3116,6 +3129,7 @@ right_justify :: proc(str: string, length: int, pad: string, allocator := contex
 
 
 	return to_string(b), nil
 	return to_string(b), nil
 }
 }
+
 /*
 /*
 Writes a given pad string a specified number of times to an `io.Writer`
 Writes a given pad string a specified number of times to an `io.Writer`
 
 
@@ -3142,6 +3156,7 @@ write_pad_string :: proc(w: io.Writer, pad: string, pad_len, remains: int) {
 		p = p[width:]
 		p = p[width:]
 	}
 	}
 }
 }
+
 /*
 /*
 Splits a string into a slice of substrings at each instance of one or more consecutive white space characters, as defined by `unicode.is_space`
 Splits a string into a slice of substrings at each instance of one or more consecutive white space characters, as defined by `unicode.is_space`
 
 
@@ -3203,6 +3218,7 @@ fields :: proc(s: string, allocator := context.allocator, loc := #caller_locatio
 	}
 	}
 	return a, nil
 	return a, nil
 }
 }
+
 /*
 /*
 Splits a string into a slice of substrings at each run of unicode code points `r` satisfying the predicate `f(r)`
 Splits a string into a slice of substrings at each run of unicode code points `r` satisfying the predicate `f(r)`
 
 
@@ -3245,6 +3261,7 @@ fields_proc :: proc(s: string, f: proc(rune) -> bool, allocator := context.alloc
 
 
 	return substrings[:], nil
 	return substrings[:], nil
 }
 }
+
 /*
 /*
 Retrieves the first non-space substring from a mutable string reference and advances the reference. `s` is advanced from any space after the substring, or be an empty string if the substring was the remaining characters
 Retrieves the first non-space substring from a mutable string reference and advances the reference. `s` is advanced from any space after the substring, or be an empty string if the substring was the remaining characters
 
 
@@ -3283,6 +3300,7 @@ fields_iterator :: proc(s: ^string) -> (field: string, ok: bool) {
 	s^ = s[len(s):]
 	s^ = s[len(s):]
 	return
 	return
 }
 }
+
 /*
 /*
 Computes the Levenshtein edit distance between two strings
 Computes the Levenshtein edit distance between two strings
 
 
@@ -3460,4 +3478,4 @@ substring_to :: proc(s: string, rune_end: int) -> (sub: string, ok: bool) {
 	}
 	}
 
 
 	return internal_substring(s, -1, rune_end)
 	return internal_substring(s, -1, rune_end)
-}
+}

+ 0 - 1
core/sys/darwin/Foundation/NSApplication.odin

@@ -82,7 +82,6 @@ Application_setActivationPolicy :: proc "c" (self: ^Application, activationPolic
 // NOTE: this is technically deprecated but still actively used (Sokol, glfw, SDL, etc.)
 // NOTE: this is technically deprecated but still actively used (Sokol, glfw, SDL, etc.)
 // and has no clear alternative although `activate` is what Apple tells you to use,
 // and has no clear alternative although `activate` is what Apple tells you to use,
 // that does not work the same way.
 // that does not work the same way.
-// @(deprecated="Use NSApplication method activate instead.")
 @(objc_type=Application, objc_name="activateIgnoringOtherApps")
 @(objc_type=Application, objc_name="activateIgnoringOtherApps")
 Application_activateIgnoringOtherApps :: proc "c" (self: ^Application, ignoreOtherApps: BOOL) {
 Application_activateIgnoringOtherApps :: proc "c" (self: ^Application, ignoreOtherApps: BOOL) {
 	msgSend(nil, self, "activateIgnoringOtherApps:", ignoreOtherApps)
 	msgSend(nil, self, "activateIgnoringOtherApps:", ignoreOtherApps)

+ 0 - 8
core/sys/windows/util.odin

@@ -75,14 +75,6 @@ LANGIDFROMLCID :: #force_inline proc "contextless" (lcid: LCID) -> LANGID {
 	return LANGID(lcid)
 	return LANGID(lcid)
 }
 }
 
 
-// this one gave me trouble as it do not mask the values.
-// the _ in the name is also off comparing to the c code
-// i can't find any usage in the odin repo
-@(deprecated = "use MAKEWORD")
-MAKE_WORD :: #force_inline proc "contextless" (x, y: WORD) -> WORD {
-	return x << 8 | y
-}
-
 utf8_to_utf16 :: proc(s: string, allocator := context.temp_allocator) -> []u16 {
 utf8_to_utf16 :: proc(s: string, allocator := context.temp_allocator) -> []u16 {
 	if len(s) < 1 {
 	if len(s) < 1 {
 		return nil
 		return nil

+ 0 - 6
core/sys/windows/ws2_32.odin

@@ -242,10 +242,4 @@ foreign ws2_32 {
 	ntohl :: proc(netlong: c_ulong) -> c_ulong ---
 	ntohl :: proc(netlong: c_ulong) -> c_ulong ---
 	// [MS-Docs](https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-ntohs)
 	// [MS-Docs](https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-ntohs)
 	ntohs :: proc(netshort: c_ushort) -> c_ushort ---
 	ntohs :: proc(netshort: c_ushort) -> c_ushort ---
-	// [MS-Docs](https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-htonl)
-	@(deprecated="Use endian specific integers instead, https://odin-lang.org/docs/overview/#basic-types")
-	htonl :: proc(hostlong: c_ulong) -> c_ulong ---
-	// [MS-Docs](https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-htons)
-	@(deprecated="Use endian specific integers instead, https://odin-lang.org/docs/overview/#basic-types")
-	htons :: proc(hostshort: c_ushort) -> c_ushort ---
 }
 }