X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fprint.c;h=6f3b5058ef1851295426d119ba02a4fa5212fafd;hb=a157ed0be79751f85b8243c06102eea95af06aa3;hp=f448e519811f595c9bbaa58f06a98ba3f5af77fe;hpb=be66f39b89fd11c0abea5697a6e666447df988a8;p=sbcl.git diff --git a/src/runtime/print.c b/src/runtime/print.c index f448e51..6f3b505 100644 --- a/src/runtime/print.c +++ b/src/runtime/print.c @@ -195,12 +195,15 @@ static boolean continue_p(boolean newline) printf("More? [y] "); fflush(stdout); - fgets(buffer, sizeof(buffer), stdin); - - if (buffer[0] == 'n' || buffer[0] == 'N') - throw_to_monitor(); - else + if (fgets(buffer, sizeof(buffer), stdin)) { + if (buffer[0] == 'n' || buffer[0] == 'N') + throw_to_monitor(); + else + cur_lines = 0; + } else { + printf("\nUnable to read response, assuming y.\n"); cur_lines = 0; + } } } @@ -237,7 +240,8 @@ static void print_fixnum(lispobj obj) static void brief_otherimm(lispobj obj) { - int type, c, idx; + int type, c; + unsigned int idx; char buffer[10]; type = widetag_of(obj); @@ -288,7 +292,9 @@ static void brief_otherimm(lispobj obj) static void print_otherimm(lispobj obj) { - int type, idx; + int type; + + unsigned int idx; type = widetag_of(obj); idx = type >> 2; @@ -379,7 +385,7 @@ static void brief_struct(lispobj obj) static void print_struct(lispobj obj) { struct instance *instance = (struct instance *)native_pointer(obj); - int i; + unsigned int i; char buffer[16]; print_obj("type: ", ((struct instance *)native_pointer(obj))->slots[0]); for (i = 1; i < HeaderValue(instance->header); i++) { @@ -543,9 +549,17 @@ static void print_otherptr(lispobj obj) #ifdef COMPLEX_SINGLE_FLOAT_WIDETAG case COMPLEX_SINGLE_FLOAT_WIDETAG: NEWLINE_OR_RETURN; +#ifdef LISP_FEATURE_X86_64 + printf("%g", ((struct complex_single_float *)native_pointer(obj))->data.data[0]); +#else printf("%g", ((struct complex_single_float *)native_pointer(obj))->real); +#endif NEWLINE_OR_RETURN; +#ifdef LISP_FEATURE_X86_64 + printf("%g", ((struct complex_single_float *)native_pointer(obj))->data.data[1]); +#else printf("%g", ((struct complex_single_float *)native_pointer(obj))->imag); +#endif break; #endif