Repository: flex-falcon Updated Branches: refs/heads/develop b1cd3bb7e -> 28398c9a6
Added indent field for emitting. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/93049a23 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/93049a23 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/93049a23 Branch: refs/heads/develop Commit: 93049a236a27fd4e1f3ed3e8b972e64985f5cdb1 Parents: b1cd3bb Author: Michael Schmalle <[email protected]> Authored: Sun Jun 14 10:57:37 2015 -0400 Committer: Michael Schmalle <[email protected]> Committed: Sun Jun 14 10:57:37 2015 -0400 ---------------------------------------------------------------------- .../externals/reference/BaseReference.java | 28 +++++++++++++------- .../externals/reference/ClassReference.java | 3 +++ .../externals/reference/ConstantReference.java | 8 +++--- .../externals/reference/FieldReference.java | 20 +++++++------- .../externals/reference/MethodReference.java | 6 ++--- 5 files changed, 41 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/93049a23/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java index 7bc7598..ec9c6ea 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java @@ -43,6 +43,8 @@ public abstract class BaseReference private ReferenceModel model; + protected String indent = " "; + public File getCurrentFile() { return currentFile; @@ -117,9 +119,11 @@ public abstract class BaseReference public void emitComment(StringBuilder sb) { - sb.append(" /**\n"); + sb.append(indent); + sb.append("/**\n"); emitCommentBody(sb); - sb.append(" */\n"); + sb.append(indent); + sb.append(" */\n"); } protected void emitCommentBody(StringBuilder sb) @@ -134,9 +138,10 @@ public abstract class BaseReference String blockDescription = getComment().getBlockDescription(); if (blockDescription != null) { - sb.append(" * "); - sb.append(blockDescription.replaceAll("\\n", "\n * ")); - sb.append("\n *\n"); + sb.append(indent); + sb.append(" * "); + sb.append(blockDescription.replaceAll("\\n", "\n" + indent + " * ")); + sb.append("\n " + indent + "*\n"); } } @@ -173,13 +178,15 @@ public abstract class BaseReference desc.append(" "); } - sb.append(" * @" + desc.toString() + "\n"); + sb.append(indent); + sb.append(" * @" + desc.toString() + "\n"); } } protected void emitSeeSourceFileName(StringBuilder sb) { - sb.append(" * @see " + getNode().getSourceFileName() + "\n"); + sb.append(indent); + sb.append(" * @see " + getNode().getSourceFileName() + "\n"); } public ExcludedMemeber isExcluded() @@ -207,7 +214,9 @@ public abstract class BaseReference paramName); String description = getComment().getDescriptionForParameter( paramName); - sb.append(" * @param "); + + sb.append(indent); + sb.append(" * @param "); sb.append(paramName); sb.append(" "); @@ -232,7 +241,8 @@ public abstract class BaseReference JSTypeExpression returnType = getComment().getReturnType(); if (returnType != null) { - sb.append(" * @returns "); + sb.append(indent); + sb.append(" * @returns "); sb.append("{"); sb.append(getModel().evaluate(returnType).toAnnotationString()); sb.append("} "); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/93049a23/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java index 015b234..08d333a 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java @@ -117,6 +117,8 @@ public class ClassReference extends BaseReference { super(model, node, qualfiedName, node.getJSDocInfo()); + indent = ""; + nameNode = null; functionNode = null; paramListNode = null; @@ -404,6 +406,7 @@ public class ClassReference extends BaseReference sb.append("\n"); emitImports(sb); + emitComment(sb); boolean isInterface = isInterface(); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/93049a23/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ConstantReference.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ConstantReference.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ConstantReference.java index bc364c6..e69f366 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ConstantReference.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ConstantReference.java @@ -81,12 +81,14 @@ public class ConstantReference extends BaseReference if (getQualifiedName().equals("undefined")) { - sb.append(" public const undefined:* = 0;\n"); + sb.append(indent); + sb.append("public const undefined:* = 0;\n"); } else { - sb.append(" public const " + getQualifiedName() + ":" + type - + " = " + value + ";\n"); + sb.append(indent); + sb.append("public const " + getQualifiedName() + ":" + type + " = " + + value + ";\n"); } sb.append("}\n"); // package http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/93049a23/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java index ca06781..8965c13 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java @@ -90,7 +90,6 @@ public class FieldReference extends MemberReference { emitAccessor(sb); } - } private void emitAccessor(StringBuilder sb) @@ -99,11 +98,12 @@ public class FieldReference extends MemberReference String isPublic = getClassReference().isInterface() ? "" : "public "; - sb.append(" " + isPublic + staticValue + "function get " - + getQualifiedName() + "():" + toReturnString() + ";\n"); - sb.append(" " + isPublic + staticValue + "function set " - + getQualifiedName() + "(" + toPrameterString() + "):void" - + ";\n"); + sb.append(indent); + sb.append(isPublic + staticValue + "function get " + getQualifiedName() + + "():" + toReturnString() + ";\n"); + sb.append(indent); + sb.append(isPublic + staticValue + "function set " + getQualifiedName() + + "(" + toPrameterString() + "):void" + ";\n"); } private void emitVar(StringBuilder sb) @@ -114,8 +114,9 @@ public class FieldReference extends MemberReference if (type.indexOf("|") != -1 || type.indexOf("?") != -1) type = "*"; - sb.append(" public " + staticValue + "var " + getQualifiedName() - + ":" + type + ";\n"); + sb.append(indent); + sb.append("public " + staticValue + "var " + getQualifiedName() + ":" + + type + ";\n"); } private String toTypeString() @@ -150,7 +151,8 @@ public class FieldReference extends MemberReference JSTypeExpression type = getComment().getType(); if (type != null) { - sb.append(" * @see JSType - "); + sb.append(indent); + sb.append(" * @see JSType - "); sb.append("["); sb.append(getModel().evaluate(type).toAnnotationString()); sb.append("] "); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/93049a23/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java index 59727a8..db4b2f7 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java @@ -140,7 +140,7 @@ public class MethodReference extends MemberReference braces = " { " + returns + " }"; } - sb.append(" "); + sb.append(indent); sb.append(publicModifier); sb.append(isOverride); sb.append(staticValue); @@ -159,7 +159,8 @@ public class MethodReference extends MemberReference { emitComment(sb); - sb.append(" native public function "); + sb.append(indent); + sb.append("native public function "); sb.append(getQualifiedName()); sb.append(toPrameterString()); sb.append(";"); @@ -193,5 +194,4 @@ public class MethodReference extends MemberReference { emitFunctionCommentBody(sb); } - }
