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

Complete reworking of the REPL

Browse source 
which is good in itself, but not what I was meant to be working on.
This commit is contained in:
Simon Brooke 2018-12-30 17:56:15 +00:00
parent 47f4b4c7f7
commit 02fe5669d8
43 changed files with 415 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

105
src/arith/integer.c
View file

@ -68,7 +68,7 @@ long double numeric_value( struct cons_pointer pointer ) {
*/
struct cons_pointer make_integer( int64_t value, struct cons_pointer more ) {
struct cons_pointer result = NIL;
debug_print(L"Entering make_integer\n", DEBUG_ARITH);
debug_print( L"Entering make_integer\n", DEBUG_ARITH );
if ( integerp( more ) || nilp( more ) ) {
result = allocate_cell( INTEGERTAG );
@ -78,7 +78,7 @@ struct cons_pointer make_integer( int64_t value, struct cons_pointer more ) {
}
debug_print(L"make_integer: returning\n", DEBUG_ARITH);
debug_print( L"make_integer: returning\n", DEBUG_ARITH );
debug_dump_object( result, DEBUG_ARITH );
return result;
}
@ -89,18 +89,18 @@ struct cons_pointer make_integer( int64_t value, struct cons_pointer more ) {
*/
struct cons_pointer add_integers( struct cons_pointer a,
struct cons_pointer b ) {
debug_print(L"Entering add_integers\n", DEBUG_ARITH);
debug_print( L"Entering add_integers\n", DEBUG_ARITH );
struct cons_pointer result = NIL;
int64_t carry = 0;
if ( integerp( a ) && integerp( b ) ) {
while ( !nilp( a ) || !nilp( b ) || carry != 0 ) {
debug_print(L"add_integers: ", DEBUG_ARITH);
debug_print_object(a, DEBUG_ARITH);
debug_print(L" x ", DEBUG_ARITH);
debug_print_object(b, DEBUG_ARITH);
debug_printf(DEBUG_ARITH, L"; carry = %ld\n", carry);
while ( !nilp( a ) || !nilp( b ) || carry != 0 ) {
debug_print( L"add_integers: ", DEBUG_ARITH );
debug_print_object( a, DEBUG_ARITH );
debug_print( L" x ", DEBUG_ARITH );
debug_print_object( b, DEBUG_ARITH );
debug_printf( DEBUG_ARITH, L"; carry = %ld\n", carry );
int64_t av =
integerp( a ) ? pointer2cell( a ).payload.integer.value : 0;
@ -110,7 +110,9 @@ struct cons_pointer add_integers( struct cons_pointer a,
__int128_t rv = av + bv + carry;
if ( rv > LONG_MAX || rv < LONG_MIN ) {
debug_printf( DEBUG_ARITH, L"add_integers: 64 bit overflow; setting carry to %ld\n", carry);
debug_printf( DEBUG_ARITH,
L"add_integers: 64 bit overflow; setting carry to %ld\n",
carry );
carry = llabs( rv / LONG_MAX );
rv = rv % LONG_MAX;
} else {
@ -122,9 +124,9 @@ struct cons_pointer add_integers( struct cons_pointer a,
b = pointer2cell( b ).payload.integer.more;
}
}
debug_print(L"add_integers returning: ", DEBUG_ARITH);
debug_print_object(result, DEBUG_ARITH);
debug_println(DEBUG_ARITH);
debug_print( L"add_integers returning: ", DEBUG_ARITH );
debug_print_object( result, DEBUG_ARITH );
debug_println( DEBUG_ARITH );
return result;
}
@ -139,11 +141,11 @@ struct cons_pointer multiply_integers( struct cons_pointer a,
int64_t carry = 0;
if ( integerp( a ) && integerp( b ) ) {
debug_print(L"multiply_integers: ", DEBUG_ARITH);
debug_print_object(a, DEBUG_ARITH);
debug_print(L" x ", DEBUG_ARITH);
debug_print_object(b, DEBUG_ARITH);
debug_println(DEBUG_ARITH);
debug_print( L"multiply_integers: ", DEBUG_ARITH );
debug_print_object( a, DEBUG_ARITH );
debug_print( L" x ", DEBUG_ARITH );
debug_print_object( b, DEBUG_ARITH );
debug_println( DEBUG_ARITH );
while ( !nilp( a ) || !nilp( b ) || carry != 0 ) {
int64_t av =
@ -154,7 +156,9 @@ struct cons_pointer multiply_integers( struct cons_pointer a,
__int128_t rv = ( av * bv ) + carry;
if ( rv > LONG_MAX || rv < LONG_MIN ) {
debug_printf( DEBUG_ARITH, L"multiply_integers: 64 bit overflow; setting carry to %ld\n", carry);
debug_printf( DEBUG_ARITH,
L"multiply_integers: 64 bit overflow; setting carry to %ld\n",
carry );
carry = llabs( rv / LONG_MAX );
rv = rv % LONG_MAX;
} else {
@ -166,9 +170,9 @@ struct cons_pointer multiply_integers( struct cons_pointer a,
b = pointer2cell( b ).payload.integer.more;
}
}
debug_print(L"multiply_integers returning: ", DEBUG_ARITH);
debug_print_object(result, DEBUG_ARITH);
debug_println(DEBUG_ARITH);
debug_print( L"multiply_integers returning: ", DEBUG_ARITH );
debug_print_object( result, DEBUG_ARITH );
debug_println( DEBUG_ARITH );
return result;
}
@ -192,36 +196,43 @@ struct cons_pointer integer_to_string( struct cons_pointer int_pointer,
bool is_negative = accumulator < 0;
accumulator = llabs( accumulator );
if (accumulator == 0) {
result = c_string_to_lisp_string( L"0");
} else {
while ( accumulator > 0 ) {
debug_printf(DEBUG_ARITH, L"integer_to_string: accumulator is %ld\n:",
accumulator);
do {
debug_printf(DEBUG_ARITH, L"integer_to_string: digit is %ld, hexadecimal is %lc\n:",
accumulator % base, hex_digits[accumulator % base]);
wint_t digit = (wint_t)hex_digits[accumulator % base];
if ( accumulator == 0 ) {
result = c_string_to_lisp_string( L"0" );
} else {
while ( accumulator > 0 ) {
debug_printf( DEBUG_ARITH,
L"integer_to_string: accumulator is %ld\n:",
accumulator );
do {
debug_printf( DEBUG_ARITH,
L"integer_to_string: digit is %ld, hexadecimal is %lc\n:",
accumulator % base,
hex_digits[accumulator % base] );
wint_t digit = ( wint_t ) hex_digits[accumulator % base];
result = make_string( (wint_t)hex_digits[accumulator % base], result );
accumulator = accumulator / base;
} while ( accumulator > base );
result =
make_string( ( wint_t ) hex_digits[accumulator % base],
result );
accumulator = accumulator / base;
} while ( accumulator > base );
if ( integerp( integer.payload.integer.more ) ) {
integer = pointer2cell( integer.payload.integer.more );
int64_t i = integer.payload.integer.value;
if ( integerp( integer.payload.integer.more ) ) {
integer = pointer2cell( integer.payload.integer.more );
int64_t i = integer.payload.integer.value;
/* TODO: I don't believe it's as simple as this! */
accumulator += ( base * ( i % base ) );
result = make_string( (wint_t)hex_digits[accumulator % base], result );
accumulator += ( base * ( i / base ) );
/* TODO: I don't believe it's as simple as this! */
accumulator += ( base * ( i % base ) );
result =
make_string( ( wint_t ) hex_digits[accumulator % base],
result );
accumulator += ( base * ( i / base ) );
}
}
if ( is_negative ) {
result = make_string( L'-', result );
}
}
if ( is_negative ) {
result = make_string( L'-', result );
}
}
return result;
}