diff options
-rw-r--r-- | gettext-tools/src/ChangeLog | 8 | ||||
-rw-r--r-- | gettext-tools/src/x-glade.c | 2 | ||||
-rw-r--r-- | gettext-tools/src/x-perl.c | 2 | ||||
-rw-r--r-- | gettext-tools/src/x-python.c | 6 |
4 files changed, 18 insertions, 0 deletions
diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 30fc90f..8812f65 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,5 +1,13 @@ 2003-10-04 Bruno Haible <bruno@clisp.org> + * x-glade.c (do_extract_glade): Initialize stack_depth. + * x-perl.c (extract_perl): Initialize linesize and linepos. + + * x-python.c (phase2_getc): Set last_comment_line. + (phase5_get): Set last_non_comment_line. + +2003-10-04 Bruno Haible <bruno@clisp.org> + * x-glade.c: Don't include msgl-ascii.h and msgl-iconv.h. * x-python.c: Likewise. * x-tcl.c: Likewise. diff --git a/gettext-tools/src/x-glade.c b/gettext-tools/src/x-glade.c index aa668d3..f192558 100644 --- a/gettext-tools/src/x-glade.c +++ b/gettext-tools/src/x-glade.c @@ -390,6 +390,8 @@ do_extract_glade (FILE *fp, XML_SetCharacterDataHandler (parser, character_data_handler); XML_SetCommentHandler (parser, comment_handler); + stack_depth = 0; + while (!feof (fp)) { char buf[4096]; diff --git a/gettext-tools/src/x-perl.c b/gettext-tools/src/x-perl.c index 6bead19..4af37e5 100644 --- a/gettext-tools/src/x-perl.c +++ b/gettext-tools/src/x-perl.c @@ -3022,6 +3022,8 @@ extract_perl (FILE *f, const char *real_filename, const char *logical_filename, token_stack.items = NULL; token_stack.nitems = 0; token_stack.nitems_max = 0; + linesize = 0; + linepos = 0; here_eaten = 0; end_of_file = false; diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c index 4b92117..6f1a8d5 100644 --- a/gettext-tools/src/x-python.c +++ b/gettext-tools/src/x-python.c @@ -253,6 +253,7 @@ phase2_getc () else if (c == '#') { /* Eat a comment. */ + last_comment_line = line_number; comment_start (); for (;;) { @@ -680,7 +681,12 @@ phase5_get (token_ty *tp) continue; tp->type = token_type_other; return; + } + + last_non_comment_line = tp->line_number; + switch (c) + { case '.': { int c1 = phase2_getc (); |