Add parameters to Factory API, part 2

Change-Id: Ic60048d2adf7cf905e85f4154ee6646a8c0f9943
Reviewed-on: https://dart-review.googlesource.com/61301
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>

pkg/front_end/lib/src/fasta/kernel/factory.dart

@@ -51,7 +51,7 @@ abstract class Factory<Expression, Statement, Initializer, Type> {
       List<Statement> statements, Token rightBracket);
 
   Expression boolLiteral(ExpressionJudgment judgment, int fileOffset,
-      Token literal, DartType inferredType);
+      Token literal, bool value, DartType inferredType);
 
   Statement breakStatement(StatementJudgment judgment, int fileOffset,
       Token breakKeyword, Expression label, Token semicolon);
@@ -81,7 +81,11 @@ abstract class Factory<Expression, Statement, Initializer, Type> {
   Expression constructorInvocation(ExpressionJudgment judgment, int fileOffset,
       Node expressionTarget, DartType inferredType);
 
-  Statement continueSwitchStatement(StatementJudgment judgment, int fileOffset);
+  Statement continueStatement(StatementJudgment judgment, int fileOffset,
+      Token continueKeyword, Expression label, Token semicolon);
+
+  Statement continueSwitchStatement(StatementJudgment judgment, int fileOffset,
+      Token continueKeyword, Expression label, Token semicolon);
 
   Expression deferredCheck(
       ExpressionJudgment judgment, int fileOffset, DartType inferredType);
@@ -98,7 +102,7 @@ abstract class Factory<Expression, Statement, Initializer, Type> {
       Token semicolon);
 
   Expression doubleLiteral(ExpressionJudgment judgment, int fileOffset,
-      Token literal, DartType inferredType);
+      Token literal, double value, DartType inferredType);
 
   Statement expressionStatement(StatementJudgment judgment, int fileOffset,
       Expression expression, Token semicolon);
@@ -125,7 +129,12 @@ abstract class Factory<Expression, Statement, Initializer, Type> {
       ExpressionJudgment judgment, int fileOffset, DartType inferredType);
 
   Expression ifNull(
-      ExpressionJudgment judgment, int fileOffset, DartType inferredType);
+      ExpressionJudgment judgment,
+      int fileOffset,
+      Expression leftOperand,
+      Token operator,
+      Expression rightOperand,
+      DartType inferredType);
 
   Statement ifStatement(
       StatementJudgment judgment,
@@ -142,7 +151,7 @@ abstract class Factory<Expression, Statement, Initializer, Type> {
       Node writeMember, Node combiner, DartType inferredType);
 
   Expression intLiteral(ExpressionJudgment judgment, int fileOffset,
-      Token literal, DartType inferredType);
+      Token literal, num value, DartType inferredType);
 
   Initializer invalidInitializer(InitializerJudgment judgment, int fileOffset);
 
@@ -171,7 +180,12 @@ abstract class Factory<Expression, Statement, Initializer, Type> {
       ExpressionJudgment judgment, int fileOffset, DartType inferredType);
 
   Expression logicalExpression(
-      ExpressionJudgment judgment, int fileOffset, DartType inferredType);
+      ExpressionJudgment judgment,
+      int fileOffset,
+      Expression leftOperand,
+      Token operator,
+      Expression rightOperand,
+      DartType inferredType);
 
   Expression mapLiteral(
       ExpressionJudgment judgment, int fileOffset, DartType typeContext);
@@ -198,8 +212,8 @@ abstract class Factory<Expression, Statement, Initializer, Type> {
   Expression namedFunctionExpression(
       ExpressionJudgment judgment, int fileOffset, DartType inferredType);
 
-  Expression not(
-      ExpressionJudgment judgment, int fileOffset, DartType inferredType);
+  Expression not(ExpressionJudgment judgment, int fileOffset, Token operator,
+      Expression operand, DartType inferredType);
 
   Expression nullLiteral(ExpressionJudgment judgment, int fileOffset,
       Token literal, bool isSynthetic, DartType inferredType);
@@ -253,15 +267,20 @@ abstract class Factory<Expression, Statement, Initializer, Type> {
   Expression stringConcatenation(
       ExpressionJudgment judgment, int fileOffset, DartType inferredType);
 
-  Expression stringLiteral(
-      ExpressionJudgment judgment, int fileOffset, DartType inferredType);
+  Expression stringLiteral(ExpressionJudgment judgment, int fileOffset,
+      Token literal, String value, DartType inferredType);
 
   Initializer superInitializer(InitializerJudgment judgment, int fileOffset);
 
   Statement switchStatement(StatementJudgment judgment, int fileOffset);
 
   Expression symbolLiteral(
-      ExpressionJudgment judgment, int fileOffset, DartType inferredType);
+      ExpressionJudgment judgment,
+      int fileOffset,
+      Token poundSign,
+      List<Token> components,
+      String value,
+      DartType inferredType);
 
   Expression thisExpression(ExpressionJudgment judgment, int fileOffset,
       Token thisKeyword, DartType inferredType);

pkg/front_end/lib/src/fasta/kernel/kernel_factory.dart

@@ -77,7 +77,7 @@ class KernelFactory
 
   @override
   Expression boolLiteral(ExpressionJudgment judgment, int fileOffset,
-      Token literal, DartType inferredType) {
+      Token literal, bool value, DartType inferredType) {
     return judgment;
   }
 
@@ -125,8 +125,14 @@ class KernelFactory
   }
 
   @override
-  Statement continueSwitchStatement(
-      StatementJudgment judgment, int fileOffset) {
+  Statement continueStatement(StatementJudgment judgment, int fileOffset,
+      Token continueKeyword, Expression label, Token semicolon) {
+    return judgment;
+  }
+
+  @override
+  Statement continueSwitchStatement(StatementJudgment judgment, int fileOffset,
+      Token continueKeyword, Expression label, Token semicolon) {
     return judgment;
   }
 
@@ -152,7 +158,7 @@ class KernelFactory
 
   @override
   Expression doubleLiteral(ExpressionJudgment judgment, int fileOffset,
-      Token literal, DartType inferredType) {
+      Token literal, double value, DartType inferredType) {
     return judgment;
   }
 
@@ -200,7 +206,12 @@ class KernelFactory
 
   @override
   Expression ifNull(
-      ExpressionJudgment judgment, int fileOffset, DartType inferredType) {
+      ExpressionJudgment judgment,
+      int fileOffset,
+      Expression leftOperand,
+      Token operator,
+      Expression rightOperand,
+      DartType inferredType) {
     return judgment;
   }
 
@@ -226,7 +237,7 @@ class KernelFactory
 
   @override
   Expression intLiteral(ExpressionJudgment judgment, int fileOffset,
-      Token literal, DartType inferredType) {
+      Token literal, num value, DartType inferredType) {
     return judgment;
   }
 
@@ -273,7 +284,12 @@ class KernelFactory
 
   @override
   Expression logicalExpression(
-      ExpressionJudgment judgment, int fileOffset, DartType inferredType) {
+      ExpressionJudgment judgment,
+      int fileOffset,
+      Expression leftOperand,
+      Token operator,
+      Expression rightOperand,
+      DartType inferredType) {
     return judgment;
   }
 
@@ -315,8 +331,8 @@ class KernelFactory
   }
 
   @override
-  Expression not(
-      ExpressionJudgment judgment, int fileOffset, DartType inferredType) {
+  Expression not(ExpressionJudgment judgment, int fileOffset, Token operator,
+      Expression operand, DartType inferredType) {
     return judgment;
   }
 
@@ -415,8 +431,8 @@ class KernelFactory
   }
 
   @override
-  Expression stringLiteral(
-      ExpressionJudgment judgment, int fileOffset, DartType inferredType) {
+  Expression stringLiteral(ExpressionJudgment judgment, int fileOffset,
+      Token literal, String value, DartType inferredType) {
     return judgment;
   }
 
@@ -432,7 +448,12 @@ class KernelFactory
 
   @override
   Expression symbolLiteral(
-      ExpressionJudgment judgment, int fileOffset, DartType inferredType) {
+      ExpressionJudgment judgment,
+      int fileOffset,
+      Token poundSign,
+      List<Token> components,
+      String value,
+      DartType inferredType) {
     return judgment;
   }
 

pkg/front_end/lib/src/fasta/kernel/toplevel_inference_factory.dart

@@ -61,7 +61,7 @@ class ToplevelInferenceFactory implements Factory<void, void, void, void> {
 
   @override
   void boolLiteral(ExpressionJudgment judgment, int fileOffset, Token literal,
-      DartType inferredType) {}
+      bool value, DartType inferredType) {}
 
   @override
   void breakStatement(StatementJudgment judgment, int fileOffset,
@@ -99,7 +99,12 @@ class ToplevelInferenceFactory implements Factory<void, void, void, void> {
       Node expressionTarget, DartType inferredType) {}
 
   @override
-  void continueSwitchStatement(StatementJudgment judgment, int fileOffset) {}
+  void continueStatement(StatementJudgment judgment, int fileOffset,
+      Token continueKeyword, void label, Token semicolon) {}
+
+  @override
+  void continueSwitchStatement(StatementJudgment judgment, int fileOffset,
+      Token continueKeyword, void label, Token semicolon) {}
 
   @override
   void deferredCheck(
@@ -119,7 +124,7 @@ class ToplevelInferenceFactory implements Factory<void, void, void, void> {
 
   @override
   void doubleLiteral(ExpressionJudgment judgment, int fileOffset, Token literal,
-      DartType inferredType) {}
+      double value, DartType inferredType) {}
 
   @override
   void expressionStatement(StatementJudgment judgment, int fileOffset,
@@ -152,8 +157,8 @@ class ToplevelInferenceFactory implements Factory<void, void, void, void> {
       ExpressionJudgment judgment, int fileOffset, DartType inferredType) {}
 
   @override
-  void ifNull(
-      ExpressionJudgment judgment, int fileOffset, DartType inferredType) {}
+  void ifNull(ExpressionJudgment judgment, int fileOffset, void leftOperand,
+      Token operator, void rightOperand, DartType inferredType) {}
 
   @override
   void ifStatement(
@@ -173,7 +178,7 @@ class ToplevelInferenceFactory implements Factory<void, void, void, void> {
 
   @override
   void intLiteral(ExpressionJudgment judgment, int fileOffset, Token literal,
-      DartType inferredType) {}
+      num value, DartType inferredType) {}
 
   @override
   void invalidInitializer(InitializerJudgment judgment, int fileOffset) {}
@@ -208,7 +213,12 @@ class ToplevelInferenceFactory implements Factory<void, void, void, void> {
 
   @override
   void logicalExpression(
-      ExpressionJudgment judgment, int fileOffset, DartType inferredType) {}
+      ExpressionJudgment judgment,
+      int fileOffset,
+      void leftOperand,
+      Token operator,
+      void rightOperand,
+      DartType inferredType) {}
 
   @override
   void mapLiteral(
@@ -240,8 +250,8 @@ class ToplevelInferenceFactory implements Factory<void, void, void, void> {
       ExpressionJudgment judgment, int fileOffset, DartType inferredType) {}
 
   @override
-  void not(
-      ExpressionJudgment judgment, int fileOffset, DartType inferredType) {}
+  void not(ExpressionJudgment judgment, int fileOffset, Token operator,
+      void operand, DartType inferredType) {}
 
   @override
   void nullLiteral(ExpressionJudgment judgment, int fileOffset, Token literal,
@@ -314,8 +324,8 @@ class ToplevelInferenceFactory implements Factory<void, void, void, void> {
       ExpressionJudgment judgment, int fileOffset, DartType inferredType) {}
 
   @override
-  void stringLiteral(
-      ExpressionJudgment judgment, int fileOffset, DartType inferredType) {}
+  void stringLiteral(ExpressionJudgment judgment, int fileOffset, Token literal,
+      String value, DartType inferredType) {}
 
   @override
   void superInitializer(InitializerJudgment judgment, int fileOffset) {}
@@ -325,7 +335,12 @@ class ToplevelInferenceFactory implements Factory<void, void, void, void> {
 
   @override
   void symbolLiteral(
-      ExpressionJudgment judgment, int fileOffset, DartType inferredType) {}
+      ExpressionJudgment judgment,
+      int fileOffset,
+      Token poundSign,
+      List<Token> components,
+      String value,
+      DartType inferredType) {}
 
   @override
   void thisExpression(ExpressionJudgment judgment, int fileOffset,