ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2032 from rasa-silva/fix_strings_justify

Browse Source 
Fix `strings.*_justify` to take into account the string length
This commit is contained in:
gingerBill
2022-09-07 10:49:09 +01:00
committed by GitHub
parent 70b0ade8c3 2239e43faf
commit 82d5f48fa7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/strings/strings.odin
+5 -5
View File
@@ -1686,7 +1686,7 @@ centre_justify :: proc(str: string, length: int, pad: string, allocator := conte
return clone(str, allocator) return clone(str, allocator)
} }
remains := length-1 remains := length-n
pad_len := rune_count(pad) pad_len := rune_count(pad)
b: Builder b: Builder
@@ -1702,14 +1702,14 @@ centre_justify :: proc(str: string, length: int, pad: string, allocator := conte
return to_string(b) return to_string(b)
} }
// left_justify returns a string with a pad string at left side if the str's rune length is smaller than length // left_justify returns a string with a pad string at right side if the str's rune length is smaller than length
left_justify :: proc(str: string, length: int, pad: string, allocator := context.allocator) -> string { left_justify :: proc(str: string, length: int, pad: string, allocator := context.allocator) -> string {
n := rune_count(str) n := rune_count(str)
if n >= length || pad == "" { if n >= length || pad == "" {
return clone(str, allocator) return clone(str, allocator)
} }
remains := length-1 remains := length-n
pad_len := rune_count(pad) pad_len := rune_count(pad)
b: Builder b: Builder
@@ -1724,14 +1724,14 @@ left_justify :: proc(str: string, length: int, pad: string, allocator := context
return to_string(b) return to_string(b)
} }
// right_justify returns a string with a pad string at right side if the str's rune length is smaller than length // right_justify returns a string with a pad string at left side if the str's rune length is smaller than length
right_justify :: proc(str: string, length: int, pad: string, allocator := context.allocator) -> string { right_justify :: proc(str: string, length: int, pad: string, allocator := context.allocator) -> string {
n := rune_count(str) n := rune_count(str)
if n >= length || pad == "" { if n >= length || pad == "" {
return clone(str, allocator) return clone(str, allocator)
} }
remains := length-1 remains := length-n
pad_len := rune_count(pad) pad_len := rune_count(pad)
b: Builder b: Builder