Re-organize AST files.

lib/src/ast/css.dart

@@ -0,0 +1,13 @@
+// Copyright 2016 Google Inc. Use of this source code is governed by an
+// MIT-style license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+export 'css/at_rule.dart';
+export 'css/comment.dart';
+export 'css/declaration.dart';
+export 'css/media_query.dart';
+export 'css/media_rule.dart';
+export 'css/node.dart';
+export 'css/style_rule.dart';
+export 'css/stylesheet.dart';
+export 'css/value.dart';

lib/src/ast/css/media_query.dart

@@ -6,7 +6,7 @@ import 'package:source_span/source_span.dart';
 
 import '../../utils.dart';
 import '../node.dart';
-import 'node.dart';
+import 'value.dart';
 
 class CssMediaQuery implements AstNode {
   final CssValue<String> modifier;

lib/src/ast/css/media_rule.dart

@@ -5,6 +5,7 @@
 import 'package:source_span/source_span.dart';
 
 import '../../visitor/interface/css.dart';
+import 'media_query.dart';
 import 'node.dart';
 
 class CssMediaRule extends CssParentNode {

lib/src/ast/css/node.dart

@@ -7,15 +7,6 @@ import 'dart:collection';
 import '../../visitor/interface/css.dart';
 import '../node.dart';
 
-export 'at_rule.dart';
-export 'comment.dart';
-export 'declaration.dart';
-export 'media_query.dart';
-export 'media_rule.dart';
-export 'style_rule.dart';
-export 'stylesheet.dart';
-export 'value.dart';
-
 abstract class CssNode extends AstNode {
   CssParentNode get parent => _parent;
   CssParentNode _parent;

lib/src/ast/sass.dart

@@ -0,0 +1,37 @@
+// Copyright 2016 Google Inc. Use of this source code is governed by an
+// MIT-style license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+export 'sass/argument.dart';
+export 'sass/argument_declaration.dart';
+export 'sass/argument_invocation.dart';
+export 'sass/callable_declaration.dart';
+export 'sass/callable_invocation.dart';
+export 'sass/expression.dart';
+export 'sass/expression/boolean.dart';
+export 'sass/expression/color.dart';
+export 'sass/expression/function.dart';
+export 'sass/expression/identifier.dart';
+export 'sass/expression/list.dart';
+export 'sass/expression/map.dart';
+export 'sass/expression/number.dart';
+export 'sass/expression/string.dart';
+export 'sass/expression/unary_operator.dart';
+export 'sass/expression/variable.dart';
+export 'sass/interpolation.dart';
+export 'sass/media_query.dart';
+export 'sass/node.dart';
+export 'sass/statement.dart';
+export 'sass/statement/at_rule.dart';
+export 'sass/statement/comment.dart';
+export 'sass/statement/declaration.dart';
+export 'sass/statement/extend_rule.dart';
+export 'sass/statement/function_declaration.dart';
+export 'sass/statement/include.dart';
+export 'sass/statement/media_rule.dart';
+export 'sass/statement/mixin_declaration.dart';
+export 'sass/statement/return.dart';
+export 'sass/statement/style_rule.dart';
+export 'sass/statement/stylesheet.dart';
+export 'sass/statement/variable_declaration.dart';
+

lib/src/ast/sass/callable_invocation.dart

@@ -4,7 +4,6 @@
 
 import 'argument_invocation.dart';
 import 'node.dart';
-import 'statement.dart';
 
 abstract class CallableInvocation implements SassNode {
   ArgumentInvocation get arguments;

lib/src/ast/sass/expression.dart

@@ -5,17 +5,6 @@
 import '../../visitor/interface/expression.dart';
 import 'node.dart';
 
-export 'expression/boolean.dart';
-export 'expression/color.dart';
-export 'expression/function.dart';
-export 'expression/identifier.dart';
-export 'expression/list.dart';
-export 'expression/map.dart';
-export 'expression/number.dart';
-export 'expression/string.dart';
-export 'expression/unary_operator.dart';
-export 'expression/variable.dart';
-
 abstract class Expression implements SassNode {
   /*=T*/ accept/*<T>*/(ExpressionVisitor/*<T>*/ visitor);
 }

lib/src/ast/sass/expression/argument_list.dart

@@ -1,15 +0,0 @@
-// Copyright 2016 Google Inc. Use of this source code is governed by an
-// MIT-style license that can be found in the LICENSE file or at
-// https://opensource.org/licenses/MIT.
-
-import 'package:charcode/charcode.dart';
-import 'package:source_span/source_span.dart';
-
-import '../../../utils.dart';
-import '../../../value/list.dart';
-import '../../../visitor/interface/expression.dart';
-import '../expression.dart';
-
-class ArgumentInvocation {
-  
-}

lib/src/ast/sass/expression/function.dart

@@ -7,7 +7,9 @@ import 'package:source_span/source_span.dart';
 import '../../../utils.dart';
 import '../../../visitor/interface/expression.dart';
 import '../expression.dart';
-import '../statement.dart';
+import '../argument_invocation.dart';
+import '../callable_invocation.dart';
+import '../interpolation.dart';
 
 class FunctionExpression implements Expression, CallableInvocation {
   final Interpolation name;

lib/src/ast/sass/expression/identifier.dart

@@ -6,7 +6,7 @@ import 'package:source_span/source_span.dart';
 
 import '../../../visitor/interface/expression.dart';
 import '../expression.dart';
-import '../statement.dart';
+import '../interpolation.dart';
 
 class IdentifierExpression implements Expression {
   final Interpolation text;

lib/src/ast/sass/expression/list.dart

@@ -6,9 +6,10 @@ import 'package:charcode/charcode.dart';
 import 'package:source_span/source_span.dart';
 
 import '../../../utils.dart';
-import '../../../value/list.dart';
+import '../../../value.dart';
 import '../../../visitor/interface/expression.dart';
 import '../expression.dart';
+import 'unary_operator.dart';
 
 class ListExpression implements Expression {
   final List<Expression> contents;

lib/src/ast/sass/expression/string.dart

@@ -9,7 +9,7 @@ import '../../../interpolation_buffer.dart';
 import '../../../util/character.dart';
 import '../../../visitor/interface/expression.dart';
 import '../expression.dart';
-import '../statement.dart';
+import '../interpolation.dart';
 
 class StringExpression implements Expression {
   /// Interpolation that, when evaluated, produces the semantic content of the

lib/src/ast/sass/media_query.dart

@@ -6,8 +6,8 @@ import 'package:source_span/source_span.dart';
 
 import '../../utils.dart';
 import '../node.dart';
+import 'interpolation.dart';
 import 'node.dart';
-import 'statement.dart';
 
 class MediaQuery implements SassNode {
   final Interpolation modifier;

lib/src/ast/sass/statement.dart

@@ -5,26 +5,6 @@
 import '../../visitor/interface/statement.dart';
 import 'node.dart';
 
-export 'at_rule.dart';
-export 'argument_declaration.dart';
-export 'argument_invocation.dart';
-export 'argument.dart';
-export 'callable_declaration.dart';
-export 'callable_invocation.dart';
-export 'comment.dart';
-export 'declaration.dart';
-export 'extend_rule.dart';
-export 'function_declaration.dart';
-export 'include.dart';
-export 'interpolation.dart';
-export 'media_query.dart';
-export 'media_rule.dart';
-export 'mixin_declaration.dart';
-export 'return.dart';
-export 'style_rule.dart';
-export 'stylesheet.dart';
-export 'variable_declaration.dart';
-
 abstract class Statement implements SassNode {
   /*=T*/ accept/*<T>*/(StatementVisitor/*<T>*/ visitor);
 }

lib/src/ast/sass/statement/at_rule.dart

@@ -4,8 +4,9 @@
 
 import 'package:source_span/source_span.dart';
 
-import '../../visitor/interface/statement.dart';
-import 'statement.dart';
+import '../../../visitor/interface/statement.dart';
+import '../interpolation.dart';
+import '../statement.dart';
 
 class AtRule implements Statement {
   final String name;

lib/src/ast/sass/statement/comment.dart

@@ -4,8 +4,8 @@
 
 import 'package:source_span/source_span.dart';
 
-import '../../visitor/interface/statement.dart';
-import 'statement.dart';
+import '../../../visitor/interface/statement.dart';
+import '../statement.dart';
 
 class Comment implements Statement {
   final String text;

lib/src/ast/sass/statement/declaration.dart

@@ -4,9 +4,10 @@
 
 import 'package:source_span/source_span.dart';
 
-import '../../visitor/interface/statement.dart';
-import 'expression.dart';
-import 'statement.dart';
+import '../../../visitor/interface/statement.dart';
+import '../expression.dart';
+import '../interpolation.dart';
+import '../statement.dart';
 
 class Declaration implements Statement {
   final Interpolation name;

lib/src/ast/sass/statement/extend_rule.dart

@@ -4,8 +4,9 @@
 
 import 'package:source_span/source_span.dart';
 
-import '../../visitor/interface/statement.dart';
-import 'statement.dart';
+import '../../../visitor/interface/statement.dart';
+import '../interpolation.dart';
+import '../statement.dart';
 
 class ExtendRule implements Statement {
   final Interpolation selector;

lib/src/ast/sass/statement/function_declaration.dart

@@ -4,9 +4,10 @@
 
 import 'package:source_span/source_span.dart';
 
-import '../../visitor/interface/statement.dart';
-import 'argument_declaration.dart';
-import 'statement.dart';
+import '../../../visitor/interface/statement.dart';
+import '../argument_declaration.dart';
+import '../callable_declaration.dart';
+import '../statement.dart';
 
 class FunctionDeclaration extends CallableDeclaration {
   FunctionDeclaration(String name, ArgumentDeclaration arguments,

lib/src/ast/sass/statement/include.dart

@@ -4,9 +4,10 @@
 
 import 'package:source_span/source_span.dart';
 
-import '../../visitor/interface/statement.dart';
-import 'argument_invocation.dart';
-import 'statement.dart';
+import '../../../visitor/interface/statement.dart';
+import '../argument_invocation.dart';
+import '../callable_invocation.dart';
+import '../statement.dart';
 
 class Include implements Statement, CallableInvocation {
   final String name;

lib/src/ast/sass/statement/media_rule.dart

@@ -4,8 +4,9 @@
 
 import 'package:source_span/source_span.dart';
 
-import '../../visitor/interface/statement.dart';
-import 'statement.dart';
+import '../../../visitor/interface/statement.dart';
+import '../media_query.dart';
+import '../statement.dart';
 
 class MediaRule implements Statement {
   final List<MediaQuery> queries;

lib/src/ast/sass/statement/mixin_declaration.dart

@@ -4,9 +4,10 @@
 
 import 'package:source_span/source_span.dart';
 
-import '../../visitor/interface/statement.dart';
-import 'argument_declaration.dart';
-import 'statement.dart';
+import '../../../visitor/interface/statement.dart';
+import '../callable_declaration.dart';
+import '../argument_declaration.dart';
+import '../statement.dart';
 
 class MixinDeclaration extends CallableDeclaration {
   MixinDeclaration(String name, ArgumentDeclaration arguments,

lib/src/ast/sass/statement/return.dart

@@ -4,9 +4,9 @@
 
 import 'package:source_span/source_span.dart';
 
-import '../../visitor/interface/statement.dart';
-import 'expression.dart';
-import 'statement.dart';
+import '../../../visitor/interface/statement.dart';
+import '../expression.dart';
+import '../statement.dart';
 
 class Return implements Statement {
   final Expression expression;

lib/src/ast/sass/statement/style_rule.dart

@@ -4,8 +4,9 @@
 
 import 'package:source_span/source_span.dart';
 
-import '../../visitor/interface/statement.dart';
-import 'statement.dart';
+import '../../../visitor/interface/statement.dart';
+import '../interpolation.dart';
+import '../statement.dart';
 
 class StyleRule implements Statement {
   final Interpolation selector;

lib/src/ast/sass/statement/stylesheet.dart

@@ -4,8 +4,8 @@
 
 import 'package:source_span/source_span.dart';
 
-import '../../visitor/interface/statement.dart';
-import 'statement.dart';
+import '../../../visitor/interface/statement.dart';
+import '../statement.dart';
 
 class Stylesheet implements Statement {
   final List<Statement> children;

lib/src/ast/sass/statement/variable_declaration.dart

@@ -4,9 +4,9 @@
 
 import 'package:source_span/source_span.dart';
 
-import '../../visitor/interface/statement.dart';
-import 'expression.dart';
-import 'statement.dart';
+import '../../../visitor/interface/statement.dart';
+import '../expression.dart';
+import '../statement.dart';
 
 class VariableDeclaration implements Statement {
   final String name;

lib/src/callable.dart

@@ -2,7 +2,7 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-import 'ast/sass/statement.dart';
+import 'ast/sass.dart';
 
 export 'callable/built_in.dart';
 export 'callable/user_defined.dart';

lib/src/callable/built_in.dart

@@ -2,7 +2,7 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-import '../ast/sass/statement.dart';
+import '../ast/sass.dart';
 import '../callable.dart';
 import '../value.dart';
 

lib/src/callable/user_defined.dart

@@ -2,7 +2,7 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-import '../ast/sass/statement.dart';
+import '../ast/sass.dart';
 import '../callable.dart';
 import '../environment.dart';
 

lib/src/extend/extender.dart

@@ -8,7 +8,7 @@ import 'dart:math' as math;
 import 'package:collection/collection.dart';
 import 'package:source_span/source_span.dart';
 
-import '../ast/css/node.dart';
+import '../ast/css.dart';
 import '../ast/selector.dart';
 import '../utils.dart';
 import 'functions.dart';

lib/src/functions.dart

@@ -2,7 +2,7 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-import 'ast/sass/statement.dart';
+import 'ast/sass.dart';
 import 'callable.dart';
 import 'environment.dart';
 import 'value.dart';

lib/src/interpolation_buffer.dart

@@ -4,8 +4,7 @@
 
 import 'package:source_span/source_span.dart';
 
-import 'ast/sass/expression.dart';
-import 'ast/sass/statement.dart';
+import 'ast/sass.dart';
 
 class InterpolationBuffer implements StringSink {
   final _text = new StringBuffer();

lib/src/parser.dart

@@ -7,8 +7,7 @@ import 'dart:math' as math;
 import 'package:charcode/charcode.dart';
 import 'package:string_scanner/string_scanner.dart';
 
-import 'ast/sass/expression.dart';
-import 'ast/sass/statement.dart';
+import 'ast/sass.dart';
 import 'ast/selector.dart';
 import 'interpolation_buffer.dart';
 import 'util/character.dart';

lib/src/utils.dart

@@ -10,7 +10,7 @@ import 'package:collection/collection.dart';
 import 'package:source_span/source_span.dart';
 
 import 'ast/node.dart';
-import 'value/number.dart';
+import 'value.dart';
 
 const _epsilon = 1 / (10 * SassNumber.precision);
 

lib/src/visitor/interface/css.dart

@@ -2,7 +2,7 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-import '../../ast/css/node.dart';
+import '../../ast/css.dart';
 import 'selector.dart';
 import 'value.dart';
 

lib/src/visitor/interface/expression.dart

@@ -2,8 +2,7 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-import '../../ast/sass/expression.dart';
-import '../../ast/sass/statement.dart';
+import '../../ast/sass.dart';
 
 abstract class ExpressionVisitor<T> {
   T visitVariableExpression(VariableExpression node) => null;

lib/src/visitor/interface/statement.dart

@@ -2,7 +2,7 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-import '../../ast/sass/statement.dart';
+import '../../ast/sass.dart';
 
 abstract class StatementVisitor<T> {
   T visitComment(Comment node) => null;

lib/src/visitor/perform.dart

@@ -6,9 +6,8 @@ import 'dart:math' as math;
 
 import 'package:source_span/source_span.dart';
 
-import '../ast/css/node.dart';
-import '../ast/sass/expression.dart';
-import '../ast/sass/statement.dart';
+import '../ast/css.dart';
+import '../ast/sass.dart';
 import '../ast/selector.dart';
 import '../callable.dart';
 import '../environment.dart';

lib/src/visitor/serialize.dart

@@ -7,7 +7,7 @@ import 'dart:math' as math;
 import 'package:charcode/charcode.dart';
 import 'package:string_scanner/string_scanner.dart';
 
-import '../ast/css/node.dart';
+import '../ast/css.dart';
 import '../ast/selector.dart';
 import '../util/character.dart';
 import '../value.dart';