| Index: frog/tree.g.dart
|
| diff --git a/frog/tree.g.dart b/frog/tree.g.dart
|
| index d09726e78377692be5c28b9960538200df3dad82..28aeae455a284adeebf6d8ac8f9ce25968c6fa22 100644
|
| --- a/frog/tree.g.dart
|
| +++ b/frog/tree.g.dart
|
| @@ -360,21 +360,20 @@ class SuperExpression extends Expression {
|
| visit(TreeVisitor visitor) => visitor.visitSuperExpression(this);
|
| }
|
|
|
| -class NullExpression extends Expression {
|
| +class LiteralExpression extends Expression {
|
| + Value value;
|
|
|
| - NullExpression(SourceSpan span): super(span) {}
|
| + LiteralExpression(this.value, SourceSpan span): super(span) {}
|
|
|
| - visit(TreeVisitor visitor) => visitor.visitNullExpression(this);
|
| + visit(TreeVisitor visitor) => visitor.visitLiteralExpression(this);
|
| }
|
|
|
| -class LiteralExpression extends Expression {
|
| - var value;
|
| - TypeReference type;
|
| - String text;
|
| +class StringInterpExpression extends Expression {
|
| + List<Expression> pieces;
|
|
|
| - LiteralExpression(this.value, this.type, this.text, SourceSpan span): super(span) {}
|
| + StringInterpExpression(this.pieces, SourceSpan span): super(span) {}
|
|
|
| - visit(TreeVisitor visitor) => visitor.visitLiteralExpression(this);
|
| + visit(TreeVisitor visitor) => visitor.visitStringInterpExpression(this);
|
| }
|
|
|
| class NameTypeReference extends TypeReference {
|
| @@ -563,10 +562,10 @@ interface TreeVisitor {
|
|
|
| visitSuperExpression(SuperExpression node);
|
|
|
| - visitNullExpression(NullExpression node);
|
| -
|
| visitLiteralExpression(LiteralExpression node);
|
|
|
| + visitStringInterpExpression(StringInterpExpression node);
|
| +
|
| visitNameTypeReference(NameTypeReference node);
|
|
|
| visitGenericTypeReference(GenericTypeReference node);
|
| @@ -833,15 +832,13 @@ class TreePrinter implements TreeVisitor {
|
| output.heading('SuperExpression', node.span);
|
| }
|
|
|
| - void visitNullExpression(NullExpression node) {
|
| - output.heading('NullExpression', node.span);
|
| + void visitLiteralExpression(LiteralExpression node) {
|
| + output.heading('LiteralExpression(' + output.toValue(node.value) + ")", node.span);
|
| }
|
|
|
| - void visitLiteralExpression(LiteralExpression node) {
|
| - output.heading('LiteralExpression', node.span);
|
| - output.writeValue('value', node.value);
|
| - output.writeNode('type', node.type);
|
| - output.writeValue('text', node.text);
|
| + void visitStringInterpExpression(StringInterpExpression node) {
|
| + output.heading('StringInterpExpression', node.span);
|
| + output.writeNodeList('pieces', node.pieces);
|
| }
|
|
|
| void visitNameTypeReference(NameTypeReference node) {
|
|
|