summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Djurfeldt <djurfeldt@nada.kth.se>1998-03-30 19:22:16 +0000
committerMikael Djurfeldt <djurfeldt@nada.kth.se>1998-03-30 19:22:16 +0000
commitd0defdf3aa70fc4aa68f3250a1fcaa2e51dbca3b (patch)
treee2af76fd404ab13a5b309b7e2870693e3e0fef2e
parent701191ba9c254eb367fbf2f5e4c8df9f3320b0f4 (diff)
downloadguile-d0defdf3aa70fc4aa68f3250a1fcaa2e51dbca3b.tar.gz
* ports.c (scm_add_to_port_table): First line is now line 0
(was 1). (Interface changed according to suggestion by Per Bothner.) * backtrace.c (display_header): Add 1 to line and column numbers when presenting them to the user.
-rw-r--r--THANKS1
-rw-r--r--libguile/ChangeLog9
-rw-r--r--libguile/backtrace.c4
-rw-r--r--libguile/ports.c2
4 files changed, 13 insertions, 3 deletions
diff --git a/THANKS b/THANKS
index 687689a8b..2e5c4d527 100644
--- a/THANKS
+++ b/THANKS
@@ -8,6 +8,7 @@ Bug reports and fixes from:
Greg Badros
Aleksandar Bakic
+ Per Bothner
Marcus Daniels
Fred Fish
Jesse N. Glick
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 7d1ef03fa..ac833dc38 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,12 @@
+1998-03-30 Mikael Djurfeldt <mdj@nada.kth.se>
+
+ * ports.c (scm_add_to_port_table): First line is now line 0
+ (was 1). (Interface changed according to suggestion by Per
+ Bothner.)
+
+ * backtrace.c (display_header): Add 1 to line and column numbers
+ when presenting them to the user.
+
1998-03-28 Mikael Djurfeldt <mdj@nada.kth.se>
* throw.c (handler_message): Print message on current error port
diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index 54ea125d8..042efe3cc 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -83,9 +83,9 @@ display_header (source, port)
{
scm_prin1 (fname, port, 0);
scm_putc (':', port);
- scm_prin1 (scm_source_property (source, scm_i_line), port, 0);
+ scm_prin1 (scm_source_property (source, scm_i_line) + 1, port, 0);
scm_putc (':', port);
- scm_prin1 (scm_source_property (source, scm_i_column), port, 0);
+ scm_prin1 (scm_source_property (source, scm_i_column) + 1, port, 0);
}
else
scm_puts ("ERROR", port);
diff --git a/libguile/ports.c b/libguile/ports.c
index bbcad8428..b443d5636 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -258,7 +258,7 @@ scm_add_to_port_table (port)
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]->file_name = SCM_BOOL_F;
- scm_port_table[scm_port_table_size]->line_number = 1;
+ scm_port_table[scm_port_table_size]->line_number = 0;
scm_port_table[scm_port_table_size]->column_number = 0;
return scm_port_table[scm_port_table_size++];
}