split code into modules and lots of other code changes

.idea/modules.xml

@@ -6,7 +6,9 @@
       <module fileurl="file://$PROJECT_DIR$/../Kotlin/jet/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/../Kotlin/jet/compiler/frontend/frontend.iml" />
       <module fileurl="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend.java/frontend.java.iml" />
       <module fileurl="file://$PROJECT_DIR$/../Kotlin/jet/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/../Kotlin/jet/compiler/frontend.java/frontend.java.iml" />
+      <module fileurl="file://$PROJECT_DIR$/js/js.iml" filepath="$PROJECT_DIR$/js/js.iml" />
       <module fileurl="file://$PROJECT_DIR$/k2js.iml" filepath="$PROJECT_DIR$/k2js.iml" />
+      <module fileurl="file://$PROJECT_DIR$/translator/translator.iml" filepath="$PROJECT_DIR$/translator/translator.iml" />
     </modules>
   </component>
 </project>

js/js.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+

js/src/compiler/InternalCompilerException.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler;
+package compiler;
 
 /**
  * Exception thrown when the compiler encounters an unexpected internal error.

js/src/compiler/Source.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler;
+package compiler;
 
 import java.io.IOException;
 import java.io.Reader;

js/src/compiler/backend/js/Cloner.java

@@ -24,10 +24,10 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-package com.google.dart.compiler.backend.js;
+package compiler.backend.js;
 
-import com.google.dart.compiler.InternalCompilerException;
+import compiler.InternalCompilerException;
-import com.google.dart.compiler.backend.js.ast.*;
+import compiler.backend.js.ast.*;
 
 import java.util.ArrayList;
 import java.util.List;

js/src/compiler/backend/js/JsConstructExpressionVisitor.java

@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js;
+package compiler.backend.js;
 
-import com.google.dart.compiler.backend.js.ast.*;
+import compiler.backend.js.ast.*;
 
 /**
  * Searches for method invocations in constructor expressions that would not

js/src/compiler/backend/js/JsFirstExpressionVisitor.java

@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js;
+package compiler.backend.js;
 
-import com.google.dart.compiler.backend.js.ast.*;
+import compiler.backend.js.ast.*;
 
 /**
  * Determines if an expression statement needs to be surrounded by parentheses.

js/src/compiler/backend/js/JsNamer.java

@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js;
+package compiler.backend.js;
 
-import com.google.dart.compiler.backend.js.ast.JsProgram;
+import compiler.backend.js.ast.JsProgram;
 
 /**
  * A namer runs through a program and renames the short names of JsNames.

js/src/compiler/backend/js/JsNormalizer.java

@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js;
+package compiler.backend.js;
 
-import com.google.dart.compiler.backend.js.ast.*;
+import compiler.backend.js.ast.*;
 
 /**
  * Fixes any semantic errors introduced by JS AST gen.

js/src/compiler/backend/js/JsParserException.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js;
+package compiler.backend.js;
 
 /**
  * Indicates inability to parse JavaScript source.

js/src/compiler/backend/js/JsPrecedenceVisitor.java

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js;
+package compiler.backend.js;
 
-import com.google.dart.compiler.backend.js.ast.*;
+import compiler.backend.js.ast.JsVars.JsVar;
-import com.google.dart.compiler.backend.js.ast.JsVars.JsVar;
+import compiler.backend.js.ast.*;
 
 /**
  * Precedence indices from "JavaScript - The Definitive Guide" 4th Edition (page

js/src/compiler/backend/js/JsPrettyNamer.java

@@ -2,12 +2,12 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js;
+package compiler.backend.js;
 
-import com.google.dart.compiler.backend.js.ast.JsName;
+import compiler.backend.js.ast.JsName;
-import com.google.dart.compiler.backend.js.ast.JsProgram;
+import compiler.backend.js.ast.JsProgram;
-import com.google.dart.compiler.backend.js.ast.JsRootScope;
+import compiler.backend.js.ast.JsRootScope;
-import com.google.dart.compiler.backend.js.ast.JsScope;
+import compiler.backend.js.ast.JsScope;
 
 import java.util.*;
 

js/src/compiler/backend/js/JsRequiresSemiVisitor.java

@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js;
+package compiler.backend.js;
 
-import com.google.dart.compiler.backend.js.ast.*;
+import compiler.backend.js.ast.*;
 
 /**
  * Determines if a statement at the end of a block requires a semicolon.

js/src/compiler/backend/js/JsReservedIdentifiers.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js;
+package compiler.backend.js;
 
 import java.util.HashSet;
 import java.util.Set;

js/src/compiler/backend/js/JsSourceGenerationVisitor.java

@@ -2,13 +2,13 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js;
+package compiler.backend.js;
 
-import com.google.dart.compiler.backend.js.ast.JsBlock;
+import compiler.backend.js.ast.JsContext;
-import com.google.dart.compiler.backend.js.ast.JsContext;
+import compiler.backend.js.ast.JsProgramFragment;
-import com.google.dart.compiler.backend.js.ast.JsProgram;
+import compiler.util.TextOutput;
-import com.google.dart.compiler.backend.js.ast.JsProgramFragment;
+import compiler.backend.js.ast.JsBlock;
-import com.google.dart.compiler.util.TextOutput;
+import compiler.backend.js.ast.JsProgram;
 
 /**
  * Generates JavaScript source from an AST.

js/src/compiler/backend/js/JsToStringGenerationVisitor.java

@@ -2,11 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js;
+package compiler.backend.js;
 
-import com.google.dart.compiler.backend.js.ast.*;
+import compiler.util.TextOutput;
-import com.google.dart.compiler.backend.js.ast.JsVars.JsVar;
+import compiler.backend.js.ast.*;
-import com.google.dart.compiler.util.TextOutput;
 
 import java.util.*;
 import java.util.regex.Pattern;
@@ -880,7 +879,7 @@ public class JsToStringGenerationVisitor extends JsVisitor {
   }
 
   @Override
-  public boolean visit(JsVar x, JsContext ctx) {
+  public boolean visit(JsVars.JsVar x, JsContext ctx) {
     _nameOf(x);
     JsExpression initExpr = x.getInitExpr();
     if (initExpr != null) {
@@ -899,7 +898,7 @@ public class JsToStringGenerationVisitor extends JsVisitor {
     _var();
     _space();
     boolean sep = false;
-    for (JsVar var : x) {
+    for (JsVars.JsVar var : x) {
       sep = _sepCommaOptSpace(sep);
       accept(var);
     }

js/src/compiler/backend/js/UncheckedJsParserException.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js;
+package compiler.backend.js;
 
 /**
  *  An unchecked wrapper exception to interop with Rhino.

js/src/compiler/backend/js/ast/CanBooleanEval.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * An interface that describes the boolean evaluation of an expression.

js/src/compiler/backend/js/ast/HasArguments.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 import java.util.List;
 

js/src/compiler/backend/js/ast/HasCondition.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Implemented by JavaScript objects with conditional execution.

js/src/compiler/backend/js/ast/HasName.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Implemented by JavaScript objects that have a name.

js/src/compiler/backend/js/ast/JsArrayAccess.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents a javascript expression for array access.

js/src/compiler/backend/js/ast/JsArrayLiteral.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 import java.util.ArrayList;
 import java.util.List;

js/src/compiler/backend/js/ast/JsBinaryOperation.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents a JavaScript binary operation.

js/src/compiler/backend/js/ast/JsBinaryOperator.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents the operator in a JavaScript binary operation.

js/src/compiler/backend/js/ast/JsBlock.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 import java.util.ArrayList;
 import java.util.List;

js/src/compiler/backend/js/ast/JsBooleanLiteral.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents a JavaScript literal boolean expression.

js/src/compiler/backend/js/ast/JsBreak.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents the JavaScript break statement.

js/src/compiler/backend/js/ast/JsCase.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents the JavaScript case statement.

js/src/compiler/backend/js/ast/JsCatch.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents a JavaScript catch clause.

js/src/compiler/backend/js/ast/JsCatchScope.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

js/src/compiler/backend/js/ast/JsConditional.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents a JavaScript conditional expression.

js/src/compiler/backend/js/ast/JsContext.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * The context in which a JsNode visitation occurs. This represents the set of

js/src/compiler/backend/js/ast/JsContinue.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents the JavaScript continue statement.

js/src/compiler/backend/js/ast/JsDebugger.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents a JavaScript debugger statement.

js/src/compiler/backend/js/ast/JsDefault.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents the default option in a JavaScript swtich statement.

js/src/compiler/backend/js/ast/JsDoWhile.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents a JavaScript do..while statement.

js/src/compiler/backend/js/ast/JsEmpty.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents an empty statement in JavaScript.

js/src/compiler/backend/js/ast/JsExprStmt.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents a JavaScript expression statement.

js/src/compiler/backend/js/ast/JsExpression.java

@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
-import com.google.dart.compiler.common.SourceInfo;
+import compiler.common.SourceInfo;
 
 /**
  * An abstract base class for all JavaScript expressions.

js/src/compiler/backend/js/ast/JsFor.java

@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
-import com.google.dart.compiler.common.SourceInfo;
+import compiler.common.SourceInfo;
 
 /**
  * A <code>for</code> statement. If specified at all, the initializer part is

js/src/compiler/backend/js/ast/JsForIn.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents a JavaScript for..in statement.

js/src/compiler/backend/js/ast/JsFunction.java

@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
-import com.google.dart.compiler.common.SourceInfo;
+import compiler.common.SourceInfo;
 
 import java.util.ArrayList;
 import java.util.List;

js/src/compiler/backend/js/ast/JsGlobalBlock.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represnts a JavaScript block in the global scope.

js/src/compiler/backend/js/ast/JsIf.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents a JavaScript if statement.

js/src/compiler/backend/js/ast/JsInvocation.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 import java.util.ArrayList;
 import java.util.List;

js/src/compiler/backend/js/ast/JsLabel.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents a JavaScript label statement.

js/src/compiler/backend/js/ast/JsLiteral.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * A JavaScript string literal expression.

js/src/compiler/backend/js/ast/JsModVisitor.java

@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
-import com.google.dart.compiler.util.Hack;
+import compiler.util.Hack;
 
 import java.util.List;
 

js/src/compiler/backend/js/ast/JsName.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 import java.io.Serializable;
 
@@ -24,7 +24,7 @@ public class JsName implements Serializable {
   /**
    * @param ident the unmangled ident to use for this name
    */
-  public JsName(JsScope enclosing, String ident, String shortIdent, String originalName) {
+JsName(JsScope enclosing, String ident, String shortIdent, String originalName) {
     this.enclosing = enclosing;
     this.ident = ident;
     this.shortIdent = shortIdent;

js/src/compiler/backend/js/ast/JsNameRef.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents a JavaScript expression that references a name.

js/src/compiler/backend/js/ast/JsNew.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 import java.util.ArrayList;
 import java.util.List;

js/src/compiler/backend/js/ast/JsNode.java

@@ -1,13 +1,13 @@
 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
-import com.google.dart.compiler.backend.js.JsSourceGenerationVisitor;
+import compiler.backend.js.JsSourceGenerationVisitor;
-import com.google.dart.compiler.backend.js.JsToStringGenerationVisitor;
+import compiler.backend.js.JsToStringGenerationVisitor;
-import com.google.dart.compiler.common.AbstractNode;
+import compiler.common.AbstractNode;
-import com.google.dart.compiler.common.SourceInfo;
+import compiler.common.SourceInfo;
-import com.google.dart.compiler.util.DefaultTextOutput;
+import compiler.util.DefaultTextOutput;
 
 /**
  * Base class for all JS AST elements.

js/src/compiler/backend/js/ast/JsNullLiteral.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * A JavaScript null literal.

js/src/compiler/backend/js/ast/JsNumberLiteral.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Represents a JavaScript literal decimal expression.

js/src/compiler/backend/js/ast/JsObjectLiteral.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 import java.util.ArrayList;
 import java.util.List;

js/src/compiler/backend/js/ast/JsOperator.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * A JavaScript operator.

js/src/compiler/backend/js/ast/JsParameter.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * A JavaScript parameter.

js/src/compiler/backend/js/ast/JsPostfixOperation.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * A JavaScript postfix operation.

js/src/compiler/backend/js/ast/JsPrefixOperation.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * A JavaScript prefix operation.

js/src/compiler/backend/js/ast/JsProgram.java

@@ -2,7 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
+
+import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -156,7 +158,7 @@ public final class JsProgram extends JsNode {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
+  public void traverse(JsVisitor v, @Nullable JsContext ctx) {
     if (v.visit(this, ctx)) {
       for (JsProgramFragment fragment : fragments) {
         v.accept(fragment);

js/src/compiler/backend/js/ast/JsProgramFragment.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * One independently loadable fragment of a {@link JsProgram}.

js/src/compiler/backend/js/ast/JsPropertyInitializer.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Used in object literals to specify property values by name.

js/src/compiler/backend/js/ast/JsRegExp.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * A JavaScript regular expression.

js/src/compiler/backend/js/ast/JsReturn.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * A JavaScript return statement.

js/src/compiler/backend/js/ast/JsRootScope.java

@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
-import com.google.dart.compiler.backend.js.JsReservedIdentifiers;
+import compiler.backend.js.JsReservedIdentifiers;
 
 /**
  * The root scope is the parent of every scope. All identifiers in this scope

js/src/compiler/backend/js/ast/JsScope.java

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
-import com.google.dart.compiler.util.Lists;
+import compiler.util.Lists;
-import com.google.dart.compiler.util.Maps;
+import compiler.util.Maps;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -15,17 +15,17 @@ import java.util.Map;
 
 /**
  * A scope is a factory for creating and allocating
- * {@link com.google.dart.compiler.backend.js.ast.JsName}s. A JavaScript AST is
+ * {@link JsName}s. A JavaScript AST is
  * built in terms of abstract name objects without worrying about obfuscation,
  * keyword/identifier blacklisting, and so on.
  * <p/>
  * <p/>
  * <p/>
  * Scopes are associated with
- * {@link com.google.dart.compiler.backend.js.ast.JsFunction}s, but the two are
+ * {@link JsFunction}s, but the two are
  * not equivalent. Functions <i>have</i> scopes, but a scope does not
  * necessarily have an associated Function. Examples of this include the
- * {@link com.google.dart.compiler.backend.js.ast.JsRootScope} and synthetic
+ * {@link JsRootScope} and synthetic
  * scopes that might be created by a client.
  * <p/>
  * <p/>
@@ -34,7 +34,7 @@ import java.util.Map;
  * identifiers for names. Specifically, names in child scopes are chosen such
  * that they do not conflict with names in their parent scopes. The ultimate
  * parent is usually the global scope (see
- * {@link com.google.dart.compiler.backend.js.ast.JsProgram#getRootScope()}),
+ * {@link JsProgram#getRootScope()}),
  * but parentless scopes are useful for managing names that are always accessed
  * with a qualifier and could therefore never be confused with the global scope
  * hierarchy.

js/src/compiler/backend/js/ast/JsStatement.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Abstract base class for JavaScript statement objects.

js/src/compiler/backend/js/ast/JsStringLiteral.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * A JavaScript string literal expression.

js/src/compiler/backend/js/ast/JsSwitch.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 import java.util.ArrayList;
 import java.util.List;

js/src/compiler/backend/js/ast/JsSwitchMember.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 import java.util.ArrayList;
 import java.util.List;

js/src/compiler/backend/js/ast/JsThisRef.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * A JavaScript <code>this</code> reference.

js/src/compiler/backend/js/ast/JsThrow.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * A JavaScript <code>throw</code> statement.

js/src/compiler/backend/js/ast/JsTry.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 import java.util.ArrayList;
 import java.util.List;

js/src/compiler/backend/js/ast/JsUnaryOperation.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * A JavaScript prefix or postfix operation.

js/src/compiler/backend/js/ast/JsUnaryOperator.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * A JavaScript unary operator.

js/src/compiler/backend/js/ast/JsValueLiteral.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * A JavaScript string literal expression.

js/src/compiler/backend/js/ast/JsVars.java

@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
-import com.google.dart.compiler.common.SourceInfo;
+import compiler.common.SourceInfo;
 
 import java.util.ArrayList;
 import java.util.Iterator;

js/src/compiler/backend/js/ast/JsVisitable.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * Abstracts the idea that a class can be traversed.

js/src/compiler/backend/js/ast/JsVisitor.java

@@ -2,9 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
-
-import com.google.dart.compiler.backend.js.ast.JsVars.JsVar;
 
 import java.util.List;
 
@@ -227,7 +225,7 @@ public class JsVisitor {
   public void endVisit(JsTry x, JsContext ctx) {
   }
 
-  public void endVisit(JsVar x, JsContext ctx) {
+  public void endVisit(JsVars.JsVar x, JsContext ctx) {
   }
 
   public void endVisit(JsVars x, JsContext ctx) {
@@ -392,7 +390,7 @@ public class JsVisitor {
     return true;
   }
 
-  public boolean visit(JsVar x, JsContext ctx) {
+  public boolean visit(JsVars.JsVar x, JsContext ctx) {
     return true;
   }
 

js/src/compiler/backend/js/ast/JsWhile.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 /**
  * A JavaScript <code>while</code> statement.

js/src/compiler/backend/js/ast/NodeKind.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.backend.js.ast;
+package compiler.backend.js.ast;
 
 public enum NodeKind {
    ARRAY_ACCESS,

js/src/compiler/common/AbstractNode.java

@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.common;
+package compiler.common;
 
-import com.google.dart.compiler.Source;
+import compiler.Source;
 
 /**
  * Abstract base class for nodes that carry source information.

js/src/compiler/common/HasSourceInfo.java

@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.common;
+package compiler.common;
 
-import com.google.dart.compiler.Source;
+import compiler.Source;
 
 /**
  * Abstract view of a class that has source info.

js/src/compiler/common/Name.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.common;
+package compiler.common;
 
 import java.io.*;
 import java.nio.charset.Charset;

js/src/compiler/common/NameFactory.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.common;
+package compiler.common;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.MapMaker;

js/src/compiler/common/SourceInfo.java

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.common;
+package compiler.common;
-import com.google.dart.compiler.Source;
+import compiler.Source;
 
 import java.io.Serializable;
 

js/src/compiler/util/AbstractTextOutput.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.util;
+package compiler.util;
 
 import java.io.PrintWriter;
 import java.util.Arrays;

js/src/compiler/util/AstUtil.java

@@ -2,12 +2,12 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.util;
+package compiler.util;
 
-import com.google.dart.compiler.InternalCompilerException;
+import compiler.InternalCompilerException;
-import com.google.dart.compiler.backend.js.ast.*;
+import compiler.common.SourceInfo;
-import com.google.dart.compiler.backend.js.ast.JsVars.JsVar;
+import compiler.backend.js.ast.*;
-import com.google.dart.compiler.common.SourceInfo;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -125,7 +125,7 @@ public class AstUtil {
     }
 
     public static JsVars newVar(SourceInfo info, JsName name, JsExpression expr) {
-        JsVar var = new JsVar(name).setSourceRef(info);
+        JsVars.JsVar var = new JsVars.JsVar(name).setSourceRef(info);
         var.setInitExpr(expr);
         JsVars vars = new JsVars();
         vars.add(var);
@@ -133,7 +133,7 @@ public class AstUtil {
     }
 
     public static JsVars newVar(JsName name, JsExpression expr) {
-        JsVar var = new JsVar(name);
+        JsVars.JsVar var = new JsVars.JsVar(name);
         if (expr != null) {
             var.setInitExpr(expr);
         }
@@ -170,7 +170,7 @@ public class AstUtil {
     }
 
     public static JsFunction newFunction(
-            JsScope scope, JsName name, List<JsParameter> params, JsBlock body) {
+            JsScope scope, @Nullable JsName name, List<JsParameter> params, JsBlock body) {
         JsFunction fn = new JsFunction(scope);
         if (name != null) {
             fn.setName(name);
@@ -223,7 +223,7 @@ public class AstUtil {
     }
 
     public static JsNameRef nameref(SourceInfo src, JsName qualifier, String prop) {
-        return AstUtil.nameref(src, qualifier.makeRef().setSourceRef(src), prop);
+        return nameref(src, qualifier.makeRef().setSourceRef(src), prop);
     }
 
     public static JsNameRef nameref(SourceInfo src, JsExpression qualifier, String prop) {

js/src/compiler/util/DefaultTextOutput.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.util;
+package compiler.util;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

js/src/compiler/util/Hack.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.util;
+package compiler.util;
 
 /**
  * Utility to hack around untypable (or yet to be) code.

js/src/compiler/util/Lists.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.util;
+package compiler.util;
 
 import java.util.*;
 

js/src/compiler/util/Maps.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.util;
+package compiler.util;
 
 import java.util.Collections;
 import java.util.HashMap;

js/src/compiler/util/Paths.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.util;
+package compiler.util;
 
 import java.io.File;
 import java.net.URI;

js/src/compiler/util/TextOutput.java

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-package com.google.dart.compiler.util;
+package compiler.util;
 
 /**
  * Interface used for printing text output.