shishantbiswas/c3c
1
1
Fork 0
mirror of https://github.com/c3lang/c3c.git synced 2026-02-27 12:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed broken code. Update formatter for precision. Fix of panic.

Browse Source
This commit is contained in:
Christoffer Lerno
2023-09-05 19:51:40 +02:00
parent 69418ba44d
commit e3412da033
5 changed files with 23 additions and 1354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/std/core/builtin.c3
View File

@@ -92,7 +92,7 @@ struct CallstackElement
fn void default_panic(String message, String file, String function, uint line)
{
CallstackElement* stack = $$stacktrace();
$if $defined(io::stderr) && $defined(File.printf):
$if $defined(io::stderr) && $defined(Stream.printf):
if (stack) stack = stack.prev;
if (stack)
{

45
lib/std/io/formatter.c3
View File

@@ -121,8 +121,14 @@ fn usz! Formatter.out_str(&self, any arg) @private
unreachable();
case SIGNED_INT:
case UNSIGNED_INT:
PrintFlags flags = self.flags;
defer self.flags = flags;
self.flags = {};
return self.ntoa_any(arg, 10);
case FLOAT:
PrintFlags flags = self.flags;
defer self.flags = flags;
self.flags = {};
return self.ftoa(float_from_any(arg)!!);
case BOOL:
return self.out_substr(*(bool*)arg.ptr ? "true" : "false");
@@ -163,9 +169,15 @@ fn usz! Formatter.out_str(&self, any arg) @private
}
return self.out_str(any { arg.ptr, arg.type.inner });
case POINTER:
PrintFlags flags = self.flags;
self.flags = {};
defer self.flags = flags;
return self.ntoa_any(arg, 16);
case ARRAY:
// this is SomeType[*] so grab the "SomeType"
PrintFlags flags = self.flags;
defer self.flags = flags;
self.flags = {};
typeid inner = arg.type.inner;
usz size = inner.sizeof;
usz alen = arg.type.len;
@@ -181,6 +193,9 @@ fn usz! Formatter.out_str(&self, any arg) @private
len += self.out(']')!;
return len;
case VECTOR:
PrintFlags flags = self.flags;
defer self.flags = flags;
self.flags = {};
// this is SomeType[*] so grab the "SomeType"
typeid inner = arg.type.inner;
usz size = inner.sizeof;
@@ -204,6 +219,9 @@ fn usz! Formatter.out_str(&self, any arg) @private
return self.out_substr(*(String*)arg);
}
if (inner == void.typeid) inner = char.typeid;
PrintFlags flags = self.flags;
defer self.flags = flags;
self.flags = {};
usz size = inner.sizeof;
// Pretend this is a String
String* temp = (void*)arg.ptr;
@@ -347,38 +365,17 @@ fn usz! Formatter.vprintf(&self, String format, any[] anys)
self.out_char(current)!;
continue;
case 's':
PrintFlags flags = self.flags;
uint width = self.width;
String str;
if (flags.precision)
{
switch (s = current)
{
case String:
if (s.len > self.prec)
{
str = (*s)[:self.prec];
current = &str;
}
}
}
defer {
self.flags = flags;
self.width = width;
}
self.flags = {};
self.width = 0;
if (flags.left)
if (self.flags.left)
{
usz len = self.out_str(current)!;
self.pad(' ', width, len)!;
self.pad(' ', self.width, len)!;
continue;
}
OutputFn out_fn = self.out_fn;
self.out_fn = (OutputFn)&out_null_fn;
usz len = self.out_str(current)!;
self.out_fn = out_fn;
self.pad(' ', width, len)!;
self.pad(' ', self.width, len)!;
self.out_str(current)!;
continue;
case 'p':