s/Array/List/g

Author: swolchok

JsonVisitor.cpp

@@ -34,7 +34,7 @@ void JsonVisitor::startPrintingNode(const char *kind, const yy::location &locati
   return;
 }
 
-void JsonVisitor::printChildArray(
+void JsonVisitor::printChildList(
     const std::vector<std::string>::const_iterator &childIterator,
     size_t numChildren) {
   out_ << '[';
@@ -66,7 +66,7 @@ void JsonVisitor::endVisitDocument(const Document &document) {
   out_ << "\"definitions\":";
 
   const auto &children = printed_.back();
-  printChildArray(children.begin(), children.size());
+  printChildList(children.begin(), children.size());
   out_ << '}';
   printed_.pop_back();
   assert(printed_.empty());
@@ -93,7 +93,7 @@ void JsonVisitor::endVisitOperationDefinition(const OperationDefinition &operati
   out_ << ",\"variableDefinitions\":";
   const auto *variableDefinitions = operationDefinition.getVariableDefinitions();
   if (variableDefinitions != nullptr) {
-    printChildArray(nextChild, variableDefinitions->size());
+    printChildList(nextChild, variableDefinitions->size());
     nextChild += variableDefinitions->size();
   } else {
     out_ << "null";
@@ -102,7 +102,7 @@ void JsonVisitor::endVisitOperationDefinition(const OperationDefinition &operati
   out_ << ",\"directives\":";
   const auto *directives = operationDefinition.getDirectives();
   if (directives != nullptr) {
-    printChildArray(nextChild, directives->size());
+    printChildList(nextChild, directives->size());
     nextChild += directives->size();
   } else {
     out_ << "null";
@@ -152,7 +152,7 @@ void JsonVisitor::endVisitSelectionSet(const SelectionSet &selectionSet) {
   out_ << "\"selections\":";
 
   const auto &children = printed_.back();
-  printChildArray(children.begin(), children.size());
+  printChildList(children.begin(), children.size());
 
   out_ << '}';
 
@@ -182,7 +182,7 @@ void JsonVisitor::endVisitField(const Field &field) {
   out_ << ",\"arguments\":";
   const auto *arguments = field.getArguments();
   if (arguments != nullptr) {
-    printChildArray(nextChild, arguments->size());
+    printChildList(nextChild, arguments->size());
     nextChild += arguments->size();
   } else {
     out_ << "null";
@@ -191,7 +191,7 @@ void JsonVisitor::endVisitField(const Field &field) {
   out_ << ",\"directives\":";
   const auto *directives = field.getDirectives();
   if (directives != nullptr) {
-    printChildArray(nextChild, directives->size());
+    printChildList(nextChild, directives->size());
     nextChild += directives->size();
   } else {
     out_ << "null";
@@ -239,7 +239,7 @@ void JsonVisitor::endVisitFragmentSpread(const FragmentSpread &fragmentSpread) {
   out_ << ",\"directives\":";
   const auto *directives = fragmentSpread.getDirectives();
   if (directives != nullptr) {
-    printChildArray(children.begin() + 1, directives->size());
+    printChildList(children.begin() + 1, directives->size());
   } else {
     out_ << "null";
   }
@@ -267,7 +267,7 @@ void JsonVisitor::endVisitInlineFragment(const InlineFragment &inlineFragment) {
   out_ << "\"directives\":";
   const auto *directives = inlineFragment.getDirectives();
   if (directives != nullptr) {
-    printChildArray(nextChild, directives->size());
+    printChildList(nextChild, directives->size());
     nextChild += directives->size();
   } else {
     out_ << "null";
@@ -298,7 +298,7 @@ void JsonVisitor::endVisitFragmentDefinition(const FragmentDefinition &fragmentD
   out_ << ",\"directives\":";
   const auto *directives = fragmentDefinition.getDirectives();
   if (directives != nullptr) {
-    printChildArray(nextChild, directives->size());
+    printChildList(nextChild, directives->size());
     nextChild += directives->size();
   } else {
     out_ << "null";
@@ -355,16 +355,16 @@ void JsonVisitor::endVisitBooleanValue(const BooleanValue &booleanValue) {
   printed_.back().emplace_back(out_.str());
 }
 
-bool JsonVisitor::visitArrayValue(const ArrayValue &arrayValue) {
+bool JsonVisitor::visitListValue(const ListValue &arrayValue) {
   visitNode();
   return true;
 }
 
-void JsonVisitor::endVisitArrayValue(const ArrayValue &arrayValue) {
-  startPrintingNode("ArrayValue", arrayValue.getLocation());
+void JsonVisitor::endVisitListValue(const ListValue &arrayValue) {
+  startPrintingNode("ListValue", arrayValue.getLocation());
 
   out_ << "\"values\":";
-  printChildArray(printed_.back().begin(), arrayValue.getValues().size());
+  printChildList(printed_.back().begin(), arrayValue.getValues().size());
 
   out_ << '}';
 
@@ -380,7 +380,7 @@ void JsonVisitor::endVisitObjectValue(const ObjectValue &objectValue) {
   startPrintingNode("ObjectValue", objectValue.getLocation());
 
   out_ << "\"fields\":";
-  printChildArray(printed_.back().begin(), objectValue.getFields().size());
+  printChildList(printed_.back().begin(), objectValue.getFields().size());
 
   out_ << '}';
 
@@ -419,7 +419,7 @@ void JsonVisitor::endVisitDirective(const Directive &directive) {
   out_ << ",\"arguments\":";
   const auto *arguments = directive.getArguments();
   if (arguments != nullptr) {
-    printChildArray(nextChild, arguments->size());
+    printChildList(nextChild, arguments->size());
   } else {
     out_ << "null";
   }

JsonVisitor.h

@@ -48,7 +48,7 @@ class JsonVisitor : public AstVisitor {
 
   // Prints a non-null array of n children from the given
   // iterator. Does not update the iterator.
-  void printChildArray(
+  void printChildList(
     const std::vector<std::string>::const_iterator &childIterator,
     size_t numChildren);
 
@@ -105,8 +105,8 @@ class JsonVisitor : public AstVisitor {
 
   void endVisitEnumValue(const EnumValue &enumValue) override;
 
-  bool visitArrayValue(const ArrayValue &arrayValue) override;
-  void endVisitArrayValue(const ArrayValue &arrayValue) override;
+  bool visitListValue(const ListValue &arrayValue) override;
+  void endVisitListValue(const ListValue &arrayValue) override;
 
   bool visitObjectValue(const ObjectValue &objectValue) override;
   void endVisitObjectValue(const ObjectValue &objectValue) override;

ast/ast.ast

@@ -68,7 +68,7 @@ O FloatValue
 O StringValue
 O BooleanValue
 O EnumValue
-O ArrayValue
+O ListValue
 O ObjectValue
 
 T Variable
@@ -89,7 +89,7 @@ S boolean value
 T EnumValue
 S string value
 
-T ArrayValue
+T ListValue
 P Value values
 
 T ObjectValue

parser.tab.cpp

@@ -720,7 +720,7 @@ namespace yy {
 #line 721 "parser.tab.cpp" // lalr1.cc:617
         break;
 
-      case 63: // array_value
+      case 63: // list_value
 
 #line 227 "parser.ypp" // lalr1.cc:617
         { delete (yysym.value.arrayValue); }
@@ -734,7 +734,7 @@ namespace yy {
 #line 735 "parser.tab.cpp" // lalr1.cc:617
         break;
 
-      case 65: // array_value_const
+      case 65: // list_value_const
 
 #line 227 "parser.ypp" // lalr1.cc:617
         { delete (yysym.value.arrayValue); }
@@ -1608,13 +1608,13 @@ namespace yy {
 
   case 80:
 #line 403 "parser.ypp" // lalr1.cc:859
-    { (yylhs.value.arrayValue) = new ArrayValue(yylhs.location, new std::vector<std::unique_ptr<Value>>()); }
+    { (yylhs.value.arrayValue) = new ListValue(yylhs.location, new std::vector<std::unique_ptr<Value>>()); }
 #line 1613 "parser.tab.cpp" // lalr1.cc:859
     break;
 
   case 81:
 #line 404 "parser.ypp" // lalr1.cc:859
-    { (yylhs.value.arrayValue) = new ArrayValue(yylhs.location, (yystack_[1].value.valueList)); }
+    { (yylhs.value.arrayValue) = new ListValue(yylhs.location, (yystack_[1].value.valueList)); }
 #line 1619 "parser.tab.cpp" // lalr1.cc:859
     break;
 
@@ -1632,13 +1632,13 @@ namespace yy {
 
   case 84:
 #line 412 "parser.ypp" // lalr1.cc:859
-    { (yylhs.value.arrayValue) = new ArrayValue(yylhs.location, new std::vector<std::unique_ptr<Value>>()); }
+    { (yylhs.value.arrayValue) = new ListValue(yylhs.location, new std::vector<std::unique_ptr<Value>>()); }
 #line 1637 "parser.tab.cpp" // lalr1.cc:859
     break;
 
   case 85:
 #line 413 "parser.ypp" // lalr1.cc:859
-    { (yylhs.value.arrayValue) = new ArrayValue(yylhs.location, (yystack_[1].value.valueList)); }
+    { (yylhs.value.arrayValue) = new ListValue(yylhs.location, (yystack_[1].value.valueList)); }
 #line 1643 "parser.tab.cpp" // lalr1.cc:859
     break;
 
@@ -2266,8 +2266,8 @@ namespace yy {
   "field", "arguments", "arguments_opt", "argument_list", "argument",
   "fragment_spread", "inline_fragment", "fragment_definition",
   "type_condition", "value", "int_value", "float_value", "string_value",
-  "value_const", "boolean_value", "enum_value", "array_value",
-  "value_list", "array_value_const", "value_const_list", "object_value",
+  "value_const", "boolean_value", "enum_value", "list_value", "value_list",
+  "list_value_const", "value_const_list", "object_value",
   "object_field_list", "object_field", "object_value_const",
   "object_field_const_list", "object_field_const", "directives",
   "directives_opt", "directive_list", "directive", "type", "type_name",

parser.tab.hpp

@@ -70,7 +70,7 @@ using facebook::graphql::ast::FloatValue;
 using facebook::graphql::ast::StringValue;
 using facebook::graphql::ast::BooleanValue;
 using facebook::graphql::ast::EnumValue;
-using facebook::graphql::ast::ArrayValue;
+using facebook::graphql::ast::ListValue;
 using facebook::graphql::ast::ObjectValue;
 using facebook::graphql::ast::ObjectField;
 using facebook::graphql::ast::Directive;
@@ -101,7 +101,7 @@ union yystype {                                         \
     StringValue *stringValue;                       \
     BooleanValue *booleanValue;                     \
     EnumValue *enumValue;                           \
-    ArrayValue *arrayValue;                         \
+    ListValue *arrayValue;                         \
     ObjectValue *objectValue;                       \
     ObjectField *objectField;                       \
     Directive *directive;                           \
@@ -129,7 +129,7 @@ union yystype {                                         \
     std::vector<std::unique_ptr<StringValue>> *stringValueList;     \
     std::vector<std::unique_ptr<BooleanValue>> *booleanValueList;   \
     std::vector<std::unique_ptr<EnumValue>> *enumValueList;         \
-    std::vector<std::unique_ptr<ArrayValue>> *arrayValueList;       \
+    std::vector<std::unique_ptr<ListValue>> *arrayValueList;       \
     std::vector<std::unique_ptr<ObjectValue>> *objectValueList;     \
     std::vector<std::unique_ptr<ObjectField>> *objectFieldList;     \
     std::vector<std::unique_ptr<Directive>> *directiveList;         \