Code cleanup.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/1f72b545 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/1f72b545 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/1f72b545 Branch: refs/heads/develop Commit: 1f72b5451830c6d03acb52e618fff204b26543c6 Parents: 7fb7f27 Author: Michael Schmalle <[email protected]> Authored: Sat Jun 13 17:55:34 2015 -0400 Committer: Michael Schmalle <[email protected]> Committed: Sat Jun 13 17:56:22 2015 -0400 ---------------------------------------------------------------------- .../codegen/externals/TestTypeExternals.java | 2 +- .../codegen/externals/pass/AddMemberPass.java | 39 +------ .../externals/pass/ReferenceCompiler.java | 2 +- .../externals/reference/BaseReference.java | 23 ++-- .../externals/reference/ClassReference.java | 4 +- .../externals/reference/FieldReference.java | 4 +- .../externals/reference/MemberReference.java | 6 +- .../externals/reference/MethodReference.java | 2 +- .../externals/reference/ReferenceModel.java | 116 +++++++++---------- .../codegen/externals/utils/JSTypeUtils.java | 8 +- 10 files changed, 85 insertions(+), 121 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1f72b545/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestTypeExternals.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestTypeExternals.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestTypeExternals.java index 9a12ff7..a617a8e 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestTypeExternals.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestTypeExternals.java @@ -127,7 +127,7 @@ public class TestTypeExternals extends ExternalsTestBase JSDocInfo comment = model.getClassReference("Foo").getMethod(methodName).getComment(); JSTypeExpression parameterType = comment.getParameterType("arg1"); JSType jsType = parameterType.evaluate(null, - model.getCompiler().getTypeRegistry()); + model.getJSCompiler().getTypeRegistry()); return jsType; } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1f72b545/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/pass/AddMemberPass.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/pass/AddMemberPass.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/pass/AddMemberPass.java index 88ac9e5..4798ceb 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/pass/AddMemberPass.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/pass/AddMemberPass.java @@ -83,44 +83,7 @@ public class AddMemberPass extends AbstractCompilerPass visitGetProp(t, first); } } - } - - // JSDocInfo jsDoc = n.getJSDocInfo(); - // if (jsDoc != null) - // { - // if (n.isVar()) - // { - // // visitVar(t, n); - // } - // else if (n.isFunction()) - // { - // // visitFunction(t, n); - // } - // else if (n.isAssign()) - // { - // if (n.getFirstChild().isGetProp() - // && n.getLastChild().isFunction()) - // { - // // instance or static method - // visitMethod(t, n); - // } - // else - // { - // // DOMException.INDEX_SIZE_ERR = 1; - // // The first child of the assign is the GetProp node, - // // if later you need the value, either change this or check - // // for a parent assign node when creating the FieldReference - // // which the value would be n.getLastChild() - // // XXX visitStaticField(t, n); - // //System.err.println(n.toStringTree()); - // } - // } - // else if (n.isGetProp()) - // { - // visitGetProp(t, n); - // } - // } } // n == ASSIGN @@ -152,6 +115,7 @@ public class AddMemberPass extends AbstractCompilerPass } else if (n.getFirstChild().isName()) { + err("visitMethod() non impl"); log(n); } } @@ -183,5 +147,4 @@ public class AddMemberPass extends AbstractCompilerPass model.addStaticField(n, className, memberName); } } - } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1f72b545/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java index 39b74b5..e0d236a 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java @@ -85,7 +85,7 @@ public class ReferenceCompiler //compiler.setErrorManager(testErrorManager); jscompiler.initOptions(options); - model.setCompiler(jscompiler); + model.setJSCompiler(jscompiler); } public Result compile() throws IOException http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1f72b545/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 ee230ab..cbd1170 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 @@ -54,12 +54,6 @@ public abstract class BaseReference this.currentFile = currentFile; } - public String getCurrentFileBaseName() - { - return ""; - // return FilenameUtils.getBaseName(currentFile.getAbsolutePath()); - } - public String getBaseName() { return qualfiedName.substring(qualfiedName.lastIndexOf('.') + 1); @@ -105,7 +99,7 @@ public abstract class BaseReference public Compiler getCompiler() { - return model.getCompiler(); + return model.getJSCompiler(); } public ReferenceModel getModel() @@ -113,7 +107,8 @@ public abstract class BaseReference return model; } - public BaseReference(ReferenceModel model, Node node, String qualfiedName, JSDocInfo comment) + public BaseReference(ReferenceModel model, Node node, String qualfiedName, + JSDocInfo comment) { this.model = model; this.node = node; @@ -209,8 +204,10 @@ public abstract class BaseReference Set<String> parameterNames = getComment().getParameterNames(); for (String paramName : parameterNames) { - JSTypeExpression parameterType = getComment().getParameterType(paramName); - String description = getComment().getDescriptionForParameter(paramName); + JSTypeExpression parameterType = getComment().getParameterType( + paramName); + String description = getComment().getDescriptionForParameter( + paramName); sb.append(" * @param "); sb.append(paramName); @@ -219,7 +216,8 @@ public abstract class BaseReference if (parameterType != null) { sb.append("["); - sb.append(parameterType.evaluate(null, getModel().getCompiler().getTypeRegistry()).toAnnotationString()); + sb.append(parameterType.evaluate(null, + getModel().getJSCompiler().getTypeRegistry()).toAnnotationString()); sb.append("]"); sb.append(" "); } @@ -238,7 +236,8 @@ public abstract class BaseReference { sb.append(" * @returns "); sb.append("{"); - sb.append(returnType.evaluate(null, getModel().getCompiler().getTypeRegistry()).toAnnotationString()); + sb.append(returnType.evaluate(null, + getModel().getJSCompiler().getTypeRegistry()).toAnnotationString()); sb.append("} "); String description = getComment().getReturnDescription(); if (description != null) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1f72b545/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 3196261..27947bf 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 @@ -449,7 +449,7 @@ public class ClassReference extends BaseReference private void printSuperClass(StringBuilder sb) { sb.append("extends "); - String value = JSTypeUtils.toTypeJsType(getModel().getCompiler(), + String value = JSTypeUtils.toTypeJsType(getModel().getJSCompiler(), getComment().getBaseType()).toString(); sb.append(value); } @@ -581,7 +581,7 @@ public class ClassReference extends BaseReference if (baseType != null) { JSType jsType = baseType.evaluate(null, - getModel().getCompiler().getTypeRegistry()); + getModel().getJSCompiler().getTypeRegistry()); if (jsType != null) return getModel().getClassReference(jsType.getDisplayName()); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1f72b545/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 392538c..1a85ff4 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 @@ -52,7 +52,7 @@ public class FieldReference extends MemberReference public String toTypeAnnotationString() { JSType jsType = getComment().getType().evaluate(null, - getModel().getCompiler().getTypeRegistry()); + getModel().getJSCompiler().getTypeRegistry()); return jsType.toAnnotationString(); } @@ -153,7 +153,7 @@ public class FieldReference extends MemberReference sb.append(" * @see JSType - "); sb.append("["); sb.append(type.evaluate(null, - getModel().getCompiler().getTypeRegistry()).toAnnotationString()); + getModel().getJSCompiler().getTypeRegistry()).toAnnotationString()); sb.append("] "); String description = getComment().getReturnDescription(); if (description != null) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1f72b545/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java index 04759b6..b73afbe 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java @@ -34,7 +34,8 @@ public abstract class MemberReference extends BaseReference return classReference; } - public MemberReference(ReferenceModel model, ClassReference classReference, Node node, String name, JSDocInfo comment) + public MemberReference(ReferenceModel model, ClassReference classReference, + Node node, String name, JSDocInfo comment) { super(model, node, name, comment); this.classReference = classReference; @@ -43,7 +44,8 @@ public abstract class MemberReference extends BaseReference @Override public ExcludedMemeber isExcluded() { - return getClassReference().getModel().isExcludedMember(getClassReference(), this); + return getClassReference().getModel().isExcludedMember( + getClassReference(), this); } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1f72b545/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 93d5319..3c98137 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 @@ -58,7 +58,7 @@ public class MethodReference extends MemberReference public String toReturnTypeAnnotationString() { JSType jsType = getComment().getReturnType().evaluate(null, - getModel().getCompiler().getTypeRegistry()); + getModel().getJSCompiler().getTypeRegistry()); return jsType.toAnnotationString(); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1f72b545/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java index 7c335f1..b4ea9dd 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java @@ -37,7 +37,7 @@ import com.google.javascript.rhino.jstype.JSType; public class ReferenceModel { private ExternCConfiguration configuration; - private Compiler compiler; + private Compiler jscompiler; private List<String> namespaces = new ArrayList<String>(); @@ -46,14 +46,14 @@ public class ReferenceModel private HashMap<String, FunctionReference> functions = new HashMap<String, FunctionReference>(); private HashMap<String, ConstantReference> constants = new HashMap<String, ConstantReference>(); - public Compiler getCompiler() + public Compiler getJSCompiler() { - return compiler; + return jscompiler; } - public void setCompiler(Compiler compiler) + public void setJSCompiler(Compiler compiler) { - this.compiler = compiler; + this.jscompiler = compiler; } public ExternCConfiguration getConfiguration() @@ -91,94 +91,94 @@ public class ReferenceModel this.configuration = config; } - public ClassReference getClassReference(String qName) + public ClassReference getClassReference(String qualifiedName) { - return classes.get(qName); + return classes.get(qualifiedName); } - public void addNamespace(Node node, String qName) + public void addNamespace(Node node, String qualifiedName) { - if (namespaces.contains(qName)) + if (namespaces.contains(qualifiedName)) { - // XXX Record warning; + err("Duplicate namesapce [" + qualifiedName + "]"); return; } - log("Model.addNamespace(" + qName + ")"); + log("Model.addNamespace(" + qualifiedName + ")"); - namespaces.add(qName); + namespaces.add(qualifiedName); } - public void addClass(Node node, String qName) + public void addClass(Node node, String qualifiedName) { - if (classes.containsKey(qName)) + if (classes.containsKey(qualifiedName)) { - // XXX Record warning; + err("Duplicate class [" + qualifiedName + "]"); return; } - log("Model.addClass(" + qName + ")"); + log("Model.addClass(" + qualifiedName + ")"); - ClassReference reference = new ClassReference(this, node, qName); - classes.put(qName, reference); + ClassReference reference = new ClassReference(this, node, qualifiedName); + classes.put(qualifiedName, reference); } - public void addTypeDef(Node node, String qName) + public void addTypeDef(Node node, String qualifiedName) { - if (typedefs.containsKey(qName)) + if (typedefs.containsKey(qualifiedName)) { - // XXX Record warning; + err("Duplicate @typedef [" + qualifiedName + "]"); return; } - log("Model.addTypeDef(" + qName + ")"); + log("Model.addTypeDef(" + qualifiedName + ")"); - ClassReference reference = new ClassReference(this, node, qName); - typedefs.put(qName, reference); + ClassReference reference = new ClassReference(this, node, qualifiedName); + typedefs.put(qualifiedName, reference); } - public void addInterface(Node node, String qName) + public void addInterface(Node node, String qualifiedName) { - if (classes.containsKey(qName)) + if (classes.containsKey(qualifiedName)) { - // XXX Record warning; + err("Duplicate @interface [" + qualifiedName + "]"); return; } - log("Model.addInterface(" + qName + ")"); + log("Model.addInterface(" + qualifiedName + ")"); - ClassReference reference = new ClassReference(this, node, qName); - classes.put(qName, reference); + ClassReference reference = new ClassReference(this, node, qualifiedName); + classes.put(qualifiedName, reference); } - public void addFinalClass(Node node, String qName) + public void addFinalClass(Node node, String qualifiedName) { - if (classes.containsKey(qName)) + if (classes.containsKey(qualifiedName)) { - // XXX Record warning; + err("Duplicate final class [" + qualifiedName + "]"); return; } - log("Model.addFinalClass(" + qName + ")"); + log("Model.addFinalClass(" + qualifiedName + ")"); - ClassReference reference = new ClassReference(this, node, qName); + ClassReference reference = new ClassReference(this, node, qualifiedName); reference.setFinal(true); - classes.put(qName, reference); + classes.put(qualifiedName, reference); } - public void addFunction(Node node, String qName) + public void addFunction(Node node, String qualifiedName) { - if (functions.containsKey(qName)) + if (functions.containsKey(qualifiedName)) { - // XXX Record warning; + err("Duplicate global function [" + qualifiedName + "]"); return; } - log("Model.addFunction(" + qName + ")"); - //System.err.println(node.toStringTree()); - FunctionReference reference = new FunctionReference(this, node, qName, - node.getJSDocInfo()); - functions.put(qName, reference); + log("Model.addFunction(" + qualifiedName + ")"); + + FunctionReference reference = new FunctionReference(this, node, + qualifiedName, node.getJSDocInfo()); + functions.put(qualifiedName, reference); } public boolean hasClass(String className) @@ -186,39 +186,39 @@ public class ReferenceModel return classes.containsKey(className); } - public boolean hasConstant(String qName) + public boolean hasConstant(String qualifiedName) { - return constants.containsKey(qName); + return constants.containsKey(qualifiedName); } - public void addConstant(Node node, String qName) + public void addConstant(Node node, String qualifiedName) { - if (constants.containsKey(qName)) + if (constants.containsKey(qualifiedName)) { // XXX Record warning; return; } - log("Model.addConstant(" + qName + ")"); + log("Model.addConstant(" + qualifiedName + ")"); - ConstantReference reference = new ConstantReference(this, node, qName, - node.getJSDocInfo()); - constants.put(qName, reference); + ConstantReference reference = new ConstantReference(this, node, + qualifiedName, node.getJSDocInfo()); + constants.put(qualifiedName, reference); } - public void addConstantType(Node node, String qName, JSType type) + public void addConstantType(Node node, String qualifiedName, JSType type) { - if (constants.containsKey(qName)) + if (constants.containsKey(qualifiedName)) { // XXX Record warning; return; } - log("Model.addConstantType(" + qName + ")"); + log("Model.addConstantType(" + qualifiedName + ")"); - ConstantReference reference = new ConstantReference(this, node, qName, - node.getJSDocInfo(), type); - constants.put(qName, reference); + ConstantReference reference = new ConstantReference(this, node, + qualifiedName, node.getJSDocInfo(), type); + constants.put(qualifiedName, reference); } public void addField(Node node, String className, String memberName) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1f72b545/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/utils/JSTypeUtils.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/utils/JSTypeUtils.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/utils/JSTypeUtils.java index 0f2288f..448ebbd 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/utils/JSTypeUtils.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/utils/JSTypeUtils.java @@ -40,7 +40,7 @@ public class JSTypeUtils if (paramType != null) { JSType jsType = JSTypeUtils.toParamJsType( - reference.getModel().getCompiler(), paramType); + reference.getModel().getJSCompiler(), paramType); //System.err.println(jsType); if (jsType != null) @@ -99,7 +99,7 @@ public class JSTypeUtils { JSTypeExpression typeExpression = reference.getComment().getType(); JSType jsType = typeExpression.evaluate(null, - reference.getModel().getCompiler().getTypeRegistry()); + reference.getModel().getJSCompiler().getTypeRegistry()); String type = jsType.toString(); type = TypeUtils.transformParamType(type); return type; @@ -113,7 +113,7 @@ public class JSTypeUtils if (returnType != null) { JSType jsType = JSTypeUtils.toReturnJsType( - reference.getModel().getCompiler(), returnType); + reference.getModel().getJSCompiler(), returnType); //System.err.println(jsType); if (jsType != null) @@ -163,7 +163,7 @@ public class JSTypeUtils if (ttype != null) { JSType jsType = JSTypeUtils.toTypeJsType( - reference.getModel().getCompiler(), ttype); + reference.getModel().getJSCompiler(), ttype); //System.err.println(jsType); if (jsType != null)
