From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 566 invoked by alias); 24 Jul 2002 15:08:31 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 559 invoked from network); 24 Jul 2002 15:08:29 -0000 Received: from unknown (HELO gash2.peakpeak.com) (207.174.178.17) by sources.redhat.com with SMTP; 24 Jul 2002 15:08:29 -0000 Received: from fleche.redhat.com (ta0207.peakpeak.com [204.144.244.207]) by gash2.peakpeak.com (8.9.3/8.9.3) with ESMTP id JAA00542; Wed, 24 Jul 2002 09:08:25 -0600 Received: by fleche.redhat.com (Postfix, from userid 1000) id 16A4E4F8355; Wed, 24 Jul 2002 09:13:45 -0600 (MDT) To: Andrew Cagney Cc: gdb-patches@sources.redhat.com Subject: Re: RFA: gettextize jv-exp.y References: <87bs9zhp7c.fsf@fleche.redhat.com> <3D192D8C.7000308@cygnus.com> From: Tom Tromey Reply-To: tromey@redhat.com X-Attribution: Tom X-Zippy: We place two copies of PEOPLE magazine in a DARK, HUMID mobile home. 45 minutes later CYNDI LAUPER emerges wearing a BIRD CAGE on her head! Date: Wed, 24 Jul 2002 09:22:00 -0000 In-Reply-To: <3D192D8C.7000308@cygnus.com> Message-ID: <87n0shw446.fsf@fleche.redhat.com> User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2002-07/txt/msg00479.txt.bz2 >>>>> "Andrew" == Andrew Cagney writes: Tom> This patch gettextizes jv-exp.y. Tom> In this case one code change was required. Look at yyerror(). Tom> Also I fixed a couple of typos while I was at it. Andrew> I would have ignored it but you mentioned fixing typos. Some Andrew> more .. Ok, how about this patch? I believe it addresses all the comments in your reply. It compiles with -Werror (I do all my gdb builds that way now). Incidentally it would be convenient if gdb built with `-W'. This will warn about something I let slip in an earlier patch: a function with a non-void return type that fails to return a value. Why is -W not used? (I haven't tried building gdb with it.) Andrew> I'm not 100% certain but I believe the intent, in GDB is for Andrew> error messages to not include the period? I don't know. Based on my scans through the source, there seems to be very little consistency. I removed all the periods from this file. Tom Index: ChangeLog from Tom Tromey * jv-exp.y: Marked all strings with _(). (ClassInstanceCreationExpression, ArrayCreationExpression): Use internal_error. (MethodInvocation, CastExpression, parse_number, yyerror, java_type_from_name, push_expression_name, yylex): Typo fixes. Index: jv-exp.y =================================================================== RCS file: /cvs/src/src/gdb/jv-exp.y,v retrieving revision 1.7 diff -u -r1.7 jv-exp.y --- jv-exp.y 21 Jun 2002 14:32:10 -0000 1.7 +++ jv-exp.y 24 Jul 2002 15:06:38 -0000 @@ -390,7 +390,8 @@ ClassInstanceCreationExpression: NEW ClassType '(' ArgumentList_opt ')' - { error ("FIXME - ClassInstanceCreationExpression"); } + { internal_error (__FILE__, __LINE__, + _("FIXME - ClassInstanceCreationExpression")); } ; ArgumentList: @@ -408,9 +409,11 @@ ArrayCreationExpression: NEW PrimitiveType DimExprs Dims_opt - { error ("FIXME - ArrayCreatiionExpression"); } + { internal_error (__FILE__, __LINE__, + _("FIXME - ArrayCreationExpression")); } | NEW ClassOrInterfaceType DimExprs Dims_opt - { error ("FIXME - ArrayCreatiionExpression"); } + { internal_error (__FILE__, __LINE__, + _("FIXME - ArrayCreationExpression")); } ; DimExprs: @@ -445,11 +448,11 @@ MethodInvocation: Name '(' ArgumentList_opt ')' - { error ("method invocation not implemented"); } + { error (_("Method invocation not implemented")); } | Primary '.' SimpleName '(' ArgumentList_opt ')' - { error ("method invocation not implemented"); } + { error (_("Method invocation not implemented")); } | SUPER '.' SimpleName '(' ArgumentList_opt ')' - { error ("method invocation not implemented"); } + { error (_("Method invocation not implemented")); } ; ArrayAccess: @@ -539,7 +542,7 @@ int i; int base = expout_ptr - last_exp_size - 3; if (base < 0 || expout->elts[base+2].opcode != OP_TYPE) - error ("invalid cast expression"); + error (_("Invalid cast expression")); type = expout->elts[base+1].type; /* Remove the 'Expression' and slide the UnaryExpressionNotPlusMinus down to replace it. */ @@ -795,7 +798,7 @@ return ERROR; if (n > limit_div_base || (n *= base) > limit - c) - error ("Numeric constant too large."); + error (_("Numeric constant too large")); n += c; } @@ -905,7 +908,7 @@ if (c == '\\') c = parse_escape (&lexptr); else if (c == '\'') - error ("Empty character constant."); + error (_("Empty character constant")); yylval.typed_val_int.val = c; yylval.typed_val_int.type = java_char_type; @@ -918,12 +921,12 @@ { lexptr = tokstart + namelen; if (lexptr[-1] != '\'') - error ("Unmatched single quote."); + error (_("Unmatched single quote")); namelen -= 2; tokstart++; goto tryname; } - error ("Invalid character constant."); + error (_("Invalid character constant")); } return INTEGER_LITERAL; @@ -1008,7 +1011,7 @@ memcpy (err_copy, tokstart, p - tokstart); err_copy[p - tokstart] = 0; - error ("Invalid number \"%s\".", err_copy); + error (_("Invalid number \"%s\""), err_copy); } lexptr = p; return toktype; @@ -1080,7 +1083,7 @@ } while ((*tokptr != '"') && (*tokptr != '\0')); if (*tokptr++ != '"') { - error ("Unterminated string in expression."); + error (_("Unterminated string in expression")); } tempbuf[tempbufindex] = '\0'; /* See note above */ yylval.sval.ptr = tempbuf; @@ -1092,7 +1095,7 @@ if (!(c == '_' || c == '$' || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'))) /* We must have come across a bad character (e.g. ';'). */ - error ("Invalid character '%c' in expression.", c); + error (_("Invalid character '%c' in expression"), c); /* It's a name. See how long it is. */ namelen = 0; @@ -1214,7 +1217,10 @@ if (prev_lexptr) lexptr = prev_lexptr; - error ("A %s in expression, near `%s'.", (msg ? msg : "error"), lexptr); + if (msg) + error (_("%s: near `%s'"), msg, lexptr); + else + error (_("error in expression, near `%s'"), lexptr); } static struct type * @@ -1225,7 +1231,7 @@ char *tmp = copy_name (name); struct type *typ = java_lookup_class (tmp); if (typ == NULL || TYPE_CODE (typ) != TYPE_CODE_STRUCT) - error ("No class named %s.", tmp); + error (_("No class named `%s'"), tmp); return typ; } @@ -1368,7 +1374,7 @@ while (dot_index < name.length && name.ptr[dot_index] != '.') dot_index++; } - error ("unknown type `%.*s'", name.length, name.ptr); + error (_("unknown type `%.*s'"), name.length, name.ptr); } /* Handle Name in an expression (or LHS). @@ -1417,9 +1423,9 @@ builtin_type_int); } else if (!have_full_symbols () && !have_partial_symbols ()) - error ("No symbol table is loaded. Use the \"file\" command."); + error (_("No symbol table is loaded. Use the \"file\" command")); else - error ("No symbol \"%s\" in current context.", tmp); + error (_("No symbol \"%s\" in current context"), tmp); } }