fix clang-tidy warnings

Author: swolchok

GraphQLParser.cpp

@@ -71,5 +71,5 @@ std::unique_ptr<ast::Node> parseFileWithExperimentalSchemaSupport(
 }
 
 
-}
-}
+}  // namespace graphql
+}  // namespace facebook

JsonVisitor.cpp

@@ -10,7 +10,7 @@
 #include "position.hh"
 #include "JsonVisitor.h"
 
-#include <assert.h>
+#include <cassert>
 #include <iterator>
 
 namespace facebook {
@@ -28,7 +28,10 @@ JsonVisitor::NodeFieldPrinter::NodeFieldPrinter(
   if (!visitor_.printed_.empty()) {
     nextChild_ = visitor_.printed_.back().begin();
   }
-  out_ << "{\"kind\":\"" << nodeKind << "\",\"loc\":";
+  // NOTE: If you're an Emacs user and this file's use of C++11 raw
+  // strings doesn't highlight correctly in c++-mode, try upgrading to
+  // Emacs 26 if you can.
+  out_ << R"({"kind":")" << nodeKind << R"(","loc":)";
   printLocation(out_, node.getLocation());
 }
 
@@ -52,21 +55,21 @@ void JsonVisitor::NodeFieldPrinter::printSingularPrimitiveField(
     const char *fieldName,
     const char *value) {
   printFieldSeparator();
-  out_ << '"' << fieldName << "\":";
+  out_ << '"' << fieldName << R"(":)";
   out_ << '"' << value << '"';
 }
 
 void JsonVisitor::NodeFieldPrinter::printSingularBooleanField(
     const char *fieldName,
     bool value) {
   printFieldSeparator();
-  out_ << '"' << fieldName << "\":";
+  out_ << '"' << fieldName << R"(":)";
   out_ << (value ? "true" : "false");
 }
 
 void JsonVisitor::NodeFieldPrinter::printSingularObjectField(const char *fieldName) {
   printFieldSeparator();
-  out_ << '"' << fieldName << "\":";
+  out_ << '"' << fieldName << R"(":)";
   assert(!visitor_.printed_.empty());
   out_ << *nextChild_++;
 }
@@ -75,7 +78,7 @@ void JsonVisitor::NodeFieldPrinter::printNullableSingularObjectField(
     const char *fieldName,
     const void *value) {
   printFieldSeparator();
-  out_ << '"' << fieldName << "\":";
+  out_ << '"' << fieldName << R"(":)";
   if (value != nullptr) {
     assert(!visitor_.printed_.empty());
     out_ << *nextChild_++;
@@ -89,10 +92,10 @@ void JsonVisitor::NodeFieldPrinter::printLocation(
     std::ostringstream &out,
     const yy::location &location)
 {
-  out << "{\"start\": {\"line\": " << location.begin.line
-       << ",\"column\":" << location.begin.column
-       << "}, \"end\": {\"line\":" << location.end.line
-       << ",\"column\":" << location.end.column
+  out << R"({"start": {"line": )" << location.begin.line
+       << R"(,"column":)" << location.begin.column
+       << R"(}, "end": {"line":)" << location.end.line
+       << R"(,"column":)" << location.end.column
        << "}}";
 }
 
@@ -131,7 +134,7 @@ std::string JsonVisitor::getResult() const {
 
 #include "JsonVisitor.cpp.inc"
 
-}
-}
-}
-}
+}  // namespace visitor
+}  // namespace ast
+}  // namespace graphql
+}  // namespace facebook

README.clang-tidy

@@ -1,7 +1,7 @@
 * readability-implicit-bool is disabled because I disagree with it.
 
-* cppcoreguidelines-pro-type-cstyle-cast is disabled because we use it
-  as reinterpret cast to implement our C API.
+* cppcoreguidelines-pro-type-reinterpret-cast is disabled because we use it
+  to implement our C API.
 
 * cppcoreguidelines-pro-bounds-array-to-pointer-decay is disabled
   because it fires a false positive on every use of assert().

ast/c_impl.py

@@ -22,7 +22,7 @@ def start_file(self):
 #include "GraphQLAst.h"
 #include "../Ast.h"
 
-using namespace facebook::graphql::ast;
+using namespace facebook::graphql::ast;  // NOLINT
 '''
 
   def end_file(self):
@@ -33,7 +33,7 @@ def start_type(self, name):
 
   def field(self, type, name, nullable, plural):
     print field_prototype(self._current_type, type, name, nullable, plural) + ' {'
-    print '  const auto *realNode = (const %s *)node;' % self._current_type
+    print '  const auto *realNode = reinterpret_cast<const %s *>(node);' % self._current_type
     title_name = title(name)
     call_get = 'realNode->get%s()' % title_name
     if plural:
@@ -45,7 +45,7 @@ def field(self, type, name, nullable, plural):
       if type in ['string', 'OperationKind', 'boolean']:
         print '  return %s;' % call_get
       else:
-        fmt = '  return (const struct %s *)%s%s;'
+        fmt = '  return reinterpret_cast<const struct %s *>(%s%s);'
         print fmt % (struct_name(type), '' if nullable else '&', call_get)
 
     print '}'

ast/cxx_impl.py

@@ -23,9 +23,9 @@ def start_file(self):
 '''
 
   def end_file(self):
-    print '}'
-    print '}'
-    print '}'
+    print '}  // namespace ast'
+    print '}  // namespace graphql'
+    print '}  // namespace facebook'
 
   def start_type(self, name):
     print '''void %s::accept(visitor::AstVisitor *visitor) const {

c/GraphQLAstNode.cpp

@@ -14,7 +14,7 @@ using facebook::graphql::ast::Node;
 
 void graphql_node_get_location(const struct GraphQLAstNode *node,
                                struct GraphQLAstLocation *location) {
-  const Node *realNode = (Node *)node;
+  const auto *realNode = reinterpret_cast<const Node *>(node);
   const auto &loc = realNode->getLocation();
   location->beginLine = loc.begin.line;
   location->beginColumn = loc.begin.column;
@@ -23,5 +23,5 @@ void graphql_node_get_location(const struct GraphQLAstNode *node,
 }
 
 void graphql_node_free(struct GraphQLAstNode *node) {
-  delete (Node *)node;
+  delete reinterpret_cast<Node *>(node);
 }

c/GraphQLAstToJSON.cpp

@@ -9,7 +9,7 @@
 
 #include "GraphQLAstToJSON.h"
 
-#include <string.h>
+#include <cstring>
 
 #include "../JsonVisitor.h"
 #include "../AstNode.h"
@@ -18,6 +18,6 @@
 const char *graphql_ast_to_json(const struct GraphQLAstNode *node)
 {
   facebook::graphql::ast::visitor::JsonVisitor visitor;
-  ((facebook::graphql::ast::Node *)node)->accept(&visitor);
+  reinterpret_cast<const facebook::graphql::ast::Node *>(node)->accept(&visitor);
   return strdup(visitor.getResult().c_str());
 }

c/GraphQLAstVisitor.cpp

@@ -10,7 +10,7 @@
 #include "c/GraphQLAstVisitor.h"
 #include "AstVisitor.h"
 
-using namespace facebook::graphql::ast;
+using namespace facebook::graphql::ast; // NOLINT
 
 #include "c/GraphQLAstForEachConcreteType.h"
 
@@ -26,8 +26,6 @@ class CVisitorBridge : public visitor::AstVisitor {
                           void *userData)
     : callbacks_(callbacks), userData_(userData) {}
 
-  ~CVisitorBridge() {}
-
   FOR_EACH_CONCRETE_TYPE(DECLARE_VISIT)
 };
 
@@ -48,12 +46,12 @@ class CVisitorBridge : public visitor::AstVisitor {
 
 FOR_EACH_CONCRETE_TYPE(IMPLEMENT_VISIT)
 
-void graphql_node_visit(struct GraphQLAstNode *node,
+void graphql_node_visit(const struct GraphQLAstNode *node,
                         const struct GraphQLAstVisitorCallbacks *callbacks,
                         void *userData)
 {
   CVisitorBridge visitor(callbacks, userData);
   if (node) {
-    ((facebook::graphql::ast::Node *)node)->accept(&visitor);
+    reinterpret_cast<const facebook::graphql::ast::Node *>(node)->accept(&visitor);
   }
 }

c/GraphQLAstVisitor.h

@@ -45,7 +45,7 @@ struct GraphQLAstNode;
  * callbacks struct as appropriate. userData will be passed as the userData
  * argument to each callback.
  */
-void graphql_node_visit(struct GraphQLAstNode *node,
+void graphql_node_visit(const struct GraphQLAstNode *node,
                         const struct GraphQLAstVisitorCallbacks *callbacks,
                         void *userData);
 

c/GraphQLParser.cpp

@@ -14,24 +14,24 @@
 #include <cstdlib>
 
 struct GraphQLAstNode *graphql_parse_string(const char *text, const char **error) {
-  return (struct GraphQLAstNode *)facebook::graphql::parseString(text, error).release();
+  return reinterpret_cast<struct GraphQLAstNode *>(facebook::graphql::parseString(text, error).release());
 }
 
 struct GraphQLAstNode *graphql_parse_string_with_experimental_schema_support(
     const char *text, const char **error) {
-  return (struct GraphQLAstNode *)facebook::graphql::parseStringWithExperimentalSchemaSupport(
-    text, error).release();
+  return reinterpret_cast<struct GraphQLAstNode *>(facebook::graphql::parseStringWithExperimentalSchemaSupport(
+                                                     text, error).release());
 }
 
 struct GraphQLAstNode *graphql_parse_file(FILE *file, const char **error) {
-  return (struct GraphQLAstNode *)facebook::graphql::parseFile(file, error).release();
+  return reinterpret_cast<struct GraphQLAstNode *>(facebook::graphql::parseFile(file, error).release());
 }
 
 struct GraphQLAstNode *graphql_parse_file_with_experimental_schema_support(
     FILE *file, const char **error) {
-  return (struct GraphQLAstNode *)facebook::graphql::parseFileWithExperimentalSchemaSupport(file, error).release();
+  return reinterpret_cast<struct GraphQLAstNode *>(facebook::graphql::parseFileWithExperimentalSchemaSupport(file, error).release());
 }
 
 void graphql_error_free(const char *error) {
-  std::free((void *)error);
+  std::free((void *)(error)); // NOLINT
 }