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

Minor sanity features for bit_set

Browse Source
This commit is contained in:
gingerBill
2018-08-14 19:22:48 +01:00
parent c7d6467cfa
commit 71f94bff76
5 changed files with 68 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/fmt/fmt.odin
+5 -4
View File
@@ -471,10 +471,11 @@ _fmt_int :: proc(fi: ^Fmt_Info, u: u64, base: int, is_signed: bool, bit_size: in
buf: [256]byte;
start := 0;
flags: strconv.Int_Flag;
if fi.hash && !fi.zero do flags |= strconv.Int_Flag.Prefix;
if fi.plus do flags |= strconv.Int_Flag.Plus;
if fi.space do flags |= strconv.Int_Flag.Space;
using strconv.Int_Flag;
flags: strconv.Int_Flags;
if fi.hash && !fi.zero do flags |= {Prefix};
if fi.plus do flags |= {Plus};
if fi.space do flags |= {Space};
s := strconv.append_bits(buf[start:], u, base, is_signed, bit_size, digits, flags);
if fi.hash && fi.zero {
core/strconv/strconv.odin
+8 -7
View File
@@ -3,10 +3,11 @@ package strconv
using import "core:decimal"
Int_Flag :: enum {
Prefix = 1<<0,
Plus = 1<<1,
Space = 1<<2,
Prefix,
Plus,
Space,
}
Int_Flags :: bit_set[Int_Flag];
parse_bool :: proc(s: string) -> (result: bool = false, ok: bool) {
@@ -458,7 +459,7 @@ is_integer_negative :: proc(u: u64, is_signed: bool, bit_size: int) -> (unsigned
return u, neg;
}
append_bits :: proc(buf: []byte, u: u64, base: int, is_signed: bool, bit_size: int, digits: string, flags: Int_Flag) -> string {
append_bits :: proc(buf: []byte, u: u64, base: int, is_signed: bool, bit_size: int, digits: string, flags: Int_Flags) -> string {
if base < 2 || base > MAX_BASE {
panic("strconv: illegal base passed to append_bits");
}
@@ -474,7 +475,7 @@ append_bits :: proc(buf: []byte, u: u64, base: int, is_signed: bool, bit_size: i
}
i-=1; a[i] = digits[u % b];
if flags&Int_Flag.Prefix != nil {
if Int_Flag.Prefix in flags {
ok := true;
switch base {
case 2: i-=1; a[i] = 'b';
@@ -492,9 +493,9 @@ append_bits :: proc(buf: []byte, u: u64, base: int, is_signed: bool, bit_size: i
switch {
case neg:
i-=1; a[i] = '-';
case flags&Int_Flag.Plus != nil:
case Int_Flag.Plus in flags:
i-=1; a[i] = '+';
case flags&Int_Flag.Space != nil:
case Int_Flag.Space in flags:
i-=1; a[i] = ' ';
}