Skip to content

Commit b2d65cf

Browse files
author
zhourenjian@gmail.com
committed
Fixing bug on generating static constants within package whose name contain keywords
1 parent b376f5c commit b2d65cf

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

‎src/net/sf/j2s/core/astvisitors/ASTKeywordVisitor.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ public boolean visit(Assignment node) {
310310
} else {
311311
buffer.append("$t$ = ");
312312
}
313-
buffer.append(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName()));
313+
buffer.append(assureQualifiedName(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName())));
314314
buffer.append('.');
315315
if (left instanceof QualifiedName) {
316316
QualifiedName leftName = (QualifiedName) left;
@@ -330,7 +330,7 @@ public boolean visit(Assignment node) {
330330
boxingNode(right);
331331

332332
buffer.append(", ");
333-
buffer.append(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName()));
333+
buffer.append(assureQualifiedName(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName())));
334334
buffer.append(".prototype.");
335335
if (left instanceof QualifiedName) {
336336
QualifiedName leftName = (QualifiedName) left;
@@ -343,7 +343,7 @@ public boolean visit(Assignment node) {
343343
leftName.accept(this);
344344
}
345345
buffer.append(" = ");
346-
buffer.append(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName()));
346+
buffer.append(assureQualifiedName(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName())));
347347
buffer.append('.');
348348
if (left instanceof QualifiedName) {
349349
QualifiedName leftName = (QualifiedName) left;
@@ -876,7 +876,7 @@ public boolean visit(PostfixExpression node) {
876876
} else {
877877
buffer.append("$t$ = ");
878878
}
879-
buffer.append(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName()));
879+
buffer.append(assureQualifiedName(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName())));
880880
buffer.append('.');
881881
if (left instanceof QualifiedName) {
882882
QualifiedName leftName = (QualifiedName) left;
@@ -893,7 +893,7 @@ public boolean visit(PostfixExpression node) {
893893
buffer.append(op);
894894

895895
buffer.append(", ");
896-
buffer.append(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName()));
896+
buffer.append(assureQualifiedName(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName())));
897897
buffer.append(".prototype.");
898898
if (left instanceof QualifiedName) {
899899
QualifiedName leftName = (QualifiedName) left;
@@ -906,7 +906,7 @@ public boolean visit(PostfixExpression node) {
906906
leftName.accept(this);
907907
}
908908
buffer.append(" = ");
909-
buffer.append(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName()));
909+
buffer.append(assureQualifiedName(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName())));
910910
buffer.append('.');
911911
if (left instanceof QualifiedName) {
912912
QualifiedName leftName = (QualifiedName) left;
@@ -1004,7 +1004,7 @@ public boolean visit(PrefixExpression node) {
10041004
}
10051005
buffer.append(op);
10061006
buffer.append(' ');
1007-
buffer.append(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName()));
1007+
buffer.append(assureQualifiedName(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName())));
10081008
buffer.append('.');
10091009
if (left instanceof QualifiedName) {
10101010
QualifiedName leftName = (QualifiedName) left;
@@ -1018,7 +1018,7 @@ public boolean visit(PrefixExpression node) {
10181018
}
10191019

10201020
buffer.append(", ");
1021-
buffer.append(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName()));
1021+
buffer.append(assureQualifiedName(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName())));
10221022
buffer.append(".prototype.");
10231023
if (left instanceof QualifiedName) {
10241024
QualifiedName leftName = (QualifiedName) left;
@@ -1031,7 +1031,7 @@ public boolean visit(PrefixExpression node) {
10311031
leftName.accept(this);
10321032
}
10331033
buffer.append(" = ");
1034-
buffer.append(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName()));
1034+
buffer.append(assureQualifiedName(shortenQualifiedName(varBinding.getDeclaringClass().getQualifiedName())));
10351035
buffer.append('.');
10361036
if (left instanceof QualifiedName) {
10371037
QualifiedName leftName = (QualifiedName) left;

0 commit comments

Comments
 (0)