Ran a 'make format', because !'m close to being able to merge this feature.
This commit is contained in:
parent
5e64a33965
commit
80049f2272
52 changed files with 936 additions and 843 deletions
|
|
@ -83,8 +83,7 @@ struct pso_pointer print_string_like_thing( struct pso_pointer p,
|
|||
if ( keywordp( p ) || stringp( p ) || symbolp( p ) ) {
|
||||
for ( struct pso_pointer cursor = p; !c_nilp( cursor );
|
||||
cursor = pointer_to_object( cursor )->payload.string.cdr ) {
|
||||
wchar_t wc =
|
||||
pointer_to_object( cursor )->payload.string.character;
|
||||
wchar_t wc = pointer_to_object( cursor )->payload.string.character;
|
||||
|
||||
write_char( wc, output, escape );
|
||||
}
|
||||
|
|
@ -189,14 +188,15 @@ struct pso_pointer in_write( struct pso_pointer p, URL_FILE *output,
|
|||
} else {
|
||||
url_fputws( L"<broken exception :-( >", output );
|
||||
}
|
||||
} break;
|
||||
case FUNCTIONTV: {
|
||||
struct pso2 *function = pointer_to_object(p);
|
||||
url_fputws(L"<function: ", output);
|
||||
in_write(function->payload.function.meta, output, escape,
|
||||
indent);
|
||||
write_char( L'>', output, escape );
|
||||
} break;
|
||||
}
|
||||
break;
|
||||
case FUNCTIONTV:{
|
||||
struct pso2 *function = pointer_to_object( p );
|
||||
url_fputws( L"<function: ", output );
|
||||
in_write( function->payload.function.meta, output, escape,
|
||||
indent );
|
||||
write_char( L'>', output, escape );
|
||||
} break;
|
||||
case INTEGERTV:
|
||||
url_fwprintf( output, L"%d",
|
||||
( int64_t ) ( object->payload.integer.value ) );
|
||||
|
|
@ -217,13 +217,13 @@ struct pso_pointer in_write( struct pso_pointer p, URL_FILE *output,
|
|||
indent );
|
||||
write_char( L'>', output, escape );
|
||||
break;
|
||||
case SPECIALTV: {
|
||||
struct pso2 *function = pointer_to_object(p);
|
||||
url_fputws(L"<special form: ", output);
|
||||
in_write(function->payload.function.meta, output, escape,
|
||||
indent);
|
||||
write_char( L'>', output, escape );
|
||||
} break;
|
||||
case SPECIALTV:{
|
||||
struct pso2 *function = pointer_to_object( p );
|
||||
url_fputws( L"<special form: ", output );
|
||||
in_write( function->payload.function.meta, output, escape,
|
||||
indent );
|
||||
write_char( L'>', output, escape );
|
||||
} break;
|
||||
case TRUETV:
|
||||
write_char( L't', output, escape );
|
||||
break;
|
||||
|
|
@ -281,15 +281,19 @@ struct pso_pointer write( struct pso_pointer frame_pointer ) {
|
|||
return result;
|
||||
}
|
||||
|
||||
struct pso_pointer c_write(struct pso_pointer frame_pointer,
|
||||
struct pso_pointer object, struct pso_pointer stream,
|
||||
bool escape, bool nl_before, bool nl_after) {
|
||||
struct pso_pointer next_pointer =
|
||||
push_local(frame_pointer, make_frame(5, frame_pointer, object, stream, escape ? t : nil,
|
||||
nl_before ? t : nil, nl_after ? t : nil));
|
||||
struct pso_pointer result = push_local(frame_pointer, write(next_pointer));
|
||||
struct pso_pointer c_write( struct pso_pointer frame_pointer,
|
||||
struct pso_pointer object,
|
||||
struct pso_pointer stream, bool escape,
|
||||
bool nl_before, bool nl_after ) {
|
||||
struct pso_pointer next_pointer =
|
||||
push_local( frame_pointer,
|
||||
make_frame( 5, frame_pointer, object, stream,
|
||||
escape ? t : nil,
|
||||
nl_before ? t : nil, nl_after ? t : nil ) );
|
||||
struct pso_pointer result =
|
||||
push_local( frame_pointer, write( next_pointer ) );
|
||||
|
||||
return result;
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -333,4 +337,3 @@ struct pso_pointer princ( struct pso_pointer frame_pointer ) {
|
|||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue