This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
RFA: gettextize jv-exp.y
- From: Tom Tromey <tromey at redhat dot com>
- To: gdb-patches at sources dot redhat dot com
- Date: 25 Jun 2002 00:01:11 -0600
- Subject: RFA: gettextize jv-exp.y
- Reply-to: tromey at redhat dot com
This patch gettextizes jv-exp.y.
In this case one code change was required. Look at yyerror().
Also I fixed a couple of typos while I was at it.
Ok?
Once a few of these go in, I'd like to start treating pure wrapping
patches (no code changes, just _() addition and maybe typo fixes) as
obvious, not requiring approval. What do you think of that idea?
Anything requiring an actual code change I'll still seek approval for.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* jv-exp.y: Marked all strings with _().
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 25 Jun 2002 05:46:02 -0000
@@ -390,7 +390,7 @@
ClassInstanceCreationExpression:
NEW ClassType '(' ArgumentList_opt ')'
- { error ("FIXME - ClassInstanceCreationExpression"); }
+ { error (_("FIXME - ClassInstanceCreationExpression")); }
;
ArgumentList:
@@ -408,9 +408,9 @@
ArrayCreationExpression:
NEW PrimitiveType DimExprs Dims_opt
- { error ("FIXME - ArrayCreatiionExpression"); }
+ { error (_("FIXME - ArrayCreationExpression")); }
| NEW ClassOrInterfaceType DimExprs Dims_opt
- { error ("FIXME - ArrayCreatiionExpression"); }
+ { error (_("FIXME - ArrayCreationExpression")); }
;
DimExprs:
@@ -445,11 +445,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 +539,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 +795,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 +905,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 +918,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 +1008,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 +1080,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 +1092,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 +1214,10 @@
if (prev_lexptr)
lexptr = prev_lexptr;
- error ("A %s in expression, near `%s'.", (msg ? msg : "error"), lexptr);
+ if (msg)
+ error (_("%s: near `%s'."), lexptr);
+ else
+ error (_("error in expression, near `%s'."), lexptr);
}
static struct type *
@@ -1225,7 +1228,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 +1371,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 +1420,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);
}
}