mirror of
https://github.com/c3lang/c3c.git
synced 2026-02-27 12:01:16 +00:00
First 0.7 update, removing all deprecated features.
This commit is contained in:
committed by
Christoffer Lerno
parent
cff6697818
commit
2a895ec7be
@@ -38,26 +38,20 @@ fn void CsvReader.init(&self, InStream stream, String separator = ",")
|
||||
self.stream = stream;
|
||||
self.separator = separator;
|
||||
}
|
||||
|
||||
fn CsvRow! CsvReader.read_new_row(self)
|
||||
{
|
||||
return self.read_row(allocator::heap()) @inline;
|
||||
}
|
||||
|
||||
<*
|
||||
@param [&inout] allocator
|
||||
*>
|
||||
fn CsvRow! CsvReader.read_row(self, Allocator allocator)
|
||||
{
|
||||
String row = io::readline(self.stream, allocator: allocator)!;
|
||||
String row = io::readline(allocator, self.stream)!;
|
||||
defer catch allocator::free(allocator, row);
|
||||
String[] list = row.split(self.separator, allocator: allocator);
|
||||
String[] list = row.split(allocator, self.separator);
|
||||
return { list, row, allocator };
|
||||
}
|
||||
|
||||
fn CsvRow! CsvReader.read_temp_row(self)
|
||||
fn CsvRow! CsvReader.tread_row(self)
|
||||
{
|
||||
return self.read_row(allocator::temp()) @inline;
|
||||
return self.read_row(tmem()) @inline;
|
||||
}
|
||||
|
||||
<*
|
||||
@@ -83,13 +77,13 @@ macro void! CsvReader.@each_row(self, int rows = int.max; @body(String[] row)) @
|
||||
{
|
||||
@stack_mem(512; Allocator mem)
|
||||
{
|
||||
String! s = io::readline(stream, mem);
|
||||
String! s = io::readline(mem, stream);
|
||||
if (catch err = s)
|
||||
{
|
||||
if (err == IoError.EOF) return;
|
||||
return err?;
|
||||
}
|
||||
@body(s.split(sep, allocator: mem));
|
||||
@body(s.split(mem, sep));
|
||||
};
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user