Fixes a problem in JavaScript code generation where we were sometimes using JavaScript keywords as field names in a JSON object construction. For example:
[false:0, true:1, foo:3]
We now quote keywords in this context.
["false":0, "true":1, foo:3]
Review by: mmendez
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@1542 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java b/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java
index 88c9686..49328e8 100644
--- a/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java
+++ b/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java
@@ -603,13 +603,17 @@
for (Object element : x.getPropertyInitializers()) {
sep = _sepCommaOptSpace(sep);
JsPropertyInitializer propInit = (JsPropertyInitializer) element;
- JsExpression labelExpr = propInit.getLabelExpr();
- // labels can be either string, integral, or decimal literals
- if (labelExpr instanceof JsStringLiteral
- && VALID_NAME_PATTERN.matcher(
- ((JsStringLiteral) labelExpr).getValue()).matches()) {
- p.print(((JsStringLiteral) labelExpr).getValue());
- } else {
+ printLabel : {
+ JsExpression labelExpr = propInit.getLabelExpr();
+ // labels can be either string, integral, or decimal literals
+ if (labelExpr instanceof JsStringLiteral) {
+ String propName = ((JsStringLiteral) labelExpr).getValue();
+ if (VALID_NAME_PATTERN.matcher(propName).matches()
+ && !JsKeywords.isKeyword(propName)) {
+ p.print(propName);
+ break printLabel;
+ }
+ }
accept(labelExpr);
}
_colon();
