m4 ChangeLog doc/m4.texinfo m4/input.c m4/m4mod...

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      06/09/07 23:53:04

Modified files:
        .              : ChangeLog 
        doc            : m4.texinfo 
        m4             : input.c m4module.h m4private.h macro.c 
                         utility.c 
        modules        : m4.c 
        src            : main.c 

Log message:
        * m4/m4module.h (m4_peek_input): No longer export.
        (m4_error_at_line, m4_warn_at_line): New prototypes.
        (m4_is_symbol_void): New macro.
        (m4_push_file): Update prototype.
        * m4/m4private.h (m4__peek_token): New prototype.
        (M4_TOKEN_OPEN, M4_TOKEN_COMMA, M4_TOKEN_CLOSE): New enumerators.
        * m4/utility.c (m4_error_at_line, m4_warn_at_line): New functions.
        * src/main.c (main): Allow reading from stdin twice.
        * modules/m4.c (include): Adjust to new prototype.
        * m4/input.c: General comment cleanup.
        (file_peek, file_read, file_unget, push_file): Set end flag on
        EOF, so that we don't call getc twice.
        (push_file, file_clean): Port fix from branch to avoid closing
        stdin prematurely.
        (pop_input): Port fix from branch to avoid reading free'd memory
        when input ends mid-string.
        (m4_pop_wrapup): Port fix from branch to allow multiple m4wraps.
        (string_peek, string_read): Always use unsigned char.
        (m4_skip_line): Warn when dnl cut short by EOF.
        (peek_input): Rename from m4_peek_input.
        (match_input): Update signature, to distinguish between `(' token
        and multi-char quote or comment beginning with `('.
        (m4_input_exit): Cleanup now done in m4_pop_wrapup.
        (m4__peek_token): New function, ported from branch.
        (m4__next_token): Update to new token types.
        * m4/macro.c (expand_token, expand_argument): Use peek_token.
        * doc/m4.texinfo (Pseudo Arguments, Defn, Answers): Fix typos.
        (Invoking m4): Remerge from branch.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/m4/ChangeLog?cvsroot=m4&r1=1.378&r2=1.379
http://cvs.savannah.gnu.org/viewcvs/m4/doc/m4.texinfo?cvsroot=m4&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/m4/m4/input.c?cvsroot=m4&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/m4/m4/m4module.h?cvsroot=m4&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/m4/m4/m4private.h?cvsroot=m4&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/m4/m4/macro.c?cvsroot=m4&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/m4/m4/utility.c?cvsroot=m4&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/m4/modules/m4.c?cvsroot=m4&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/m4/src/main.c?cvsroot=m4&r1=1.79&r2=1.80