1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-12 06:41:13 +02:00

* Removed SCM_CDR misuse.

This commit is contained in:
Dirk Herrmann 2001-05-17 06:38:25 +00:00
parent c81ea65d61
commit 09cb9e738b
2 changed files with 18 additions and 12 deletions

View file

@ -1,3 +1,12 @@
2001-05-17 Dirk Herrmann <D.Herrmann@tu-bs.de>
* print.h (PRINTH, SCM_PRINT_H): Renamed PRINTH to SCM_PRINT_H.
(SCM_PORT_WITH_PS_PORT, SCM_PORT_WITH_PS_PS): Only pairs may be
accessed with SCM_C[AD]R.
(SCM_COERCE_OUTPORT): Removed redundant SCM_NIMP test.
2001-05-16 Rob Browning <rlb@cs.utexas.edu> 2001-05-16 Rob Browning <rlb@cs.utexas.edu>
* version.c (s_scm_major_version): doc fixes. * version.c (s_scm_major_version): doc fixes.

View file

@ -1,8 +1,8 @@
/* classes: h_files */ /* classes: h_files */
#ifndef PRINTH #ifndef SCM_PRINT_H
#define PRINTH #define SCM_PRINT_H
/* Copyright (C) 1995,1996,1998, 2000 Free Software Foundation, Inc. /* Copyright (C) 1995,1996,1998,2000,2001 Free Software Foundation, Inc.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -74,12 +74,11 @@ do { \
#define SCM_SET_WRITINGP(pstate, x) { (pstate)->writingp = (x); } #define SCM_SET_WRITINGP(pstate, x) { (pstate)->writingp = (x); }
#define SCM_PORT_WITH_PS_P(p) SCM_TYP16_PREDICATE (scm_tc16_port_with_ps, p) #define SCM_PORT_WITH_PS_P(p) SCM_TYP16_PREDICATE (scm_tc16_port_with_ps, p)
#define SCM_PORT_WITH_PS_PORT(p) SCM_CADR (p) #define SCM_PORT_WITH_PS_PORT(p) SCM_CAR (SCM_CELL_OBJECT_1 (p))
#define SCM_PORT_WITH_PS_PS(p) SCM_CDDR (p) #define SCM_PORT_WITH_PS_PS(p) SCM_CDR (SCM_CELL_OBJECT_1 (p))
#define SCM_COERCE_OUTPORT(p) (SCM_NIMP (p) && SCM_PORT_WITH_PS_P (p) \ #define SCM_COERCE_OUTPORT(p) \
? SCM_PORT_WITH_PS_PORT (p) \ (SCM_PORT_WITH_PS_P (p) ? SCM_PORT_WITH_PS_PORT (p) : p)
: p)
#define SCM_PRINT_STATE_LAYOUT "sruwuwuwuwuwpwuwuwuruopr" #define SCM_PRINT_STATE_LAYOUT "sruwuwuwuwuwpwuwuwuruopr"
typedef struct scm_print_state { typedef struct scm_print_state {
@ -100,7 +99,6 @@ typedef struct scm_print_state {
extern SCM scm_print_state_vtable; extern SCM scm_print_state_vtable;
/* ? scm or long? print.h and print.c disagree */
extern scm_bits_t scm_tc16_port_with_ps; extern scm_bits_t scm_tc16_port_with_ps;
extern SCM scm_print_options (SCM setting); extern SCM scm_print_options (SCM setting);
@ -116,8 +114,7 @@ extern SCM scm_display (SCM obj, SCM port);
extern SCM scm_simple_format (SCM port, SCM message, SCM args); extern SCM scm_simple_format (SCM port, SCM message, SCM args);
extern SCM scm_newline (SCM port); extern SCM scm_newline (SCM port);
extern SCM scm_write_char (SCM chr, SCM port); extern SCM scm_write_char (SCM chr, SCM port);
extern SCM scm_printer_apply (SCM proc, SCM exp, SCM port, extern SCM scm_printer_apply (SCM proc, SCM exp, SCM port, scm_print_state *);
scm_print_state *);
extern SCM scm_port_with_print_state (SCM port, SCM pstate); extern SCM scm_port_with_print_state (SCM port, SCM pstate);
extern SCM scm_get_print_state (SCM port); extern SCM scm_get_print_state (SCM port);
extern int scm_valid_oport_value_p (SCM val); extern int scm_valid_oport_value_p (SCM val);
@ -126,7 +123,7 @@ extern void scm_init_print (void);
#ifdef GUILE_DEBUG #ifdef GUILE_DEBUG
extern SCM scm_current_pstate (void); extern SCM scm_current_pstate (void);
#endif #endif
#endif /* PRINTH */ #endif /* SCM_PRINT_H */
/* /*
Local Variables: Local Variables: