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

Change var decl syntax

Browse Source 
`var x int;` from `x: int;`
This commit is contained in:
Ginger Bill
2016-12-18 22:32:18 +00:00
parent 4c10fbdcd4
commit 77e219d442
12 changed files with 342 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/fmt.odin
+60 -60
View File
@@ -5,23 +5,23 @@
const PRINT_BUF_SIZE = 1<<12;
proc fprint(f ^os.File, args ..any) -> int {
data: [PRINT_BUF_SIZE]byte;
buf := data[:0];
var data [PRINT_BUF_SIZE]byte;
var buf = data[:0];
bprint(^buf, ..args);
os.write(f, buf);
return buf.count;
}
proc fprintln(f ^os.File, args ..any) -> int {
data: [PRINT_BUF_SIZE]byte;
buf := data[:0];
var data [PRINT_BUF_SIZE]byte;
var buf = data[:0];
bprintln(^buf, ..args);
os.write(f, buf);
return buf.count;
}
proc fprintf(f ^os.File, fmt string, args ..any) -> int {
data: [PRINT_BUF_SIZE]byte;
buf := data[:0];
var data [PRINT_BUF_SIZE]byte;
var buf = data[:0];
bprintf(^buf, fmt, ..args);
os.write(f, buf);
return buf.count;
@@ -41,8 +41,8 @@ proc printf(fmt string, args ..any) -> int {
proc fprint_type(f ^os.File, info ^Type_Info) {
data: [PRINT_BUF_SIZE]byte;
buf := data[:0];
var data [PRINT_BUF_SIZE]byte;
var buf = data[:0];
bprint_type(^buf, info);
os.write(f, buf);
}
@@ -51,7 +51,7 @@ proc fprint_type(f ^os.File, info ^Type_Info) {
proc print_byte_buffer(buf ^[]byte, b []byte) {
if buf.count < buf.capacity {
n := min(buf.capacity-buf.count, b.count);
var n = min(buf.capacity-buf.count, b.count);
if n > 0 {
mem.copy(buf.data + buf.count, b.data, n);
buf.count += n;
@@ -65,21 +65,21 @@ proc bprint_string(buf ^[]byte, s string) {
proc byte_reverse(b []byte) {
n := b.count;
for i := 0; i < n/2; i++ {
var n = b.count;
for var i = 0; i < n/2; i++ {
b[i], b[n-1-i] = b[n-1-i], b[i];
}
}
proc bprint_rune(buf ^[]byte, r rune) {
b, n := utf8.encode_rune(r);
var b, n = utf8.encode_rune(r);
bprint_string(buf, b[:n] as string);
}
proc bprint_space(buf ^[]byte) { bprint_rune(buf, ' '); }
proc bprint_nl (buf ^[]byte) { bprint_rune(buf, '\n'); }
__NUM_TO_CHAR_TABLE := "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@$";
var __NUM_TO_CHAR_TABLE = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@$";
proc bprint_bool(buffer ^[]byte, b bool) {
if b {
@@ -98,9 +98,9 @@ proc bprint_f16 (buffer ^[]byte, f f32) #inline { print__f64(buffer, f as f64,
proc bprint_f32 (buffer ^[]byte, f f32) #inline { print__f64(buffer, f as f64, 7); }
proc bprint_f64 (buffer ^[]byte, f f64) #inline { print__f64(buffer, f as f64, 16); }
proc bprint_u64(buffer ^[]byte, value u64) {
i := value;
buf: [20]byte;
len := 0;
var i = value;
var buf [20]byte;
var len = 0;
if i == 0 {
buf[len] = '0';
len++;
@@ -115,7 +115,7 @@ proc bprint_u64(buffer ^[]byte, value u64) {
}
proc bprint_i64(buffer ^[]byte, value i64) {
// TODO(bill): Cleanup printing
i := value;
var i = value;
if i < 0 {
i = -i;
bprint_rune(buffer, '-');
@@ -125,14 +125,14 @@ proc bprint_i64(buffer ^[]byte, value i64) {
/*
proc bprint_u128(buffer ^[]byte, value u128) {
a := value transmute [2]u64;
var a = value transmute [2]u64;
if a[1] != 0 {
bprint_u64(buffer, a[1]);
}
bprint_u64(buffer, a[0]);
}
proc bprint_i128(buffer ^[]byte, value i128) {
i := value;
var i = value;
if i < 0 {
i = -i;
bprint_rune(buffer, '-');
@@ -143,7 +143,7 @@ proc bprint_i128(buffer ^[]byte, value i128) {
proc print__f64(buffer ^[]byte, value f64, decimal_places int) {
f := value;
var f = value;
if f == 0 {
bprint_rune(buffer, '0');
return;
@@ -153,13 +153,13 @@ proc print__f64(buffer ^[]byte, value f64, decimal_places int) {
f = -f;
}
i := f as u64;
var i = f as u64;
bprint_u64(buffer, i);
f -= i as f64;
bprint_rune(buffer, '.');
mult: f64 = 10.0;
var mult f64 = 10.0;
for ; decimal_places >= 0; decimal_places-- {
i = (f * mult) as u64;
bprint_u64(buffer, i as u64);
@@ -212,7 +212,7 @@ proc bprint_type(buf ^[]byte, ti ^Type_Info) {
if info.params == nil {
bprint_string(buf, "()");
} else {
count := (info.params as ^Tuple).fields.count;
var count = (info.params as ^Tuple).fields.count;
if count == 1 { bprint_string(buf, "("); }
bprint_type(buf, info.params);
if count == 1 { bprint_string(buf, ")"); }
@@ -222,12 +222,12 @@ proc bprint_type(buf ^[]byte, ti ^Type_Info) {
bprint_type(buf, info.results);
}
case Tuple:
count := info.fields.count;
var count = info.fields.count;
if count != 1 { bprint_string(buf, "("); }
for i := 0; i < count; i++ {
for var i = 0; i < count; i++ {
if i > 0 { bprint_string(buf, ", "); }
f := info.fields[i];
var f = info.fields[i];
if f.name.count > 0 {
bprint_string(buf, f.name);
@@ -257,7 +257,7 @@ proc bprint_type(buf ^[]byte, ti ^Type_Info) {
if info.packed { bprint_string(buf, "#packed "); }
if info.ordered { bprint_string(buf, "#ordered "); }
bprint_string(buf, "{");
for i := 0; i < info.fields.count; i++ {
for var i = 0; i < info.fields.count; i++ {
if i > 0 {
bprint_string(buf, ", ");
}
@@ -269,7 +269,7 @@ proc bprint_type(buf ^[]byte, ti ^Type_Info) {
case Union:
bprint_string(buf, "union {");
for i := 0; i < info.fields.count; i++ {
for var i = 0; i < info.fields.count; i++ {
if i > 0 {
bprint_string(buf, ", ");
}
@@ -281,7 +281,7 @@ proc bprint_type(buf ^[]byte, ti ^Type_Info) {
case Raw_Union:
bprint_string(buf, "raw_union {");
for i := 0; i < info.fields.count; i++ {
for var i = 0; i < info.fields.count; i++ {
if i > 0 {
bprint_string(buf, ", ");
}
@@ -300,7 +300,7 @@ proc bprint_type(buf ^[]byte, ti ^Type_Info) {
proc make_any(type_info ^Type_Info, data rawptr) -> any {
a: any;
var a any;
a.type_info = type_info;
a.data = data;
return a;
@@ -320,20 +320,20 @@ proc bprint_any(buf ^[]byte, arg any) {
using Type_Info;
match type info : arg.type_info {
case Named:
a := make_any(info.base, arg.data);
var a = make_any(info.base, arg.data);
match type b : info.base {
case Struct:
bprint_string(buf, info.name);
bprint_string(buf, "{");
for i := 0; i < b.fields.count; i++ {
f := b.fields[i];
for var i = 0; i < b.fields.count; i++ {
var f = b.fields[i];
if i > 0 {
bprint_string(buf, ", ");
}
bprint_string(buf, f.name);
// bprint_any(buf, f.offset);
bprint_string(buf, " = ");
data := arg.data as ^byte + f.offset;
var data = arg.data as ^byte + f.offset;
bprint_any(buf, make_any(f.type_info, data));
}
bprint_string(buf, "}");
@@ -384,8 +384,8 @@ proc bprint_any(buf ^[]byte, arg any) {
}
case Maybe:
size := mem.size_of_type_info(info.elem);
data := slice_ptr(arg.data as ^byte, size+1);
var size = mem.size_of_type_info(info.elem);
var data = slice_ptr(arg.data as ^byte, size+1);
if data[size] != 0 {
bprint_any(buf, make_any(info.elem, arg.data));
} else {
@@ -393,7 +393,7 @@ proc bprint_any(buf ^[]byte, arg any) {
}
case Enum:
value: i64 = 0;
var value i64 = 0;
match type i : make_any(info.base, arg.data) {
case i8: value = i as i64;
@@ -411,26 +411,26 @@ proc bprint_any(buf ^[]byte, arg any) {
bprintf(buf, "[%]%{", info.count, info.elem);
defer bprint_string(buf, "}");
for i := 0; i < info.count; i++ {
for var i = 0; i < info.count; i++ {
if i > 0 {
bprint_string(buf, ", ");
}
data := arg.data as ^byte + i*info.elem_size;
var data = arg.data as ^byte + i*info.elem_size;
bprint_any(buf, make_any(info.elem, data));
}
case Slice:
slice := arg.data as ^[]byte;
var slice = arg.data as ^[]byte;
bprintf(buf, "[]%{", info.elem);
defer bprint_string(buf, "}");
for i := 0; i < slice.count; i++ {
for var i = 0; i < slice.count; i++ {
if i > 0 {
bprint_string(buf, ", ");
}
data := slice.data + i*info.elem_size;
var data = slice.data + i*info.elem_size;
bprint_any(buf, make_any(info.elem, data));
}
@@ -452,12 +452,12 @@ proc bprint_any(buf ^[]byte, arg any) {
return;
}
for i := 0; i < info.count; i++ {
for var i = 0; i < info.count; i++ {
if i > 0 {
bprint_string(buf, ", ");
}
data := arg.data as ^byte + i*info.elem_size;
var data = arg.data as ^byte + i*info.elem_size;
bprint_any(buf, make_any(info.elem, data));
}
@@ -466,14 +466,14 @@ proc bprint_any(buf ^[]byte, arg any) {
bprintf(buf, "%{", arg.type_info);
defer bprint_string(buf, "}");
for i := 0; i < info.fields.count; i++ {
for var i = 0; i < info.fields.count; i++ {
if i > 0 {
bprint_string(buf, ", ");
}
bprint_string(buf, info.fields[i].name);
bprint_string(buf, " = ");
data := arg.data as ^byte + info.fields[i].offset;
ti := info.fields[i].type_info;
var data = arg.data as ^byte + info.fields[i].offset;
var ti = info.fields[i].type_info;
bprint_any(buf, make_any(ti, data));
}
@@ -495,10 +495,10 @@ proc bprintf(buf ^[]byte, fmt string, args ..any) -> int {
}
proc parse_int(s string, offset int) -> (int, int) {
result := 0;
var result = 0;
for ; offset < s.count; offset++ {
c := s[offset] as rune;
var c = s[offset] as rune;
if !is_digit(c) {
break;
}
@@ -510,12 +510,12 @@ proc bprintf(buf ^[]byte, fmt string, args ..any) -> int {
return result, offset;
}
prev := 0;
implicit_index := 0;
var prev = 0;
var implicit_index = 0;
for i := 0; i < fmt.count; i++ {
r := fmt[i] as rune;
index := implicit_index;
for var i = 0; i < fmt.count; i++ {
var r = fmt[i] as rune;
var index = implicit_index;
if r != '%' {
continue;
@@ -524,7 +524,7 @@ proc bprintf(buf ^[]byte, fmt string, args ..any) -> int {
bprint_string(buf, fmt[prev:i]);
i++; // Skip %
if i < fmt.count {
next := fmt[i] as rune;
var next = fmt[i] as rune;
if next == '%' {
bprint_string(buf, "%");
@@ -569,10 +569,10 @@ proc bprint(buf ^[]byte, args ..any) -> int {
}
prev_string := false;
for i := 0; i < args.count; i++ {
arg := args[i];
is_string := arg.data != nil && is_type_string(arg.type_info);
var prev_string = false;
for var i = 0; i < args.count; i++ {
var arg = args[i];
var is_string = arg.data != nil && is_type_string(arg.type_info);
if i > 0 && !is_string && !prev_string {
bprint_space(buf);
}
@@ -583,7 +583,7 @@ proc bprint(buf ^[]byte, args ..any) -> int {
}
proc bprintln(buf ^[]byte, args ..any) -> int {
for i := 0; i < args.count; i++ {
for var i = 0; i < args.count; i++ {
if i > 0 {
append(buf, ' ');
}