CVSROOT: /sources/m4
Module name: m4
Branch: branch-1_4
Changes by: Eric Blake <ericb> 06/10/25 20:54:39
Index: ChangeLog
===================================================================
RCS file: /sources/m4/m4/ChangeLog,v
retrieving revision 1.1.1.1.2.203
retrieving revision 1.1.1.1.2.204
diff -u -b -r1.1.1.1.2.203 -r1.1.1.1.2.204
--- ChangeLog 24 Oct 2006 03:33:52 -0000 1.1.1.1.2.203
+++ ChangeLog 25 Oct 2006 20:54:39 -0000 1.1.1.1.2.204
@@ -1,3 +1,24 @@
+2006-10-25 Eric Blake <[EMAIL PROTECTED]>
+
+ Redo location tracking. Instead of having just files track the
+ line to return to when popping input, now all input blocks track
+ their current line.
+ * src/input.c (INPUT_STRING_WRAP, INPUT_FILE_INIT): No longer
+ needed.
+ (input_block): Have line and file storage for all input types, and
+ rename some members.
+ (input_change): New global flag.
+ (push_file, push_macro, push_string_init, push_wrapup): Store
+ location.
+ (push_string_finish, pop_input, pop_wrapup): Notice changes in
+ input blocks.
+ (peek_input): Adjust to new member names.
+ (next_char, next_char1): Adjust location if needed.
+ (skip_line): Simplify restoring location.
+ * doc/m4.texinfo (Location): Augment the test to catch line
+ location of expansion of multi-line arguments.
+ Reported by Stepan Kasal.
+
2006-10-23 Eric Blake <[EMAIL PROTECTED]>
* doc/m4.texinfo (Macro Arguments): Document that leading space
@@ -3199,7 +3220,7 @@
-----
- $Revision: 1.1.1.1.2.203 $ $Date: 2006/10/24 03:33:52 $
+ $Revision: 1.1.1.1.2.204 $ $Date: 2006/10/25 20:54:39 $
Local Variables:
coding: utf-8
