azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-2864

Browse Source
This commit is contained in:
develar
2012-09-30 17:18:51 +04:00
parent 9b6d08a6a9
commit 720a8f250b
3 changed files with 500 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java
+72 -15
View File
@@ -222,11 +222,11 @@ public class JsToStringGenerationVisitor extends JsVisitor {
} }
private void printExpressions(List<JsExpression> expressions) { private void printExpressions(List<JsExpression> expressions) {
boolean sep = false; boolean notFirst = false;
for (JsExpression arg : expressions) { for (JsExpression expression : expressions) {
sep = sepCommaOptSpace(sep); notFirst = sepCommaOptSpace(notFirst) && !(expression instanceof JsDocComment);
boolean isEnclosed = parenPushIfCommaExpression(arg); boolean isEnclosed = parenPushIfCommaExpression(expression);
accept(arg); accept(expression);
if (isEnclosed) { if (isEnclosed) {
rightParen(); rightParen();
} }
@@ -556,10 +556,10 @@ public class JsToStringGenerationVisitor extends JsVisitor {
} }
leftParen(); leftParen();
boolean sep = false; boolean notFirst = false;
for (Object element : x.getParameters()) { for (Object element : x.getParameters()) {
JsParameter param = (JsParameter) element; JsParameter param = (JsParameter) element;
sep = sepCommaOptSpace(sep); notFirst = sepCommaOptSpace(notFirst);
accept(param); accept(param);
} }
rightParen(); rightParen();
@@ -610,8 +610,7 @@ public class JsToStringGenerationVisitor extends JsVisitor {
@Override @Override
public boolean visit(JsInvocation x, JsContext ctx) { public boolean visit(JsInvocation x, JsContext ctx) {
JsExpression qualifier = x.getQualifier(); printPair(x, x.getQualifier());
printPair(x, qualifier);
leftParen(); leftParen();
printExpressions(x.getArguments()); printExpressions(x.getArguments());
@@ -697,20 +696,20 @@ public class JsToStringGenerationVisitor extends JsVisitor {
p.indentIn(); p.indentIn();
} }
boolean isNotFirst = false; boolean notFirst = false;
for (JsPropertyInitializer item : objectLiteral.getPropertyInitializers()) { for (JsPropertyInitializer item : objectLiteral.getPropertyInitializers()) {
if (isNotFirst) { if (notFirst) {
p.print(','); p.print(',');
} }
if (objectLiteral.isMultiline()) { if (objectLiteral.isMultiline()) {
newlineOpt(); newlineOpt();
} }
else if (isNotFirst) { else if (notFirst) {
spaceOpt(); spaceOpt();
} }
isNotFirst = true; notFirst = true;
JsExpression labelExpr = item.getLabelExpr(); JsExpression labelExpr = item.getLabelExpr();
// labels can be either string, integral, or decimal literals // labels can be either string, integral, or decimal literals
@@ -907,7 +906,65 @@ public class JsToStringGenerationVisitor extends JsVisitor {
return false; return false;
} }
protected void _newline() { @Override
public boolean visit(JsDocComment comment, JsContext context) {
boolean asSingleLine = comment.getTags().size() == 1;
if (!asSingleLine) {
newlineOpt();
}
p.print("/**");
if (asSingleLine) {
space();
}
else {
newline();
}
boolean notFirst = false;
for (Map.Entry<String, Object> entry : comment.getTags().entrySet()) {
if (notFirst) {
newline();
p.print(' ');
p.print('*');
}
else {
notFirst = true;
}
p.print('@');
p.print(entry.getKey());
Object value = entry.getValue();
if (value != null) {
space();
if (value instanceof CharSequence) {
p.print((CharSequence) value);
}
else {
visit((JsNameRef) value, context);
}
}
if (!asSingleLine) {
newline();
}
}
if (asSingleLine) {
space();
}
else {
newlineOpt();
}
p.print('*');
p.print('/');
if (asSingleLine) {
spaceOpt();
}
return false;
}
protected void newline() {
p.newline(); p.newline();
} }
@@ -977,7 +1034,7 @@ public class JsToStringGenerationVisitor extends JsVisitor {
newlineOpt(); newlineOpt();
} }
else { else {
_newline(); newline();
} }
} }
else { else {
src/com/google/dart/compiler/backend/js/ast/JsDocComment.java
+42 -6
View File
@@ -1,13 +1,49 @@
package com.google.dart.compiler.backend.js.ast; package com.google.dart.compiler.backend.js.ast;
public class JsDocComment extends JsNodeImpl implements JsStatement { import java.util.Collections;
@Override import java.util.Map;
public NodeKind getKind() {
return null; //To change body of implemented methods use File | Settings | File Templates. public class JsDocComment extends JsExpressionImpl implements JsExpression {
private final Map<String, Object> tags;
public JsDocComment(Map<String, Object> tags) {
this.tags = tags;
}
public Map<String, Object> getTags() {
return tags;
}
public JsDocComment(String tagName, JsNameRef tagValue) {
tags = Collections.<String, Object>singletonMap(tagName, tagValue);
}
public JsDocComment(String tagName, String tagValue) {
tags = Collections.<String, Object>singletonMap(tagName, tagValue);
} }
@Override @Override
public void traverse(JsVisitor visitor, JsContext context) { public NodeKind getKind() {
//To change body of implemented methods use File | Settings | File Templates. throw new UnsupportedOperationException();
}
@Override
public void traverse(JsVisitor v, JsContext context) {
v.visit(this, context);
}
@Override
public boolean hasSideEffects() {
return false;
}
@Override
public boolean isDefinitelyNotNull() {
return true;
}
@Override
public boolean isDefinitelyNull() {
return false;
} }
} }
src/com/google/dart/compiler/backend/js/ast/JsVisitor.java
+386 -384
View File
@@ -12,420 +12,422 @@ import java.util.List;
* Implemented by nodes that will visit child nodes. * Implemented by nodes that will visit child nodes.
*/ */
public class JsVisitor { public class JsVisitor {
protected static final JsContext LVALUE_CONTEXT = new JsContext() {
@Override
public boolean canInsert() {
return false;
}
protected static final JsContext LVALUE_CONTEXT = new JsContext() { @Override
public boolean canRemove() {
return false;
}
@Override @Override
public boolean canInsert() { public void insertAfter(JsVisitable node) {
return false; throw new UnsupportedOperationException();
}
@Override
public void insertBefore(JsVisitable node) {
throw new UnsupportedOperationException();
}
@Override
public boolean isLvalue() {
return true;
}
@Override
public void removeMe() {
throw new UnsupportedOperationException();
}
@Override
public void replaceMe(JsVisitable node) {
throw new UnsupportedOperationException();
}
};
protected static final JsContext UNMODIFIABLE_CONTEXT = new JsContext() {
@Override
public boolean canInsert() {
return false;
}
@Override
public boolean canRemove() {
return false;
}
@Override
public void insertAfter(JsVisitable node) {
throw new UnsupportedOperationException();
}
@Override
public void insertBefore(JsVisitable node) {
throw new UnsupportedOperationException();
}
@Override
public boolean isLvalue() {
return false;
}
@Override
public void removeMe() {
throw new UnsupportedOperationException();
}
@Override
public void replaceMe(JsVisitable node) {
throw new UnsupportedOperationException();
}
};
public final <T extends JsVisitable> T accept(T node) {
return doAccept(node);
} }
@Override public final <T extends JsVisitable> void acceptList(List<T> collection) {
public boolean canRemove() { doAcceptList(collection);
return false;
} }
@Override public JsExpression acceptLvalue(JsExpression expr) {
public void insertAfter(JsVisitable node) { return doAcceptLvalue(expr);
throw new UnsupportedOperationException();
} }
@Override public final <T extends JsVisitable> void acceptWithInsertRemove(List<T> collection) {
public void insertBefore(JsVisitable node) { doAcceptWithInsertRemove(collection);
throw new UnsupportedOperationException();
} }
@Override public void endVisit(JsArrayAccess x, JsContext ctx) {
public boolean isLvalue() {
return true;
} }
@Override public void endVisit(JsArrayLiteral x, JsContext ctx) {
public void removeMe() {
throw new UnsupportedOperationException();
} }
@Override public void endVisit(JsBinaryOperation x, JsContext ctx) {
public void replaceMe(JsVisitable node) {
throw new UnsupportedOperationException();
}
};
protected static final JsContext UNMODIFIABLE_CONTEXT = new JsContext() {
@Override
public boolean canInsert() {
return false;
} }
@Override public void endVisit(JsBlock x, JsContext ctx) {
public boolean canRemove() {
return false;
} }
@Override public void endVisit(JsLiteral.JsBooleanLiteral x, JsContext ctx) {
public void insertAfter(JsVisitable node) {
throw new UnsupportedOperationException();
} }
@Override public void endVisit(JsBreak x, JsContext ctx) {
public void insertBefore(JsVisitable node) {
throw new UnsupportedOperationException();
} }
@Override public void endVisit(JsCase x, JsContext ctx) {
public boolean isLvalue() {
return false;
} }
@Override public void endVisit(JsCatch x, JsContext ctx) {
public void removeMe() {
throw new UnsupportedOperationException();
} }
@Override public void endVisit(JsConditional x, JsContext ctx) {
public void replaceMe(JsVisitable node) {
throw new UnsupportedOperationException();
} }
};
public final <T extends JsVisitable> T accept(T node) { public void endVisit(JsContinue x, JsContext ctx) {
return doAccept(node);
}
public final <T extends JsVisitable> void acceptList(List<T> collection) {
doAcceptList(collection);
}
public JsExpression acceptLvalue(JsExpression expr) {
return doAcceptLvalue(expr);
}
public final <T extends JsVisitable> void acceptWithInsertRemove(List<T> collection) {
doAcceptWithInsertRemove(collection);
}
public void endVisit(JsArrayAccess x, JsContext ctx) {
}
public void endVisit(JsArrayLiteral x, JsContext ctx) {
}
public void endVisit(JsBinaryOperation x, JsContext ctx) {
}
public void endVisit(JsBlock x, JsContext ctx) {
}
public void endVisit(JsLiteral.JsBooleanLiteral x, JsContext ctx) {
}
public void endVisit(JsBreak x, JsContext ctx) {
}
public void endVisit(JsCase x, JsContext ctx) {
}
public void endVisit(JsCatch x, JsContext ctx) {
}
public void endVisit(JsConditional x, JsContext ctx) {
}
public void endVisit(JsContinue x, JsContext ctx) {
}
public void endVisit(JsDebugger x, JsContext ctx) {
}
public void endVisit(JsDefault x, JsContext ctx) {
}
public void endVisit(JsDoWhile x, JsContext ctx) {
}
public void endVisit(JsEmpty x, JsContext ctx) {
}
public void endVisit(JsExprStmt x, JsContext ctx) {
}
public void endVisit(JsFor x, JsContext ctx) {
}
public void endVisit(JsForIn x, JsContext ctx) {
}
public void endVisit(JsFunction x, JsContext ctx) {
}
public void endVisit(JsIf x, JsContext ctx) {
}
public void endVisit(JsInvocation x, JsContext ctx) {
}
public void endVisit(JsLabel x, JsContext ctx) {
}
public void endVisit(JsNameRef x, JsContext ctx) {
}
public void endVisit(JsNew x, JsContext ctx) {
}
public void endVisit(JsNullLiteral x, JsContext ctx) {
}
public void endVisit(JsNumberLiteral x, JsContext ctx) {
}
public void endVisit(JsObjectLiteral x, JsContext ctx) {
}
public void endVisit(JsParameter x, JsContext ctx) {
}
public void endVisit(JsPostfixOperation x, JsContext ctx) {
}
public void endVisit(JsPrefixOperation x, JsContext ctx) {
}
public void endVisit(JsProgram x, JsContext ctx) {
}
public void endVisit(JsProgramFragment x, JsContext ctx) {
}
public void endVisit(JsPropertyInitializer x, JsContext ctx) {
}
public void endVisit(JsRegExp x, JsContext ctx) {
}
public void endVisit(JsReturn x, JsContext ctx) {
}
public void endVisit(JsStringLiteral x, JsContext ctx) {
}
public void endVisit(JsSwitch x, JsContext ctx) {
}
public void endVisit(JsLiteral.JsThisRef x, JsContext ctx) {
}
public void endVisit(JsThrow x, JsContext ctx) {
}
public void endVisit(JsTry x, JsContext ctx) {
}
public void endVisit(JsVar x, JsContext ctx) {
}
public void endVisit(JsVars x, JsContext ctx) {
}
public void endVisit(JsWhile x, JsContext ctx) {
}
public boolean visit(JsArrayAccess x, JsContext ctx) {
return true;
}
public boolean visit(JsArrayLiteral x, JsContext ctx) {
return true;
}
public boolean visit(JsBinaryOperation x, JsContext ctx) {
return true;
}
public boolean visit(JsBlock x, JsContext ctx) {
return true;
}
public boolean visit(JsLiteral.JsBooleanLiteral x, JsContext ctx) {
return true;
}
public boolean visit(JsBreak x, JsContext ctx) {
return true;
}
public boolean visit(JsCase x, JsContext ctx) {
return true;
}
public boolean visit(JsCatch x, JsContext ctx) {
return true;
}
public boolean visit(JsConditional x, JsContext ctx) {
return true;
}
public boolean visit(JsContinue x, JsContext ctx) {
return true;
}
public boolean visit(JsDebugger x, JsContext ctx) {
return true;
}
public boolean visit(JsDefault x, JsContext ctx) {
return true;
}
public boolean visit(JsDoWhile x, JsContext ctx) {
return true;
}
public boolean visit(JsEmpty x, JsContext ctx) {
return true;
}
public boolean visit(JsExprStmt x, JsContext ctx) {
return true;
}
public boolean visit(JsFor x, JsContext ctx) {
return true;
}
public boolean visit(JsForIn x, JsContext ctx) {
return true;
}
public boolean visit(JsFunction x, JsContext ctx) {
return true;
}
public boolean visit(JsIf x, JsContext ctx) {
return true;
}
public boolean visit(JsInvocation x, JsContext ctx) {
return true;
}
public boolean visit(JsLabel x, JsContext ctx) {
return true;
}
public boolean visit(JsNameRef x, JsContext ctx) {
return true;
}
public boolean visit(JsNew x, JsContext ctx) {
return true;
}
public boolean visit(JsNullLiteral x, JsContext ctx) {
return true;
}
public boolean visit(JsNumberLiteral.JsIntLiteral x, JsContext ctx) {
return true;
}
public boolean visit(JsNumberLiteral.JsDoubleLiteral x, JsContext ctx) {
return true;
}
public boolean visit(JsObjectLiteral x, JsContext ctx) {
return true;
}
public boolean visit(JsParameter x, JsContext ctx) {
return true;
}
public boolean visit(JsPostfixOperation x, JsContext ctx) {
return true;
}
public boolean visit(JsPrefixOperation x, JsContext ctx) {
return true;
}
public boolean visit(JsProgram x, JsContext ctx) {
return true;
}
public boolean visit(JsProgramFragment x, JsContext ctx) {
return true;
}
public boolean visit(JsPropertyInitializer x, JsContext ctx) {
return true;
}
public boolean visit(JsRegExp x, JsContext ctx) {
return true;
}
public boolean visit(JsReturn x, JsContext ctx) {
return true;
}
public boolean visit(JsStringLiteral x, JsContext ctx) {
return true;
}
public boolean visit(JsSwitch x, JsContext ctx) {
return true;
}
public boolean visit(JsLiteral.JsThisRef x, JsContext ctx) {
return true;
}
public boolean visit(JsThrow x, JsContext ctx) {
return true;
}
public boolean visit(JsTry x, JsContext ctx) {
return true;
}
public boolean visit(JsVar x, JsContext ctx) {
return true;
}
public boolean visit(JsVars x, JsContext ctx) {
return true;
}
public boolean visit(JsWhile x, JsContext ctx) {
return true;
}
protected <T extends JsVisitable> T doAccept(T node) {
doTraverse(node, UNMODIFIABLE_CONTEXT);
return node;
}
protected <T extends JsVisitable> void doAcceptList(List<T> collection) {
for (T node : collection) {
doTraverse(node, UNMODIFIABLE_CONTEXT);
} }
}
protected JsExpression doAcceptLvalue(JsExpression expr) { public void endVisit(JsDebugger x, JsContext ctx) {
doTraverse(expr, LVALUE_CONTEXT);
return expr;
}
protected <T extends JsVisitable> void doAcceptWithInsertRemove(List<T> collection) {
for (T node : collection) {
doTraverse(node, UNMODIFIABLE_CONTEXT);
} }
}
protected void doTraverse(JsVisitable node, JsContext ctx) { public void endVisit(JsDefault x, JsContext ctx) {
node.traverse(this, ctx); }
}
public void endVisit(JsDoWhile x, JsContext ctx) {
}
public void endVisit(JsEmpty x, JsContext ctx) {
}
public void endVisit(JsExprStmt x, JsContext ctx) {
}
public void endVisit(JsFor x, JsContext ctx) {
}
public void endVisit(JsForIn x, JsContext ctx) {
}
public void endVisit(JsFunction x, JsContext ctx) {
}
public void endVisit(JsIf x, JsContext ctx) {
}
public void endVisit(JsInvocation x, JsContext ctx) {
}
public void endVisit(JsLabel x, JsContext ctx) {
}
public void endVisit(JsNameRef x, JsContext ctx) {
}
public void endVisit(JsNew x, JsContext ctx) {
}
public void endVisit(JsNullLiteral x, JsContext ctx) {
}
public void endVisit(JsNumberLiteral x, JsContext ctx) {
}
public void endVisit(JsObjectLiteral x, JsContext ctx) {
}
public void endVisit(JsParameter x, JsContext ctx) {
}
public void endVisit(JsPostfixOperation x, JsContext ctx) {
}
public void endVisit(JsPrefixOperation x, JsContext ctx) {
}
public void endVisit(JsProgram x, JsContext ctx) {
}
public void endVisit(JsProgramFragment x, JsContext ctx) {
}
public void endVisit(JsPropertyInitializer x, JsContext ctx) {
}
public void endVisit(JsRegExp x, JsContext ctx) {
}
public void endVisit(JsReturn x, JsContext ctx) {
}
public void endVisit(JsStringLiteral x, JsContext ctx) {
}
public void endVisit(JsSwitch x, JsContext ctx) {
}
public void endVisit(JsLiteral.JsThisRef x, JsContext ctx) {
}
public void endVisit(JsThrow x, JsContext ctx) {
}
public void endVisit(JsTry x, JsContext ctx) {
}
public void endVisit(JsVar x, JsContext ctx) {
}
public void endVisit(JsVars x, JsContext ctx) {
}
public void endVisit(JsWhile x, JsContext ctx) {
}
public boolean visit(JsArrayAccess x, JsContext ctx) {
return true;
}
public boolean visit(JsArrayLiteral x, JsContext ctx) {
return true;
}
public boolean visit(JsBinaryOperation x, JsContext ctx) {
return true;
}
public boolean visit(JsBlock x, JsContext ctx) {
return true;
}
public boolean visit(JsLiteral.JsBooleanLiteral x, JsContext ctx) {
return true;
}
public boolean visit(JsBreak x, JsContext ctx) {
return true;
}
public boolean visit(JsCase x, JsContext ctx) {
return true;
}
public boolean visit(JsCatch x, JsContext ctx) {
return true;
}
public boolean visit(JsConditional x, JsContext ctx) {
return true;
}
public boolean visit(JsContinue x, JsContext ctx) {
return true;
}
public boolean visit(JsDebugger x, JsContext ctx) {
return true;
}
public boolean visit(JsDefault x, JsContext ctx) {
return true;
}
public boolean visit(JsDoWhile x, JsContext ctx) {
return true;
}
public boolean visit(JsEmpty x, JsContext ctx) {
return true;
}
public boolean visit(JsExprStmt x, JsContext ctx) {
return true;
}
public boolean visit(JsFor x, JsContext ctx) {
return true;
}
public boolean visit(JsForIn x, JsContext ctx) {
return true;
}
public boolean visit(JsFunction x, JsContext ctx) {
return true;
}
public boolean visit(JsIf x, JsContext ctx) {
return true;
}
public boolean visit(JsInvocation x, JsContext ctx) {
return true;
}
public boolean visit(JsLabel x, JsContext ctx) {
return true;
}
public boolean visit(JsNameRef x, JsContext ctx) {
return true;
}
public boolean visit(JsNew x, JsContext ctx) {
return true;
}
public boolean visit(JsNullLiteral x, JsContext ctx) {
return true;
}
public boolean visit(JsNumberLiteral.JsIntLiteral x, JsContext ctx) {
return true;
}
public boolean visit(JsNumberLiteral.JsDoubleLiteral x, JsContext ctx) {
return true;
}
public boolean visit(JsObjectLiteral x, JsContext ctx) {
return true;
}
public boolean visit(JsParameter x, JsContext ctx) {
return true;
}
public boolean visit(JsPostfixOperation x, JsContext ctx) {
return true;
}
public boolean visit(JsPrefixOperation x, JsContext ctx) {
return true;
}
public boolean visit(JsProgram x, JsContext ctx) {
return true;
}
public boolean visit(JsProgramFragment x, JsContext ctx) {
return true;
}
public boolean visit(JsPropertyInitializer x, JsContext ctx) {
return true;
}
public boolean visit(JsRegExp x, JsContext ctx) {
return true;
}
public boolean visit(JsReturn x, JsContext ctx) {
return true;
}
public boolean visit(JsStringLiteral x, JsContext ctx) {
return true;
}
public boolean visit(JsSwitch x, JsContext ctx) {
return true;
}
public boolean visit(JsLiteral.JsThisRef x, JsContext ctx) {
return true;
}
public boolean visit(JsThrow x, JsContext ctx) {
return true;
}
public boolean visit(JsTry x, JsContext ctx) {
return true;
}
public boolean visit(JsVar x, JsContext ctx) {
return true;
}
public boolean visit(JsVars x, JsContext ctx) {
return true;
}
public boolean visit(JsWhile x, JsContext ctx) {
return true;
}
public boolean visit(JsDocComment x, JsContext context) {
return true;
}
protected <T extends JsVisitable> T doAccept(T node) {
doTraverse(node, UNMODIFIABLE_CONTEXT);
return node;
}
protected <T extends JsVisitable> void doAcceptList(List<T> collection) {
for (T node : collection) {
doTraverse(node, UNMODIFIABLE_CONTEXT);
}
}
protected JsExpression doAcceptLvalue(JsExpression expr) {
doTraverse(expr, LVALUE_CONTEXT);
return expr;
}
protected <T extends JsVisitable> void doAcceptWithInsertRemove(List<T> collection) {
for (T node : collection) {
doTraverse(node, UNMODIFIABLE_CONTEXT);
}
}
protected void doTraverse(JsVisitable node, JsContext ctx) {
node.traverse(this, ctx);
}
} }