conservatory
/
elk
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Display #<foo> instead of #[foo], to mimic Guile's output. 

git-svn-id: svn://svn.zoy.org/elk/trunk@176 55e467fa-43c5-0310-a8a2-de718669efc6
This commit is contained in:
sam 2003-09-22 22:47:03 +00:00
parent d2b7366679
commit 2383e0247c
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/print.c
View File

@ -286,10 +286,13 @@ void Print_Object (Object x, Object port, register int raw, register int depth,
Printf (port, "#%c", FIXNUM(x) ? 't' : 'f'); Printf (port, "#%c", FIXNUM(x) ? 't' : 'f');
break; break;
case T_Unbound: case T_Unbound:
Printf (port, "#[unbound]"); Printf (port, "#<unbound>");
break;
case T_Unspecified:
Printf (port, "#<unspecified>");
break; break;
case T_Special: case T_Special:
Printf (port, "#[special]"); Printf (port, "#<special>");
break; break;
case T_Character: { case T_Character: {
int c = CHAR(x); int c = CHAR(x);
@ -306,7 +309,7 @@ void Print_Object (Object x, Object port, register int raw, register int depth,
Pr_List (port, x, raw, depth, length); Pr_List (port, x, raw, depth, length);
break; break;
case T_Environment: case T_Environment:
Printf (port, "#[environment %lu]", POINTER(x)); Printf (port, "#<environment %lu>", POINTER(x));
break; break;
case T_String: case T_String:
Pr_String (port, x, raw); Pr_String (port, x, raw);
@ -315,22 +318,22 @@ void Print_Object (Object x, Object port, register int raw, register int depth,
Pr_Vector (port, x, raw, depth, length); Pr_Vector (port, x, raw, depth, length);
break; break;
case T_Primitive: case T_Primitive:
Printf (port, "#[primitive %s]", PRIM(x)->name); Printf (port, "#<primitive %s>", PRIM(x)->name);
break; break;
case T_Compound: case T_Compound:
if (Nullp (COMPOUND(x)->name)) { if (Nullp (COMPOUND(x)->name)) {
Printf (port, "#[compound %lu]", POINTER(x)); Printf (port, "#<compound %lu>", POINTER(x));
} else { } else {
Printf (port, "#[compound "); Printf (port, "#<compound ");
Print_Object (COMPOUND(x)->name, port, raw, depth, length); Print_Object (COMPOUND(x)->name, port, raw, depth, length);
Print_Char (port, ']'); Print_Char (port, '>');
} }
break; break;
case T_Control_Point: case T_Control_Point:
Printf (port, "#[control-point %lu]", POINTER(x)); Printf (port, "#<control-point %lu>", POINTER(x));
break; break;
case T_Promise: case T_Promise:
Printf (port, "#[promise %lu]", POINTER(x)); Printf (port, "#<promise %lu>", POINTER(x));
break; break;
case T_Port: { case T_Port: {
int str = PORT(x)->flags & P_STRING; int str = PORT(x)->flags & P_STRING;
@ -340,29 +343,29 @@ void Print_Object (Object x, Object port, register int raw, register int depth,
case P_INPUT: p = "input"; break; case P_INPUT: p = "input"; break;
default: p = "input-output"; break; default: p = "input-output"; break;
} }
Printf (port, "#[%s-%s-port ", str ? "string" : "file", p); Printf (port, "#<%s-%s-port ", str ? "string" : "file", p);
if (str) if (str)
Printf (port, "%lu", POINTER(x)); Printf (port, "%lu", POINTER(x));
else else
Pr_String (port, PORT(x)->name, 0); Pr_String (port, PORT(x)->name, 0);
Print_Char (port, ']'); Print_Char (port, '>');
break; break;
} }
case T_End_Of_File: case T_End_Of_File:
Printf (port, "#[end-of-file]"); Printf (port, "#<end-of-file>");
break; break;
case T_Autoload: case T_Autoload:
Printf (port, "#[autoload "); Printf (port, "#<autoload ");
Print_Object (AUTOLOAD(x)->files, port, raw, depth, length); Print_Object (AUTOLOAD(x)->files, port, raw, depth, length);
Print_Char (port, ']'); Print_Char (port, '>');
break; break;
case T_Macro: case T_Macro:
if (Nullp (MACRO(x)->name)) { if (Nullp (MACRO(x)->name)) {
Printf (port, "#[macro %lu]", POINTER(x)); Printf (port, "#<macro %lu>", POINTER(x));
} else { } else {
Printf (port, "#[macro "); Printf (port, "#<macro ");
Print_Object (MACRO(x)->name, port, raw, depth, length); Print_Object (MACRO(x)->name, port, raw, depth, length);
Print_Char (port, ']'); Print_Char (port, '>');
} }
break; break;
case T_Broken_Heart: case T_Broken_Heart: