2002/08/07 03:24:48

darcs-hash:20040130064930-2ba56-479a759f64fecef0bf8f8fc3bc454257c7f0056d.gz

diff --git a/CHANGES b/CHANGES
index e4869d6..547a8db 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -313,3 +313,6 @@
 
 30-Jul corey  build.xml: patch to make build.xml not depend on <bash/>
 
+06-Jul megacz Context.java: workaround for GCJ bug which causes
+              MessageFormatter to choke on { and }
+

diff --git a/src/org/mozilla/javascript/Context.java b/src/org/mozilla/javascript/Context.java
index 6e6dfbb..514bfdf 100644 (file)
--- a/src/org/mozilla/javascript/Context.java
+++ b/src/org/mozilla/javascript/Context.java
@@ -1725,8 +1725,8 @@ public class Context {
             { "msg.no.paren.parms", "missing ( before function parameters" },\r
             { "msg.no.parm", "missing formal parameter" },\r
             { "msg.no.paren.after.parms", "missing ) after formal parameters" },\r
-            { "msg.no.brace.body", "missing '{' before function body" },\r
-            { "msg.no.brace.after.body", "missing } after function body" },\r
+            { "msg.no.brace.body", "missing open brace before function body" },\r
+            { "msg.no.brace.after.body", "missing close brace after function body" },\r
             { "msg.no.paren.cond", "missing ( before condition" },\r
             { "msg.no.paren.after.cond", "missing ) after condition" },\r
             { "msg.no.semi.stmt", "missing ; before statement" },\r
@@ -1734,7 +1734,7 @@ public class Context {
             { "msg.no.bracket.index", "missing ] in index expression" },\r
             { "msg.no.paren.switch", "missing ( before switch expression" },\r
             { "msg.no.paren.after.switch", "missing ) after switch expression" },\r
-            { "msg.no.brace.switch", "missing '{' before switch body" },\r
+            { "msg.no.brace.switch", "missing open brace before switch body" },\r
             { "msg.bad.switch", "invalid switch statement" },\r
             { "msg.no.colon.case", "missing : after case expression" },\r
             { "msg.no.while.do", "missing while after do-loop body" },\r
@@ -1745,7 +1745,7 @@ public class Context {
             { "msg.no.paren.with", "missing ( before with-statement object" },\r
             { "msg.no.paren.after.with", "missing ) after with-statement object" },\r
             { "msg.bad.return", "invalid return" },\r
-            { "msg.no.brace.block", "missing } in compound statement" },\r
+            { "msg.no.brace.block", "missing close brace in compound statement" },\r
             { "msg.bad.label", "invalid label" },\r
             { "msg.bad.var", "missing variable name" },\r
             { "msg.bad.var.init", "invalid variable initialization" },\r
@@ -1754,13 +1754,13 @@ public class Context {
             { "msg.no.bracket.arg", "missing ] after element list" },\r
             { "msg.bad.prop", "invalid property id" },\r
             { "msg.no.colon.prop", "missing : after property id" },\r
-            { "msg.no.brace.prop", "missing } after property list" },\r
+            { "msg.no.brace.prop", "missing close brace after property list" },\r
             { "msg.no.paren", "missing ) in parenthetical" },\r
             { "msg.reserved.id", "identifier is a reserved word" },\r
             { "msg.no.paren.catch", "missing ( before catch-block condition" },\r
             { "msg.bad.catchcond", "invalid catch block condition" },\r
             { "msg.catch.unreachable", "any catch clauses following an unqualified catch are unreachable" },\r
-            { "msg.no.brace.catchblock", "missing '{' before catch-block body" },\r
+            { "msg.no.brace.catchblock", "missing open brace before catch-block body" },\r
             { "msg.try.no.catchfinally", "''try'' without ''catch'' or ''finally''" },\r
             { "msg.syntax", "syntax error" },\r
             { "msg.assn.create", "Assignment to undefined \"{0}\" will create a new variable.  Add a variable statement at the top level scope to remove this warning." },\r