mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-11 06:20:23 +02:00
Code Activity

* ports.h (scm_port_table): put back file_name, it will be used to

Browse source 
support debugging.  Undo related changes in fports.c, ioext.c,
ports.c, gc.c.
This commit is contained in:
Gary Houston 1996-09-17 02:09:50 +00:00
parent 19639113d1
commit ebf7394e72
6 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libguile/ChangeLog
View file

@ -1,3 +1,9 @@
Tue Sep 17 01:40:56 1996 Gary Houston <ghouston@actrix.gen.nz>
* ports.h (scm_port_table): put back file_name, it will be used to
support debugging. Undo related changes in fports.c, ioext.c,
ports.c, gc.c.
Sun Sep 15 03:58:29 1996 Gary Houston <ghouston@actrix.gen.nz> Sun Sep 15 03:58:29 1996 Gary Houston <ghouston@actrix.gen.nz>
* ports.h (scm_port_table): remove file_name member for now, it seems * ports.h (scm_port_table): remove file_name member for now, it seems

3
libguile/fports.c
View file

@ -185,7 +185,7 @@ scm_open_file (filename, modes)
if (SCM_BUF0 & (SCM_CAR (port) = scm_tc16_fport | scm_mode_bits (mode))) if (SCM_BUF0 & (SCM_CAR (port) = scm_tc16_fport | scm_mode_bits (mode)))
scm_setbuf0 (port); scm_setbuf0 (port);
SCM_SETSTREAM (port, (SCM)f); SCM_SETSTREAM (port, (SCM)f);
/* SCM_PTAB_ENTRY (port)->file_name = scm_makfrom0str (filename); */ SCM_PTAB_ENTRY (port)->file_name = scm_makfrom0str (file);
} }
SCM_ALLOW_INTS; SCM_ALLOW_INTS;
return port; return port;
@ -235,6 +235,7 @@ prinfport (exp, port, writing)
#endif #endif
{ {
/* /*
perhaps this isn't needed.
SCM name; SCM name;
char * c; char * c;
if (SCM_CLOSEDP (exp)) if (SCM_CLOSEDP (exp))

6
libguile/gc.c
View file

@ -677,10 +677,8 @@ gc_mark_nimp:
goto def; goto def;
if (SCM_GC8MARKP (ptr)) if (SCM_GC8MARKP (ptr))
break; break;
/* if (SCM_PTAB_ENTRY(ptr))
if (SCM_PTAB_ENTRY(ptr)) scm_gc_mark (SCM_PTAB_ENTRY(ptr)->file_name);
scm_gc_mark (SCM_PTAB_ENTRY(ptr)->file_name);
*/
ptr = (scm_ptobs[i].mark) (ptr); ptr = (scm_ptobs[i].mark) (ptr);
goto gc_mark_loop; goto gc_mark_loop;
break; break;

2
libguile/ioext.c
View file

@ -182,7 +182,7 @@ scm_sys_duplicate_port (oldpt, modes)
if (SCM_BUF0 & (SCM_CAR (newpt) = scm_tc16_fport | scm_mode_bits (SCM_CHARS (modes)))) if (SCM_BUF0 & (SCM_CAR (newpt) = scm_tc16_fport | scm_mode_bits (SCM_CHARS (modes))))
scm_setbuf0 (newpt); scm_setbuf0 (newpt);
SCM_SETSTREAM (newpt, (SCM)f); SCM_SETSTREAM (newpt, (SCM)f);
/* SCM_PTAB_ENTRY (newpt)->file_name = SCM_PTAB_ENTRY (oldpt)->file_name;*/ SCM_PTAB_ENTRY (newpt)->file_name = SCM_PTAB_ENTRY (oldpt)->file_name;
} }
SCM_ALLOW_INTS; SCM_ALLOW_INTS;
return newpt; return newpt;

5
libguile/ports.c
View file

@ -380,7 +380,7 @@ scm_add_to_port_table (port)
scm_port_table[scm_port_table_size]->port = port; scm_port_table[scm_port_table_size]->port = port;
scm_port_table[scm_port_table_size]->revealed = 0; scm_port_table[scm_port_table_size]->revealed = 0;
scm_port_table[scm_port_table_size]->stream = 0; scm_port_table[scm_port_table_size]->stream = 0;
/* scm_port_table[scm_port_table_size]->file_name = SCM_BOOL_F;*/ scm_port_table[scm_port_table_size]->file_name = SCM_BOOL_F;
scm_port_table[scm_port_table_size]->line_number = 1; scm_port_table[scm_port_table_size]->line_number = 1;
scm_port_table[scm_port_table_size]->column_number = 0; scm_port_table[scm_port_table_size]->column_number = 0;
scm_port_table[scm_port_table_size]->representation = scm_regular_port; scm_port_table[scm_port_table_size]->representation = scm_regular_port;
@ -746,8 +746,6 @@ scm_column_number (port)
return SCM_MAKINUM (SCM_COL (p)); return SCM_MAKINUM (SCM_COL (p));
} }
/* !!! dubious feature */
#if 0
SCM_PROC (s_port_file_name, "port-file-name", 0, 1, 0, scm_port_file_name); SCM_PROC (s_port_file_name, "port-file-name", 0, 1, 0, scm_port_file_name);
#ifdef __STDC__ #ifdef __STDC__
SCM SCM
@ -767,7 +765,6 @@ scm_port_file_name (port)
else else
return SCM_PTAB_ENTRY (p)->file_name; return SCM_PTAB_ENTRY (p)->file_name;
} }
#endif
#ifndef ttyname #ifndef ttyname
extern char * ttyname(); extern char * ttyname();

6
libguile/ports.h
View file

@ -71,11 +71,11 @@ struct scm_port_table
*/ */
SCM stream; SCM stream;
/* SCM file_name; */ SCM file_name; /* debugging support. */
int unchr; /* pushed back character, if any */ int unchr; /* pushed back character, if any */
int line_number; int line_number; /* debugging support. */
int column_number; int column_number; /* debugging support. */
enum scm_port_representation_type representation; enum scm_port_representation_type representation;
}; };