From fcaa696f02582e007708295091c8a0b09d6e39a3 Mon Sep 17 00:00:00 2001 From: Natalie Weizenbaum Date: Sat, 27 Aug 2016 16:12:17 -0700 Subject: [PATCH] Re-organize AST files. --- lib/src/ast/css.dart | 13 +++++++ lib/src/ast/css/media_query.dart | 2 +- lib/src/ast/css/media_rule.dart | 1 + lib/src/ast/css/node.dart | 9 ----- lib/src/ast/sass.dart | 37 +++++++++++++++++++ lib/src/ast/sass/callable_invocation.dart | 1 - lib/src/ast/sass/expression.dart | 11 ------ .../ast/sass/expression/argument_list.dart | 15 -------- lib/src/ast/sass/expression/function.dart | 4 +- lib/src/ast/sass/expression/identifier.dart | 2 +- lib/src/ast/sass/expression/list.dart | 3 +- lib/src/ast/sass/expression/string.dart | 2 +- lib/src/ast/sass/media_query.dart | 2 +- lib/src/ast/sass/statement.dart | 20 ---------- lib/src/ast/sass/{ => statement}/at_rule.dart | 5 ++- lib/src/ast/sass/{ => statement}/comment.dart | 4 +- .../ast/sass/{ => statement}/declaration.dart | 7 ++-- .../ast/sass/{ => statement}/extend_rule.dart | 5 ++- .../{ => statement}/function_declaration.dart | 7 ++-- lib/src/ast/sass/{ => statement}/include.dart | 7 ++-- .../ast/sass/{ => statement}/media_rule.dart | 5 ++- .../{ => statement}/mixin_declaration.dart | 7 ++-- lib/src/ast/sass/{ => statement}/return.dart | 6 +-- .../ast/sass/{ => statement}/style_rule.dart | 5 ++- .../ast/sass/{ => statement}/stylesheet.dart | 4 +- .../{ => statement}/variable_declaration.dart | 6 +-- lib/src/callable.dart | 2 +- lib/src/callable/built_in.dart | 2 +- lib/src/callable/user_defined.dart | 2 +- lib/src/extend/extender.dart | 2 +- lib/src/functions.dart | 2 +- lib/src/interpolation_buffer.dart | 3 +- lib/src/parser.dart | 3 +- lib/src/utils.dart | 2 +- lib/src/visitor/interface/css.dart | 2 +- lib/src/visitor/interface/expression.dart | 3 +- lib/src/visitor/interface/statement.dart | 2 +- lib/src/visitor/perform.dart | 5 +-- lib/src/visitor/serialize.dart | 2 +- 39 files changed, 112 insertions(+), 110 deletions(-) create mode 100644 lib/src/ast/css.dart create mode 100644 lib/src/ast/sass.dart delete mode 100644 lib/src/ast/sass/expression/argument_list.dart rename lib/src/ast/sass/{ => statement}/at_rule.dart (89%) rename lib/src/ast/sass/{ => statement}/comment.dart (87%) rename lib/src/ast/sass/{ => statement}/declaration.dart (82%) rename lib/src/ast/sass/{ => statement}/extend_rule.dart (81%) rename lib/src/ast/sass/{ => statement}/function_declaration.dart (80%) rename lib/src/ast/sass/{ => statement}/include.dart (83%) rename lib/src/ast/sass/{ => statement}/media_rule.dart (86%) rename lib/src/ast/sass/{ => statement}/mixin_declaration.dart (79%) rename lib/src/ast/sass/{ => statement}/return.dart (82%) rename lib/src/ast/sass/{ => statement}/style_rule.dart (86%) rename lib/src/ast/sass/{ => statement}/stylesheet.dart (87%) rename lib/src/ast/sass/{ => statement}/variable_declaration.dart (86%) diff --git a/lib/src/ast/css.dart b/lib/src/ast/css.dart new file mode 100644 index 00000000..fe975e5f --- /dev/null +++ b/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'; diff --git a/lib/src/ast/css/media_query.dart b/lib/src/ast/css/media_query.dart index f72f6a38..1ecd7e08 100644 --- a/lib/src/ast/css/media_query.dart +++ b/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 modifier; diff --git a/lib/src/ast/css/media_rule.dart b/lib/src/ast/css/media_rule.dart index 2808b5e1..c64e0281 100644 --- a/lib/src/ast/css/media_rule.dart +++ b/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 { diff --git a/lib/src/ast/css/node.dart b/lib/src/ast/css/node.dart index 91f93452..64f91ee6 100644 --- a/lib/src/ast/css/node.dart +++ b/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; diff --git a/lib/src/ast/sass.dart b/lib/src/ast/sass.dart new file mode 100644 index 00000000..08394793 --- /dev/null +++ b/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'; + diff --git a/lib/src/ast/sass/callable_invocation.dart b/lib/src/ast/sass/callable_invocation.dart index ca830a63..3e92783d 100644 --- a/lib/src/ast/sass/callable_invocation.dart +++ b/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; diff --git a/lib/src/ast/sass/expression.dart b/lib/src/ast/sass/expression.dart index d1590277..e0ce44c0 100644 --- a/lib/src/ast/sass/expression.dart +++ b/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/**/(ExpressionVisitor/**/ visitor); } \ No newline at end of file diff --git a/lib/src/ast/sass/expression/argument_list.dart b/lib/src/ast/sass/expression/argument_list.dart deleted file mode 100644 index f2a438b6..00000000 --- a/lib/src/ast/sass/expression/argument_list.dart +++ /dev/null @@ -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 { - -} diff --git a/lib/src/ast/sass/expression/function.dart b/lib/src/ast/sass/expression/function.dart index a3edf7b3..971935ce 100644 --- a/lib/src/ast/sass/expression/function.dart +++ b/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; diff --git a/lib/src/ast/sass/expression/identifier.dart b/lib/src/ast/sass/expression/identifier.dart index f170bf7e..69775803 100644 --- a/lib/src/ast/sass/expression/identifier.dart +++ b/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; diff --git a/lib/src/ast/sass/expression/list.dart b/lib/src/ast/sass/expression/list.dart index 17857ffb..14e2ebfe 100644 --- a/lib/src/ast/sass/expression/list.dart +++ b/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 contents; diff --git a/lib/src/ast/sass/expression/string.dart b/lib/src/ast/sass/expression/string.dart index 49c06229..1062ee6c 100644 --- a/lib/src/ast/sass/expression/string.dart +++ b/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 diff --git a/lib/src/ast/sass/media_query.dart b/lib/src/ast/sass/media_query.dart index dc4133a7..15d053fc 100644 --- a/lib/src/ast/sass/media_query.dart +++ b/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; diff --git a/lib/src/ast/sass/statement.dart b/lib/src/ast/sass/statement.dart index 21642b71..6f3afe83 100644 --- a/lib/src/ast/sass/statement.dart +++ b/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/**/(StatementVisitor/**/ visitor); } \ No newline at end of file diff --git a/lib/src/ast/sass/at_rule.dart b/lib/src/ast/sass/statement/at_rule.dart similarity index 89% rename from lib/src/ast/sass/at_rule.dart rename to lib/src/ast/sass/statement/at_rule.dart index 649beb44..1f7a31ef 100644 --- a/lib/src/ast/sass/at_rule.dart +++ b/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; diff --git a/lib/src/ast/sass/comment.dart b/lib/src/ast/sass/statement/comment.dart similarity index 87% rename from lib/src/ast/sass/comment.dart rename to lib/src/ast/sass/statement/comment.dart index ad2a9dac..4c70967a 100644 --- a/lib/src/ast/sass/comment.dart +++ b/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; diff --git a/lib/src/ast/sass/declaration.dart b/lib/src/ast/sass/statement/declaration.dart similarity index 82% rename from lib/src/ast/sass/declaration.dart rename to lib/src/ast/sass/statement/declaration.dart index c1ed2b45..0672ab6a 100644 --- a/lib/src/ast/sass/declaration.dart +++ b/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; diff --git a/lib/src/ast/sass/extend_rule.dart b/lib/src/ast/sass/statement/extend_rule.dart similarity index 81% rename from lib/src/ast/sass/extend_rule.dart rename to lib/src/ast/sass/statement/extend_rule.dart index e9e950f7..7211fb14 100644 --- a/lib/src/ast/sass/extend_rule.dart +++ b/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; diff --git a/lib/src/ast/sass/function_declaration.dart b/lib/src/ast/sass/statement/function_declaration.dart similarity index 80% rename from lib/src/ast/sass/function_declaration.dart rename to lib/src/ast/sass/statement/function_declaration.dart index 9d04e345..624e657b 100644 --- a/lib/src/ast/sass/function_declaration.dart +++ b/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, diff --git a/lib/src/ast/sass/include.dart b/lib/src/ast/sass/statement/include.dart similarity index 83% rename from lib/src/ast/sass/include.dart rename to lib/src/ast/sass/statement/include.dart index ad4a4d34..c3bf0901 100644 --- a/lib/src/ast/sass/include.dart +++ b/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; diff --git a/lib/src/ast/sass/media_rule.dart b/lib/src/ast/sass/statement/media_rule.dart similarity index 86% rename from lib/src/ast/sass/media_rule.dart rename to lib/src/ast/sass/statement/media_rule.dart index 4d67f25d..28453f57 100644 --- a/lib/src/ast/sass/media_rule.dart +++ b/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 queries; diff --git a/lib/src/ast/sass/mixin_declaration.dart b/lib/src/ast/sass/statement/mixin_declaration.dart similarity index 79% rename from lib/src/ast/sass/mixin_declaration.dart rename to lib/src/ast/sass/statement/mixin_declaration.dart index 4be3db64..5ed07f7b 100644 --- a/lib/src/ast/sass/mixin_declaration.dart +++ b/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, diff --git a/lib/src/ast/sass/return.dart b/lib/src/ast/sass/statement/return.dart similarity index 82% rename from lib/src/ast/sass/return.dart rename to lib/src/ast/sass/statement/return.dart index f13f671f..51e53aa2 100644 --- a/lib/src/ast/sass/return.dart +++ b/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; diff --git a/lib/src/ast/sass/style_rule.dart b/lib/src/ast/sass/statement/style_rule.dart similarity index 86% rename from lib/src/ast/sass/style_rule.dart rename to lib/src/ast/sass/statement/style_rule.dart index 14eef86c..4c00ec91 100644 --- a/lib/src/ast/sass/style_rule.dart +++ b/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; diff --git a/lib/src/ast/sass/stylesheet.dart b/lib/src/ast/sass/statement/stylesheet.dart similarity index 87% rename from lib/src/ast/sass/stylesheet.dart rename to lib/src/ast/sass/statement/stylesheet.dart index e7c3aff7..d3e428a8 100644 --- a/lib/src/ast/sass/stylesheet.dart +++ b/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 children; diff --git a/lib/src/ast/sass/variable_declaration.dart b/lib/src/ast/sass/statement/variable_declaration.dart similarity index 86% rename from lib/src/ast/sass/variable_declaration.dart rename to lib/src/ast/sass/statement/variable_declaration.dart index 1117d78d..2dcffb29 100644 --- a/lib/src/ast/sass/variable_declaration.dart +++ b/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; diff --git a/lib/src/callable.dart b/lib/src/callable.dart index ed350805..1046e6a4 100644 --- a/lib/src/callable.dart +++ b/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'; diff --git a/lib/src/callable/built_in.dart b/lib/src/callable/built_in.dart index 2cbf6db5..ba62d1d9 100644 --- a/lib/src/callable/built_in.dart +++ b/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'; diff --git a/lib/src/callable/user_defined.dart b/lib/src/callable/user_defined.dart index 2a9dbc07..b3e24548 100644 --- a/lib/src/callable/user_defined.dart +++ b/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'; diff --git a/lib/src/extend/extender.dart b/lib/src/extend/extender.dart index 1e16274a..1fa8e1c2 100644 --- a/lib/src/extend/extender.dart +++ b/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'; diff --git a/lib/src/functions.dart b/lib/src/functions.dart index a7c82b84..40a8bbf5 100644 --- a/lib/src/functions.dart +++ b/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'; diff --git a/lib/src/interpolation_buffer.dart b/lib/src/interpolation_buffer.dart index 43598370..e6ba9f6d 100644 --- a/lib/src/interpolation_buffer.dart +++ b/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(); diff --git a/lib/src/parser.dart b/lib/src/parser.dart index 5355798d..e5b30b22 100644 --- a/lib/src/parser.dart +++ b/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'; diff --git a/lib/src/utils.dart b/lib/src/utils.dart index 8dfc8a56..a0ce8322 100644 --- a/lib/src/utils.dart +++ b/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); diff --git a/lib/src/visitor/interface/css.dart b/lib/src/visitor/interface/css.dart index 84d37735..c7993ed6 100644 --- a/lib/src/visitor/interface/css.dart +++ b/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'; diff --git a/lib/src/visitor/interface/expression.dart b/lib/src/visitor/interface/expression.dart index 39ccd02f..9e29866b 100644 --- a/lib/src/visitor/interface/expression.dart +++ b/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 visitVariableExpression(VariableExpression node) => null; diff --git a/lib/src/visitor/interface/statement.dart b/lib/src/visitor/interface/statement.dart index 24077441..fcec4102 100644 --- a/lib/src/visitor/interface/statement.dart +++ b/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 visitComment(Comment node) => null; diff --git a/lib/src/visitor/perform.dart b/lib/src/visitor/perform.dart index 4befefa1..d58c3c47 100644 --- a/lib/src/visitor/perform.dart +++ b/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'; diff --git a/lib/src/visitor/serialize.dart b/lib/src/visitor/serialize.dart index 714666d6..b7816916 100644 --- a/lib/src/visitor/serialize.dart +++ b/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';