mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-16 00:30:21 +02:00
Code Activity

merge from 1.8 branch

Browse source
This commit is contained in:
Kevin Ryde 2007-03-07 23:35:55 +00:00
parent 1ef21ad2a9
commit b3aa4626cd
6 changed files with 86 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libguile/read.c
View file

@ -1,4 +1,4 @@
/* Copyright (C) 1995,1996,1997,1999,2000,2001,2003, 2004, 2006 Free Software
/* Copyright (C) 1995,1996,1997,1999,2000,2001,2003, 2004, 2006, 2007 Free Software
* Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
@ -91,7 +91,7 @@ scm_i_input_error (char const *function,
scm_simple_format (string_port,
scm_from_locale_string ("~A:~S:~S: ~A"),
scm_list_4 (fn,
scm_from_int (SCM_LINUM (port) + 1),
scm_from_long (SCM_LINUM (port) + 1),
scm_from_int (SCM_COL (port) + 1),
scm_from_locale_string (message)));
@ -407,7 +407,7 @@ scm_lreadr (SCM *tok_buf, SCM port, SCM *copy)
SCM sharp = scm_get_hash_procedure (c);
if (scm_is_true (sharp))
{
int line = SCM_LINUM (port);
long line = SCM_LINUM (port);
int column = SCM_COL (port) - 2;
SCM got;
@ -533,7 +533,7 @@ scm_lreadr (SCM *tok_buf, SCM port, SCM *copy)
if (scm_is_true (sharp))
{
int line = SCM_LINUM (port);
long line = SCM_LINUM (port);
int column = SCM_COL (port) - 2;
SCM got;
@ -823,7 +823,7 @@ scm_lreadrecparen (SCM *tok_buf, SCM port, char *name, SCM *copy)
register SCM tl, tl2 = SCM_EOL;
SCM ans, ans2 = SCM_EOL;
/* Need to capture line and column numbers here. */
int line = SCM_LINUM (port);
long line = SCM_LINUM (port);
int column = SCM_COL (port) - 1;
c = scm_flush_ws (port, name);