simon/post-scarcity
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

#time: Fixed

Browse source 
Major (unexpected) problem was collision between the name of my header file and that of the system header file!
This commit is contained in:
Simon Brooke 2019-02-07 15:32:06 +00:00
parent 0a9d54f97d
commit af814d8f03
5 changed files with 44 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/io/io.c
View file

@ -378,9 +378,8 @@ void collect_meta( struct cons_pointer stream, char *url ) {
meta =
add_meta_integer( meta, L"size",
( intmax_t ) statbuf.st_size );
/*
meta = add_meta_time( meta, L"modified", &statbuf.st_mtime );
*/
}
break;
case CFTYPE_CURL:

29
src/io/print.c
View file

@ -24,7 +24,7 @@
#include "map.h"
#include "stack.h"
#include "print.h"
#include "time.h"
#include "psse_time.h"
#include "vectorspace.h"
/**
@ -140,6 +140,27 @@ void print_vso( URL_FILE * output, struct cons_pointer pointer) {
}
}
/**
* stolen from https://stackoverflow.com/questions/11656241/how-to-print-uint128-t-number-using-gcc
*/
void print_128bit( URL_FILE * output, __int128_t n ) {
if ( n == 0 ) {
fwprintf( stderr, L"0" );
} else {
char str[40] = { 0 }; // log10(1 << 128) + '\0'
char *s = str + sizeof( str ) - 1; // start at the end
while ( n != 0 ) {
if ( s == str )
return; // never happens
*--s = "0123456789"[n % 10]; // save last digit
n /= 10; // drop it
}
url_fwprintf( output, L"%s", s );
}
}
/**
* Print the cons-space object indicated by `pointer` to the stream indicated
* by `output`.
@ -257,7 +278,11 @@ struct cons_pointer print( URL_FILE * output, struct cons_pointer pointer ) {
url_fputwc( L'>', output);
break;
case TIMETV:
print_string(output, time_to_string( pointer));
url_fwprintf( output, L"<Time: " );
print_string( output, time_to_string( pointer));
url_fputws( L"; ", output);
print_128bit( output, pointer2cell(pointer).payload.time.value);
url_fputwc( L'>', output);
break;
case TRUETV:
url_fwprintf( output, L"t" );