From e0f22df5c513f253d96877c6b2c6eec026d179d6 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 14 Sep 2001 17:32:41 +0000 Subject: Implement extract-all in Java mode. --- src/ChangeLog | 8 ++++++++ src/x-java.h | 1 + src/x-java.l | 14 +++++++++++++- src/xgettext.c | 1 + 4 files changed, 23 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 520bdde..fee0975 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2001-09-14 Tommy Johansson + + * x-java.h (x_java_extract_all): New declaration. + * x-java.l (extract_all_strings): New variable. + (x_java_extract_all): New function. + (extract_java): Test extract_all_strings. + * xgettext.c (main): Call x_java_extract_all. + 2001-09-03 Bruno Haible * x-c.h (EXTENSIONS_C, SCANNERS_C): Remove extraneous commas. diff --git a/src/x-java.h b/src/x-java.h index da0ac86..1deecac 100644 --- a/src/x-java.h +++ b/src/x-java.h @@ -27,3 +27,4 @@ extern void extract_java PARAMS ((FILE *fp, const char *real_filename, msgdomain_list_ty *mdlp)); extern void x_java_keyword PARAMS ((const char *keyword)); +extern void x_java_extract_all PARAMS ((void)); diff --git a/src/x-java.l b/src/x-java.l index ba0ae27..76d5c9f 100644 --- a/src/x-java.l +++ b/src/x-java.l @@ -261,6 +261,17 @@ translate_esc (s) return n; } + +/* options */ +static bool extract_all_strings = false; + +void +x_java_extract_all () +{ + extract_all_strings = true; +} + + static string_list_ty *java_keywords = NULL; /** @@ -423,7 +434,8 @@ extract_java (f, real_filename, logical_filename, mdlp) case JAVA_FLOW: /* Did we get something? */ - if (state == STATE_STRING && last_state == STATE_KEYWORD) + if (state == STATE_STRING + && (last_state == STATE_KEYWORD || extract_all_strings)) { lex_pos_ty pos; pos.file_name = logical_file_name; diff --git a/src/xgettext.c b/src/xgettext.c index 628e021..2a61815 100644 --- a/src/xgettext.c +++ b/src/xgettext.c @@ -221,6 +221,7 @@ main (argc, argv) break; case 'a': x_c_extract_all (); + x_java_extract_all (); break; case 'c': if (optarg == NULL) -- cgit v1.1