From 2697f42d94900dcb0cfbda84e0afab7897841534 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Wed, 8 Dec 2021 20:24:50 -0800
Subject: [PATCH 01/28] Configure as ignition package using ign-cmake2

Fixes #181.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 CMakeLists.txt                                | 367 ++----------------
 cmake/CodeCoverage.cmake                      | 135 -------
 cmake/DefaultCFlags.cmake                     |  79 ----
 cmake/FindSSE.cmake                           | 115 ------
 cmake/HostCFlags.cmake                        |  27 --
 cmake/Modules/FindTinyXML2.cmake              |  42 --
 cmake/SDFUtils.cmake                          | 146 +------
 cmake/SearchForStuff.cmake                    |  87 +----
 cmake/TargetArch.cmake                        | 158 --------
 cmake/cmake_uninstall.cmake.in                |  21 -
 cmake/cpack_options.cmake.in                  |  23 --
 cmake/sdf_config.cmake.in                     |  40 --
 cmake/sdf_cpack.cmake                         |  25 --
 cmake/sdformat_pc.in                          |  10 -
 cmake/upload_doc.sh.in                        |   6 +-
 conf/CMakeLists.txt                           |  10 +-
 conf/sdformat.yaml.in                         |   2 +-
 doc/sdf.in                                    |   2 +-
 include/CMakeLists.txt                        |   1 +
 include/sdf/CMakeLists.txt                    |  69 +---
 .../sdf/config.hh.in                          |  27 +-
 include/sdf/sdf.hh                            |  26 ++
 include/sdf/sdf_config.h                      |  26 ++
 sdf/1.0/CMakeLists.txt                        |   2 +-
 sdf/1.2/CMakeLists.txt                        |   2 +-
 sdf/1.3/CMakeLists.txt                        |   2 +-
 sdf/1.4/CMakeLists.txt                        |   2 +-
 sdf/1.5/CMakeLists.txt                        |   4 +-
 sdf/1.6/CMakeLists.txt                        |   4 +-
 sdf/1.7/CMakeLists.txt                        |   4 +-
 sdf/CMakeLists.txt                            |   2 +-
 src/CMakeLists.txt                            |  58 +--
 src/cmd/CMakeLists.txt                        |   8 +-
 src/cmd/cmdsdformat.rb.in                     |   2 +-
 test/CMakeLists.txt                           |  28 +-
 test/integration/CMakeLists.txt               |   8 +-
 .../all_symbols_have_version.bash.in          |   2 +-
 test/performance/CMakeLists.txt               |   4 +-
 38 files changed, 193 insertions(+), 1383 deletions(-)
 delete mode 100644 cmake/CodeCoverage.cmake
 delete mode 100644 cmake/DefaultCFlags.cmake
 delete mode 100644 cmake/FindSSE.cmake
 delete mode 100644 cmake/HostCFlags.cmake
 delete mode 100644 cmake/Modules/FindTinyXML2.cmake
 delete mode 100644 cmake/TargetArch.cmake
 delete mode 100644 cmake/cmake_uninstall.cmake.in
 delete mode 100644 cmake/cpack_options.cmake.in
 delete mode 100644 cmake/sdf_config.cmake.in
 delete mode 100644 cmake/sdf_cpack.cmake
 delete mode 100644 cmake/sdformat_pc.in
 create mode 100644 include/CMakeLists.txt
 rename cmake/sdf_config.h.in => include/sdf/config.hh.in (59%)
 create mode 100644 include/sdf/sdf.hh
 create mode 100644 include/sdf/sdf_config.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8a53b9b4..fbed65594 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,350 +4,59 @@ if(COMMAND CMAKE_POLICY)
   CMAKE_POLICY(SET CMP0003 NEW)
   CMAKE_POLICY(SET CMP0004 NEW)
 endif(COMMAND CMAKE_POLICY)
-enable_testing()
 
-# with -fPIC
-if(UNIX AND NOT WIN32)
-  set (CMAKE_INSTALL_PREFIX "/usr" CACHE STRING "Install Prefix")
- find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
- if(CMAKE_UNAME)
-   exec_program(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
-   set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE INTERNAL
-     "processor type (i386 and x86_64)")
-   if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-     ADD_DEFINITIONS(-fPIC)
-   endif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
- endif(CMAKE_UNAME)
-endif()
-
-project (sdformat10)
+project (sdformat10 VERSION 10.6.0)
 
 # The protocol version has nothing to do with the package version set below.
 # It represents the current version of sdformat implement by the software
 set (SDF_PROTOCOL_VERSION 1.7)
 
-set (SDF_MAJOR_VERSION 10)
-set (SDF_MINOR_VERSION 6)
-set (SDF_PATCH_VERSION 0)
-
-set (SDF_VERSION ${SDF_MAJOR_VERSION}.${SDF_MINOR_VERSION})
-set (SDF_VERSION_FULL ${SDF_MAJOR_VERSION}.${SDF_MINOR_VERSION}.${SDF_PATCH_VERSION})
-
-string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
-string(REGEX REPLACE "[0-9]+" "" PROJECT_NAME_NO_VERSION ${PROJECT_NAME})
-string(TOLOWER ${PROJECT_NAME_NO_VERSION} PROJECT_NAME_NO_VERSION_LOWER)
-set(PROJECT_EXPORT_NAME ${PROJECT_NAME_LOWER})
-set(PROJECT_LIBRARY_TARGET_NAME ${PROJECT_NAME_LOWER})
-
 set (project_cmake_dir ${PROJECT_SOURCE_DIR}/cmake
   CACHE PATH "Location of CMake scripts")
 
-message (STATUS "${PROJECT_NAME} version ${SDF_VERSION_FULL}")
-set (CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
-
-#============================================================================
-# We turn off extensions because (1) we do not ever want to use non-standard
-# compiler extensions, and (2) this variable is on by default, causing cmake
-# to choose the flag -std=gnu++14 instead of -std=c++14 when the C++14
-# features are requested. Explicitly turning this flag off will force cmake to
-# choose -std=c++14.
-# See https://github.com/ignitionrobotics/ign-cmake/issues/13 for more info.
-set(CMAKE_CXX_EXTENSIONS off)
-
-# Include GNUInstallDirs to get canonical paths
-include(GNUInstallDirs)
-
-# Default test type for test all over source
-set(TEST_TYPE "UNIT")
-
-# developer's option to cache PKG_CONFIG_PATH and
-# LD_LIBRARY_PATH for local installs
-if(PKG_CONFIG_PATH)
-  set (ENV{PKG_CONFIG_PATH} ${PKG_CONFIG_PATH}:$ENV{PKG_CONFIG_PATH})
-endif()
-if(LD_LIBRARY_PATH)
-  set (ENV{LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}:$ENV{LD_LIBRARY_PATH})
-endif()
-
-set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/sdformat-${SDF_VERSION}/sdf")
-set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE STRING "Installation directory for libraries (relative to CMAKE_INSTALL_PREFIX)")
-set (BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE STRING "Installation directory for binaries (relative to CMAKE_INSTALL_PREFIX)")
-set (USE_FULL_RPATH OFF CACHE BOOL "Set to true to enable full rpath")
-
-set(PKG_NAME SDFormat)
-set(sdf_target sdformat${SDF_MAJOR_VERSION})
-set(sdf_config_install_dir "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME_LOWER}/")
-set(sdf_import_target_name ${PROJECT_EXPORT_NAME}::${sdf_target})
-set(sdf_target_output_filename "${sdf_target}-targets.cmake")
-
+message (STATUS "${PROJECT_NAME} version ${PROJECT_VERSION_FULL}")
 
 OPTION(SDFORMAT_DISABLE_CONSOLE_LOGFILE "Disable the sdformat console logfile" OFF)
 
-if (USE_FULL_RPATH)
-  # use, i.e. don't skip the full RPATH for the build tree
-  set(CMAKE_SKIP_BUILD_RPATH  FALSE)
-
-  # when building, don't use the install RPATH already
-  # (but later on when installing)
-  set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-
-  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
-
-  # add the automatically determined parts of the RPATH
-  # which point to directories outside the build tree to the install RPATH
-  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-  # the RPATH to be used when installing, but only if its not a system directory
-  list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" isSystemDir)
-  if("${isSystemDir}" STREQUAL "-1")
-    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
-  endif("${isSystemDir}" STREQUAL "-1")
-endif()
-
 set (BUILD_SDF ON CACHE INTERNAL "Build SDF" FORCE)
-set (build_errors "" CACHE INTERNAL "build errors" FORCE)
-set (build_warnings "" CACHE INTERNAL "build warnings" FORCE)
 
 set (sdf_cmake_dir ${PROJECT_SOURCE_DIR}/cmake CACHE PATH
      "Location of CMake scripts")
 
-message (STATUS "\n\n====== Finding 3rd Party Packages ======")
-include (${sdf_cmake_dir}/SDFUtils.cmake)
-include (${sdf_cmake_dir}/SearchForStuff.cmake)
-message (STATUS "----------------------------------------\n")
-
-#####################################
-# Set the default build type
-if (NOT CMAKE_BUILD_TYPE)
-  set (CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
-    "Choose the type of build, options are: Debug Release RelWithDebInfo Profile Check" FORCE)
-endif (NOT CMAKE_BUILD_TYPE)
-string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UPPERCASE)
-
-set (BUILD_TYPE_PROFILE FALSE)
-set (BUILD_TYPE_RELEASE FALSE)
-set (BUILD_TYPE_RELWITHDEBINFO FALSE)
-set (BUILD_TYPE_DEBUG FALSE)
-
-if ("${CMAKE_BUILD_TYPE_UPPERCASE}" STREQUAL "PROFILE")
-  set (BUILD_TYPE_PROFILE TRUE)
-elseif ("${CMAKE_BUILD_TYPE_UPPERCASE}" STREQUAL "RELEASE")
-  set (BUILD_TYPE_RELEASE TRUE)
-elseif ("${CMAKE_BUILD_TYPE_UPPERCASE}" STREQUAL "RELWITHDEBINFO")
-  set (BUILD_TYPE_RELWITHDEBINFO TRUE)
-elseif ("${CMAKE_BUILD_TYPE_UPPERCASE}" STREQUAL "DEBUG")
-  set (BUILD_TYPE_DEBUG TRUE)
-elseif ("${CMAKE_BUILD_TYPE_UPPERCASE}" STREQUAL "COVERAGE")
-  include (${project_cmake_dir}/CodeCoverage.cmake)
-  set (BUILD_TYPE_DEBUG TRUE)
-  SETUP_TARGET_FOR_COVERAGE(coverage ctest coverage)
-else()
-  # NONE is a valid CMAKE_BUILD_TYPE
-  if (NOT "${CMAKE_BUILD_TYPE_UPPERCASE}" STREQUAL "NONE")
-    build_error("CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} unknown. Valid options are: Debug Release RelWithDebInfo Profile Coverage None")
-  endif()
-endif()
-
-#####################################
-# Handle CFlags
-unset (CMAKE_C_FLAGS_ALL CACHE)
-
-# USE_HOST_CFLAGS (default TRUE)
-# Will check building host machine for proper cflags
-if(NOT DEFINED USE_HOST_CFLAGS OR USE_HOST_CFLAGS)
-  message(STATUS "Enable host CFlags")
-  include (${project_cmake_dir}/HostCFlags.cmake)
-endif()
-
-# USE_UPSTREAM_CFLAGS (default TRUE)
-# Will use predefined ignition developers cflags
-if(NOT DEFINED USE_UPSTREAM_CFLAGS OR USE_UPSTREAM_CFLAGS)
-  message(STATUS "Enable upstream CFlags")
-  include(${project_cmake_dir}/DefaultCFlags.cmake)
-endif()
-
-# Check if warning options are avaliable for the compiler and return WARNING_CXX_FLAGS variable
-if (MSVC)
-  set(WARN_LEVEL "/W4")
-
-  # Unable to be filtered flags (failing due to limitations in filter_valid_compiler_warnings)
-  # Handling exceptions rightly and ignore unknown pragmas
-  set(UNFILTERED_FLAGS "/EHsc /wd4068")
-else()
-  # Equivalent to Wall (according to man gcc) but removed the unknown pragmas since we use
-  # MSVC only pragmas all over the code
-  list(APPEND WARN_LEVEL -Waddress -Warray-bounds -Wcomment -Wformat -Wnonnull)
-  list(APPEND WARN_LEVEL -Wparentheses -Wreorder -Wreturn-type)
-  list(APPEND WARN_LEVEL -Wsequence-point -Wsign-compare -Wstrict-aliasing)
-  list(APPEND WARN_LEVEL -Wstrict-overflow=1 -Wswitch -Wtrigraphs -Wuninitialized)
-  list(APPEND WARN_LEVEL -Wunused-function -Wunused-label -Wunused-value)
-  list(APPEND WARN_LEVEL -Wunused-variable -Wvolatile-register-var)
-
-  # Unable to be filtered flags (failing due to limitations in filter_valid_compiler_warnings)
-  set(UNFILTERED_FLAGS "-Wc++17-compat")
-endif()
-
-filter_valid_compiler_warnings(${WARN_LEVEL} -Wextra -Wno-long-long
-  -Wno-unused-value -Wno-unused-value -Wno-unused-value -Wno-unused-value
-  -Wfloat-equal -Wshadow -Winit-self -Wswitch-default
-  -Wmissing-include-dirs -pedantic -Wno-pragmas)
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${WARNING_CXX_FLAGS} ${UNFILTERED_FLAGS}")
-
 #################################################
-# OS Specific initialization
-if (UNIX)
-  sdf_setup_unix()
-endif ()
-
-if (WIN32)
-  sdf_setup_windows()
-endif ()
-
-if (APPLE)
-  sdf_setup_apple()
-endif ()
-
-#################################################
-# Print warnings and errors
-if ( build_warnings )
-  message(WARNING "-- BUILD WARNINGS")
-  foreach (msg ${build_warnings})
-    message(WARNING "-- ${msg}")
-  endforeach ()
-  message(WARNING "-- END BUILD WARNINGS\n")
-endif (build_warnings)
-
-########### Add uninstall target ###############
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY)
-add_custom_target(uninstall
-  "${CMAKE_COMMAND}" -P
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake")
-
-if (build_errors)
-  message(SEND_ERROR "-- BUILD ERRORS: These must be resolved before compiling.")
-  foreach (msg ${build_errors})
-    message(SEND_ERROR "-- ${msg}")
-  endforeach ()
-  message(SEND_ERROR "-- END BUILD ERRORS\n")
-  message (FATAL_ERROR "Errors encountered in build. Please see the BUILD ERRORS above.")
-
-else (build_errors)
-
-  ########################################
-  # Write the config.h file
-  configure_file (${sdf_cmake_dir}/sdf_config.h.in
-    ${PROJECT_BINARY_DIR}/sdf/sdf_config.h)
-  sdf_install_includes("" ${PROJECT_BINARY_DIR}/sdf/sdf_config.h)
-
-  message (STATUS "C Flags:${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}}")
-  message (STATUS "Build Type: ${CMAKE_BUILD_TYPE}")
-  message (STATUS "Install path: ${CMAKE_INSTALL_PREFIX}")
-
-  if (BUILD_SDF)
-    include_directories(include
-      ${PROJECT_BINARY_DIR}
-      ${PROJECT_BINARY_DIR}/include
-      )
-
-    link_directories(${PROJECT_BINARY_DIR}/src)
-
-    if (NOT DEFINED BUILD_TESTING OR BUILD_TESTING)
-      set(BUILD_SDF_TEST TRUE)
-    else()
-      set(BUILD_SDF_TEST FALSE)
-    endif()
-
-    if (BUILD_SDF_TEST)
-      add_subdirectory(test)
-    endif()
-    add_subdirectory(src)
-    add_subdirectory(include/sdf)
-    add_subdirectory(sdf)
-    add_subdirectory(conf)
-    add_subdirectory(doc)
-  endif(BUILD_SDF)
-
-  ########################################
-  # Setup Codecheck
-  include (IgnCodeCheck)
-  set(CPPCHECK_DIRS
-    ${PROJECT_SOURCE_DIR}/src
-    ${PROJECT_SOURCE_DIR}/include
-    ${PROJECT_SOURCE_DIR}/test/integration
-    ${PROJECT_SOURCE_DIR}/test/performance)
-
-  set(CPPCHECK_INCLUDE_DIRS
-    ${PROJECT_BINARY_DIR}
-    ${PROJECT_SOURCE_DIR}/include
-    ${PROJECT_SOURCE_DIR}/test/integration
-    ${PROJECT_SOURCE_DIR}/test/performance)
-
-  # Ignore vendored directories.
-  file(WRITE ${PROJECT_BINARY_DIR}/cppcheck.suppress
-    "*:${PROJECT_SOURCE_DIR}/src/urdf/*\n"
-    )
-  ign_setup_target_for_codecheck()
-
-  ########################################
-  # Make the package config file
-  configure_file(${CMAKE_SOURCE_DIR}/cmake/sdformat_pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME_LOWER}.pc @ONLY)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME_LOWER}.pc DESTINATION
-    ${LIB_INSTALL_DIR}/pkgconfig COMPONENT pkgconfig)
-
-  ########################################
-  # Configure documentation uploader
-  configure_file("${CMAKE_SOURCE_DIR}/cmake/upload_doc.sh.in"
-    ${CMAKE_BINARY_DIR}/upload_doc.sh @ONLY)
-
-  ########################################
-  # Make the cmake config files
-  set(sdf_config_input  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/sdf_config.cmake.in")
-  set(sdf_config_output "cmake/${sdf_target}-config.cmake")
-  set(sdf_version_output "cmake/${sdf_target}-config-version.cmake")
-  set(sdf_config_install_dir "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME_LOWER}/")
-
-  include(CMakePackageConfigHelpers)
-  #--------------------------------------
-  # Configure and install the config file
-  configure_package_config_file(
-    ${sdf_config_input}
-    ${sdf_config_output}
-    INSTALL_DESTINATION ${sdf_config_install_dir}
-    NO_CHECK_REQUIRED_COMPONENTS_MACRO)
-
-  #--------------------------------------
-  # Configure and install the version file
-  write_basic_package_version_file(
-      ${CMAKE_CURRENT_BINARY_DIR}/${sdf_version_output}
-      VERSION "${SDF_VERSION_FULL}"
-      COMPATIBILITY SameMajorVersion)
-
-  install(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/${sdf_config_output}
-    ${CMAKE_CURRENT_BINARY_DIR}/${sdf_version_output}
-    DESTINATION ${sdf_config_install_dir}
-    COMPONENT cmake)
-
-  ########################################
-  # Package Creation:
-  include (${sdf_cmake_dir}/sdf_cpack.cmake)
-  set (CPACK_PACKAGE_VERSION "${SDF_VERSION_FULL}")
-  set (CPACK_PACKAGE_VERSION_MAJOR "${SDF_MAJOR_VERSION}")
-  set (CPACK_PACKAGE_VERSION_MINOR "${SDF_MINOR_VERSION}")
-  set (CPACK_PACKAGE_VERSION_PATCH "${SDF_PATCH_VERSION}")
-
-  if (CPACK_GENERATOR)
-    message(STATUS "Found CPack generators: ${CPACK_GENERATOR}")
-
-    configure_file("${sdf_cmake_dir}/cpack_options.cmake.in"
-                   ${SDF_CPACK_CFG_FILE} @ONLY)
-    set(CPACK_PROJECT_CONFIG_FILE ${SDF_CPACK_CFG_FILE})
-    include (CPack)
-  endif()
-
-  message(STATUS "Configuration successful. Type make to compile sdf")
-endif(build_errors)
+# Find ign-cmake
+find_package(ignition-cmake2 2.10 REQUIRED)
+set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
+
+if (BUILD_SDF)
+  ign_configure_project(
+    NO_IGNITION_PREFIX
+    REPLACE_IGNITION_INCLUDE_PATH sdf)
+
+  message (STATUS "\n\n====== Finding 3rd Party Packages ======")
+  include (${sdf_cmake_dir}/SDFUtils.cmake)
+  include (${sdf_cmake_dir}/SearchForStuff.cmake)
+  message (STATUS "----------------------------------------\n")
+
+  ign_configure_build(QUIT_IF_BUILD_ERRORS)
+  ign_create_packages()
+
+  add_subdirectory(sdf)
+  add_subdirectory(conf)
+  add_subdirectory(doc)
+endif(BUILD_SDF)
+
+########################################
+# Setup Codecheck
+
+# Ignore vendored directories.
+file(WRITE ${PROJECT_BINARY_DIR}/cppcheck.suppress
+  "*:${PROJECT_SOURCE_DIR}/src/urdf/*\n"
+  )
+
+########################################
+# Configure documentation uploader
+configure_file("${CMAKE_SOURCE_DIR}/cmake/upload_doc.sh.in"
+  ${CMAKE_BINARY_DIR}/upload_doc.sh @ONLY)
+
+message(STATUS "Configuration successful. Type make to compile sdf")
diff --git a/cmake/CodeCoverage.cmake b/cmake/CodeCoverage.cmake
deleted file mode 100644
index 7eb4f7c56..000000000
--- a/cmake/CodeCoverage.cmake
+++ /dev/null
@@ -1,135 +0,0 @@
-#
-# 2012-01-31, Lars Bilke
-# - Enable Code Coverage
-#
-# 2013-09-17, Joakim Söderberg
-# - Added support for Clang.
-# - Some additional usage instructions.
-#
-# USAGE:
-# 1. Copy this file into your cmake modules path.
-#
-# 2. Add the following line to your CMakeLists.txt:
-#      INCLUDE(CodeCoverage)
-#
-# 3. Set compiler flags to turn off optimization and enable coverage:
-#    SET(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
-#	 SET(CMAKE_C_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
-#
-# 3. Use the function SETUP_TARGET_FOR_COVERAGE to create a custom make target
-#    which runs your test executable and produces a lcov code coverage report:
-#    Example:
-#	 SETUP_TARGET_FOR_COVERAGE(
-#				my_coverage_target  # Name for custom target.
-#				test_driver         # Name of the test driver executable that runs the tests.
-#									# NOTE! This should always have a ZERO as exit code
-#									# otherwise the coverage generation will not complete.
-#				coverage            # Name of output directory.
-#				)
-#
-# 4. Build a Debug build:
-#	 cmake -DCMAKE_BUILD_TYPE=Debug ..
-#	 make
-#	 make my_coverage_target
-#
-#
-
-# Check prereqs
-
-FIND_PROGRAM( GCOV_PATH NAMES gcov-8 gcov )
-FIND_PROGRAM( LCOV_PATH lcov )
-FIND_PROGRAM( GREP_PATH grep )
-FIND_PROGRAM( GENHTML_PATH genhtml )
-FIND_PROGRAM( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/tests)
-
-IF(NOT GCOV_PATH)
-	MESSAGE(FATAL_ERROR "gcov not found! Aborting...")
-ENDIF() # NOT GCOV_PATH
-
-IF(NOT CMAKE_COMPILER_IS_GNUCXX)
-	# Clang version 3.0.0 and greater now supports gcov as well.
-	MESSAGE(WARNING "Compiler is not GNU gcc! Clang Version 3.0.0 and greater supports gcov as well, but older versions don't.")
-
-	IF(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-		MESSAGE(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
-	ENDIF()
-ENDIF() # NOT CMAKE_COMPILER_IS_GNUCXX
-
-SET(CMAKE_CXX_FLAGS_COVERAGE
-    "-g -O0 --coverage -fprofile-arcs -ftest-coverage"
-    CACHE STRING "Flags used by the C++ compiler during coverage builds."
-    FORCE )
-SET(CMAKE_C_FLAGS_COVERAGE
-    "-g -O0 --coverage -fprofile-arcs -ftest-coverage"
-    CACHE STRING "Flags used by the C compiler during coverage builds."
-    FORCE )
-SET(CMAKE_EXE_LINKER_FLAGS_COVERAGE
-    ""
-    CACHE STRING "Flags used for linking binaries during coverage builds."
-    FORCE )
-SET(CMAKE_SHARED_LINKER_FLAGS_COVERAGE
-    ""
-    CACHE STRING "Flags used by the shared libraries linker during coverage builds."
-    FORCE )
-MARK_AS_ADVANCED(
-    CMAKE_CXX_FLAGS_COVERAGE
-    CMAKE_C_FLAGS_COVERAGE
-    CMAKE_EXE_LINKER_FLAGS_COVERAGE
-    CMAKE_SHARED_LINKER_FLAGS_COVERAGE )
-
-IF ( NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "Coverage"))
-  MESSAGE( WARNING "Code coverage results with an optimized (non-Debug) build may be misleading" )
-ENDIF() # NOT CMAKE_BUILD_TYPE STREQUAL "Debug"
-
-
-# Param _targetname     The name of new the custom make target
-# Param _testrunner     The name of the target which runs the tests.
-#						MUST return ZERO always, even on errors.
-#						If not, no coverage report will be created!
-# Param _outputname     lcov output is generated as _outputname.info
-#                       HTML report is generated in _outputname/index.html
-# Optional fourth parameter is passed as arguments to _testrunner
-#   Pass them in list form, e.g.: "-j;2" for -j 2
-FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
-
-  IF(NOT LCOV_PATH)
-    MESSAGE(FATAL_ERROR "lcov not found! Aborting...")
-  ENDIF() # NOT LCOV_PATH
-
-  IF(NOT GENHTML_PATH)
-    MESSAGE(FATAL_ERROR "genhtml not found! Aborting...")
-  ENDIF() # NOT GENHTML_PATH
-
-  IF(NOT GREP_PATH)
-    MESSAGE(FATAL_ERROR "grep not found! Run code coverage on linux or mac.")
-  ENDIF()
-
-  # Setup target
-  ADD_CUSTOM_TARGET(${_targetname}
-
-  COMMAND ${CMAKE_COMMAND} -E remove ${_outputname}.info.cleaned
-    ${_outputname}.info
-  # Capturing lcov counters and generating report
-  COMMAND ${LCOV_PATH} -q --no-checksum --directory ${PROJECT_BINARY_DIR}
-    --gcov-tool ${GCOV_PATH} --capture --output-file ${_outputname}.info 2>/dev/null
-  COMMAND ${LCOV_PATH} -q --remove ${_outputname}.info
-    --gcov-tool ${GCOV_PATH} '*/test/*' '/usr/*' '*_TEST*' --output-file ${_outputname}.info.cleaned
-  COMMAND ${GENHTML_PATH} -q --legend -o ${_outputname}
-    ${_outputname}.info.cleaned
-  COMMAND ${LCOV_PATH} --summary ${_outputname}.info.cleaned 2>&1 | grep "lines" | cut -d ' ' -f 4 | cut -d '%' -f 1 > coverage/lines.txt
-  COMMAND ${LCOV_PATH} --summary ${_outputname}.info.cleaned 2>&1 | grep "functions" | cut -d ' ' -f 4 | cut -d '%' -f 1 > coverage/functions.txt
-  COMMAND ${CMAKE_COMMAND} -E rename ${_outputname}.info.cleaned
-    ${_outputname}.info
-
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-  COMMENT "Resetting code coverage counters to zero.\n"
-          "Processing code coverage counters and generating report."
-  )
-
-  # Show info where to find the report
-  ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
-    COMMAND COMMAND ${LCOV_PATH} -q --zerocounters --directory ${PROJECT_BINARY_DIR};
-  COMMENT "Open ./${_outputname}/index.html in your browser to view the coverage report."
-  )
-
-ENDFUNCTION() # SETUP_TARGET_FOR_COVERAGE
diff --git a/cmake/DefaultCFlags.cmake b/cmake/DefaultCFlags.cmake
deleted file mode 100644
index be57d0a3d..000000000
--- a/cmake/DefaultCFlags.cmake
+++ /dev/null
@@ -1,79 +0,0 @@
-# Build type link flags
-set (CMAKE_LINK_FLAGS_RELEASE " " CACHE INTERNAL "Link flags for release" FORCE)
-set (CMAKE_LINK_FLAGS_RELWITHDEBINFO " " CACHE INTERNAL "Link flags for release with debug support" FORCE)
-set (CMAKE_LINK_FLAGS_DEBUG " " CACHE INTERNAL "Link flags for debug" FORCE)
-set (CMAKE_LINK_FLAGS_PROFILE " -pg" CACHE INTERNAL "Link flags for profile" FORCE)
-set (CMAKE_LINK_FLAGS_COVERAGE " --coverage" CACHE INTERNAL "Link flags for static code coverage" FORCE)
-
-set (CMAKE_C_FLAGS_RELEASE "")
-if (NOT "${CMAKE_CXX_COMPILER_ID} " STREQUAL "Clang " AND NOT MSVC)
-  # -s doesn't work with clang or Visual Studio, see alternative in link below:
-  # http://stackoverflow.com/questions/6085491/gcc-vs-clang-symbol-strippingu
-  set (CMAKE_C_FLAGS_RELEASE "-s")
-endif()
-
-if (NOT MSVC)
-  set (CMAKE_C_FLAGS_RELEASE " ${CMAKE_C_FLAGS_RELEASE} -O3 -DNDEBUG ${CMAKE_C_FLAGS_ALL}" CACHE INTERNAL "C Flags for release" FORCE)
-  set (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
-
-  set (CMAKE_C_FLAGS_RELWITHDEBINFO " -g -O2 ${CMAKE_C_FLAGS_ALL}" CACHE INTERNAL "C Flags for release with debug support" FORCE)
-  set (CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO})
-
-  set (CMAKE_C_FLAGS_DEBUG " -ggdb3 ${CMAKE_C_FLAGS_ALL}" CACHE INTERNAL "C Flags for debug" FORCE)
-  set (CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
-
-  set (CMAKE_C_FLAGS_PROFILE " -fno-omit-frame-pointer -g -pg ${CMAKE_C_FLAGS_ALL}" CACHE INTERNAL "C Flags for profile" FORCE)
-  set (CMAKE_CXX_FLAGS_PROFILE ${CMAKE_C_FLAGS_PROFILE})
-
-  set (CMAKE_C_FLAGS_COVERAGE " -g -O0 -Wformat=2 --coverage -fno-inline ${CMAKE_C_FLAGS_ALL}" CACHE INTERNAL "C Flags for static code coverage" FORCE)
-  set (CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_C_FLAGS_COVERAGE}")
-  foreach(flag
-          -fno-default-inline
-          -fno-elide-constructors
-          -fno-implicit-inline-templates)
-    CHECK_CXX_COMPILER_FLAG(${flag} R${flag})
-    if (R${flag})
-      set (CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_COVERAGE} ${flag}")
-    endif()
-  endforeach()
-endif()
-
-#####################################
-# Set all the global build flags
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-set (CMAKE_CXX_EXTENSIONS off)
-set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-if (UNIX)
-    # Add visibility in UNIX
-    check_gcc_visibility()
-    if (GCC_SUPPORTS_VISIBILITY)
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
-    endif()
-endif()
-
-# Compiler-specific C++17 activation.
-if ("${CMAKE_CXX_COMPILER_ID} " MATCHES "GNU ")
-    execute_process(
-        COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-    if (NOT (GCC_VERSION VERSION_GREATER_EQUAL 7.0))
-        message(STATUS "Found version ${GCC_VERSION}")
-        message(FATAL_ERROR "${PROJECT_NAME} requires g++ 7.0 or greater.")
-    endif ()
-elseif ("${CMAKE_CXX_COMPILER_ID} " MATCHES "Clang ")
-  if(APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-  endif()
-elseif ("${CMAKE_CXX_COMPILER_ID} " STREQUAL "MSVC ")
-    if (MSVC_VERSION LESS 1914)
-        message(FATAL_ERROR "${PROJECT_NAME} requires VS 2017 or greater.")
-    endif()
-else ()
-    message(FATAL_ERROR "Your C++ compiler does not support C++17.")
-endif ()
diff --git a/cmake/FindSSE.cmake b/cmake/FindSSE.cmake
deleted file mode 100644
index cdbcfcc3d..000000000
--- a/cmake/FindSSE.cmake
+++ /dev/null
@@ -1,115 +0,0 @@
-# Check if SSE instructions are available on the machine where
-# the project is compiled.
-
-IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64")
-  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-     EXEC_PROGRAM(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO)
-
-     STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE ${CPUINFO})
-     STRING(COMPARE EQUAL "sse2" "${SSE_THERE}" SSE2_TRUE)
-     IF (SSE2_TRUE)
-        set(SSE2_FOUND true CACHE BOOL "SSE2 available on host")
-     ELSE (SSE2_TRUE)
-        set(SSE2_FOUND false CACHE BOOL "SSE2 available on host")
-     ENDIF (SSE2_TRUE)
-
-     # /proc/cpuinfo apparently omits sse3 :(
-     STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE ${CPUINFO})
-     STRING(COMPARE EQUAL "sse3" "${SSE_THERE}" SSE3_TRUE)
-     IF (NOT SSE3_TRUE)
-        STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE ${CPUINFO})
-        STRING(COMPARE EQUAL "T2300" "${SSE_THERE}" SSE3_TRUE)
-     ENDIF (NOT SSE3_TRUE)
-
-     STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE ${CPUINFO})
-     STRING(COMPARE EQUAL "ssse3" "${SSE_THERE}" SSSE3_TRUE)
-     IF (SSE3_TRUE OR SSSE3_TRUE)
-        set(SSE3_FOUND true CACHE BOOL "SSE3 available on host")
-     ELSE (SSE3_TRUE OR SSSE3_TRUE)
-        set(SSE3_FOUND false CACHE BOOL "SSE3 available on host")
-     ENDIF (SSE3_TRUE OR SSSE3_TRUE)
-     IF (SSSE3_TRUE)
-        set(SSSE3_FOUND true CACHE BOOL "SSSE3 available on host")
-     ELSE (SSSE3_TRUE)
-        set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host")
-     ENDIF (SSSE3_TRUE)
-
-     STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE ${CPUINFO})
-     STRING(COMPARE EQUAL "sse4_1" "${SSE_THERE}" SSE41_TRUE)
-     IF (SSE41_TRUE)
-        set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host")
-     ELSE (SSE41_TRUE)
-        set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host")
-     ENDIF (SSE41_TRUE)
-
-     STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE ${CPUINFO})
-     STRING(COMPARE EQUAL "sse4_2" "${SSE_THERE}" SSE42_TRUE)
-     IF (SSE42_TRUE)
-        set(SSE4_2_FOUND true CACHE BOOL "SSE4.2 available on host")
-     ELSE (SSE42_TRUE)
-        set(SSE4_2_FOUND false CACHE BOOL "SSE4.2 available on host")
-     ENDIF (SSE42_TRUE)
-
-  ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-     EXEC_PROGRAM("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE
-        CPUINFO)
-
-     STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE ${CPUINFO})
-     STRING(COMPARE EQUAL "SSE2" "${SSE_THERE}" SSE2_TRUE)
-     IF (SSE2_TRUE)
-        set(SSE2_FOUND true CACHE BOOL "SSE2 available on host")
-     ELSE (SSE2_TRUE)
-        set(SSE2_FOUND false CACHE BOOL "SSE2 available on host")
-     ENDIF (SSE2_TRUE)
-
-     STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE ${CPUINFO})
-     STRING(COMPARE EQUAL "SSE3" "${SSE_THERE}" SSE3_TRUE)
-     IF (SSE3_TRUE)
-        set(SSE3_FOUND true CACHE BOOL "SSE3 available on host")
-     ELSE (SSE3_TRUE)
-        set(SSE3_FOUND false CACHE BOOL "SSE3 available on host")
-     ENDIF (SSE3_TRUE)
-
-     STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE ${CPUINFO})
-     STRING(COMPARE EQUAL "SSSE3" "${SSE_THERE}" SSSE3_TRUE)
-     IF (SSSE3_TRUE)
-        set(SSSE3_FOUND true CACHE BOOL "SSSE3 available on host")
-     ELSE (SSSE3_TRUE)
-        set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host")
-     ENDIF (SSSE3_TRUE)
-
-     STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE ${CPUINFO})
-     STRING(COMPARE EQUAL "SSE4.1" "${SSE_THERE}" SSE41_TRUE)
-     IF (SSE41_TRUE)
-        set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host")
-     ELSE (SSE41_TRUE)
-        set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host")
-     ENDIF (SSE41_TRUE)
-  ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-     # TODO
-     set(SSE2_FOUND   true  CACHE BOOL "SSE2 available on host")
-     set(SSE3_FOUND   false CACHE BOOL "SSE3 available on host")
-     set(SSSE3_FOUND  false CACHE BOOL "SSSE3 available on host")
-     set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host")
-  ELSE(CMAKE_SYSTEM_NAME MATCHES "Linux")
-     set(SSE2_FOUND   true  CACHE BOOL "SSE2 available on host")
-     set(SSE3_FOUND   false CACHE BOOL "SSE3 available on host")
-     set(SSSE3_FOUND  false CACHE BOOL "SSSE3 available on host")
-     set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host")
-  ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-ENDIF(ARCH MATCHES "i386" OR ARCH MATCHES "x86_64")
-
-if(NOT SSE2_FOUND)
-      MESSAGE(STATUS "Could not find hardware support for SSE2 on this machine.")
-endif(NOT SSE2_FOUND)
-if(NOT SSE3_FOUND)
-      MESSAGE(STATUS "Could not find hardware support for SSE3 on this machine.")
-endif(NOT SSE3_FOUND)
-if(NOT SSSE3_FOUND)
-      MESSAGE(STATUS "Could not find hardware support for SSSE3 on this machine.")
-endif(NOT SSSE3_FOUND)
-if(NOT SSE4_1_FOUND)
-      MESSAGE(STATUS "Could not find hardware support for SSE4.1 on this machine.")
-endif(NOT SSE4_1_FOUND)
-
-mark_as_advanced(SSE2_FOUND SSE3_FOUND SSSE3_FOUND SSE4_1_FOUND)
diff --git a/cmake/HostCFlags.cmake b/cmake/HostCFlags.cmake
deleted file mode 100644
index f38d8d7fd..000000000
--- a/cmake/HostCFlags.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-include (${project_cmake_dir}/FindSSE.cmake)
-
-if (SSE2_FOUND)
-  set (CMAKE_C_FLAGS_ALL "-msse -msse2 ${CMAKE_C_FLAGS_ALL}")
-  if (NOT APPLE)
-    set (CMAKE_C_FLAGS_ALL "-mfpmath=sse ${CMAKE_C_FLAGS_ALL}")
-  endif()
-endif()
-
-if (SSE3_FOUND)
-  set (CMAKE_C_FLAGS_ALL "-msse3 ${CMAKE_C_FLAGS_ALL}")
-endif()
-if (SSSE3_FOUND)
-  set (CMAKE_C_FLAGS_ALL "-mssse3 ${CMAKE_C_FLAGS_ALL}")
-endif()
-
-if (SSE4_1_FOUND OR SSE4_2_FOUND)
-  if (SSE4_1_FOUND)
-    set (CMAKE_C_FLAGS_ALL "-msse4.1 ${CMAKE_C_FLAGS_ALL}")
-  endif()
-  if (SSE4_2_FOUND)
-    set (CMAKE_C_FLAGS_ALL "-msse4.2 ${CMAKE_C_FLAGS_ALL}")
-  endif()
-else()
-  message(STATUS "\nSSE4 disabled.\n")
-endif()
-
diff --git a/cmake/Modules/FindTinyXML2.cmake b/cmake/Modules/FindTinyXML2.cmake
deleted file mode 100644
index fd3571e9b..000000000
--- a/cmake/Modules/FindTinyXML2.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-# CMake Logic to find system TinyXML2, sourced from:
-# ros2/tinyxml2_vendor
-# https://github.com/ros2/tinyxml2_vendor/commit/fde8000d31d68ff555431d63af3c324afba9f117#diff-120198e331f1dd3e7806c31af0cfb425
-
-# The CMake Logic here is licensed under Apache License 2.0
-# TinyXML2 itself is licensed under the zlib License
-
-# TinyXML2_FOUND
-# TinyXML2_INCLUDE_DIRS
-# TinyXML2_LIBRARIES
-
-# try to find the CMake config file for TinyXML2 first
-find_package(TinyXML2 CONFIG NAMES tinyxml2 QUIET)
-if(TinyXML2_FOUND)
-  message(STATUS "Found TinyXML2 via Config file: ${TinyXML2_DIR}")
-  if(NOT TINYXML2_LIBRARY)
-    # in this case, we're probably using TinyXML2 version 5.0.0 or greater
-    # in which case tinyxml2 is an exported target and we should use that
-    if(TARGET tinyxml2)
-      set(TINYXML2_LIBRARY tinyxml2)
-    elseif(TARGET tinyxml2::tinyxml2)
-      set(TINYXML2_LIBRARY tinyxml2::tinyxml2)
-    endif()
-  endif()
-else()
-  find_path(TINYXML2_INCLUDE_DIR NAMES tinyxml2.h)
-
-  find_library(TINYXML2_LIBRARY tinyxml2)
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(TinyXML2 DEFAULT_MSG TINYXML2_LIBRARY TINYXML2_INCLUDE_DIR)
-
-  mark_as_advanced(TINYXML2_INCLUDE_DIR TINYXML2_LIBRARY)
-endif()
-
-# Set mixed case INCLUDE_DIRS and LIBRARY variables from upper case ones.
-if(NOT TinyXML2_INCLUDE_DIRS)
-  set(TinyXML2_INCLUDE_DIRS ${TINYXML2_INCLUDE_DIR})
-endif()
-if(NOT TinyXML2_LIBRARIES)
-  set(TinyXML2_LIBRARIES ${TINYXML2_LIBRARY})
-endif()
diff --git a/cmake/SDFUtils.cmake b/cmake/SDFUtils.cmake
index 525c4d4c6..95633665c 100644
--- a/cmake/SDFUtils.cmake
+++ b/cmake/SDFUtils.cmake
@@ -1,127 +1,3 @@
-################################################################################
-#APPEND_TO_CACHED_STRING(_string _cacheDesc [items...])
-# Appends items to a cached list.
-MACRO (APPEND_TO_CACHED_STRING _string _cacheDesc)
-  FOREACH (newItem ${ARGN})
-    SET (${_string} "${${_string}} ${newItem}" CACHE INTERNAL ${_cacheDesc} FORCE)
-  ENDFOREACH (newItem ${ARGN})
-  #STRING(STRIP ${${_string}} ${_string})
-ENDMACRO (APPEND_TO_CACHED_STRING)
-
-################################################################################
-# APPEND_TO_CACHED_LIST (_list _cacheDesc [items...]
-# Appends items to a cached list.
-MACRO (APPEND_TO_CACHED_LIST _list _cacheDesc)
-  SET (tempList ${${_list}})
-  FOREACH (newItem ${ARGN})
-    LIST (APPEND tempList ${newItem})
-  ENDFOREACH (newItem ${newItem})
-  SET (${_list} ${tempList} CACHE INTERNAL ${_cacheDesc} FORCE)
-ENDMACRO(APPEND_TO_CACHED_LIST)
-
-#################################################
-# Macro to turn a list into a string (why doesn't CMake have this built-in?)
-MACRO (LIST_TO_STRING _string _list)
-    SET (${_string})
-    FOREACH (_item ${_list})
-      SET (${_string} "${${_string}} ${_item}")
-    ENDFOREACH (_item)
-    #STRING(STRIP ${${_string}} ${_string})
-ENDMACRO (LIST_TO_STRING)
-
-#################################################
-# BUILD ERROR macro
-macro (BUILD_ERROR)
-  foreach (str ${ARGN})
-    SET (msg "\t${str}")
-    MESSAGE (STATUS ${msg})
-    APPEND_TO_CACHED_LIST(build_errors "build errors" ${msg})
-  endforeach ()
-endmacro (BUILD_ERROR)
-
-#################################################
-# BUILD WARNING macro
-macro (BUILD_WARNING)
-  foreach (str ${ARGN})
-    SET (msg "\t${str}" )
-    MESSAGE (STATUS ${msg} )
-    APPEND_TO_CACHED_LIST(build_warnings "build warning" ${msg})
-  endforeach (str ${ARGN})
-endmacro (BUILD_WARNING)
-
-#################################################
-macro (sdf_add_library _name)
-  set(LIBS_DESTINATION ${PROJECT_BINARY_DIR}/src)
-  set_source_files_properties(${ARGN} PROPERTIES COMPILE_DEFINITIONS "BUILDING_DLL")
-  add_library(${_name} SHARED ${ARGN})
-  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBS_DESTINATION})
-  if (MSVC)
-    set_target_properties( ${_name} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${LIBS_DESTINATION})
-    set_target_properties( ${_name} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${LIBS_DESTINATION})
-    set_target_properties( ${_name} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${LIBS_DESTINATION})
-  endif ()
-endmacro ()
-
-#################################################
-macro (sdf_add_executable _name)
-  add_executable(${_name} ${ARGN})
-endmacro ()
-
-
-#################################################
-macro (sdf_install_includes _subdir)
-  install(FILES ${ARGN} DESTINATION ${INCLUDE_INSTALL_DIR}/${_subdir} COMPONENT headers)
-endmacro()
-
-#################################################
-macro (sdf_install_library _name)
-  set_target_properties(${_name} PROPERTIES SOVERSION ${SDF_MAJOR_VERSION} VERSION ${SDF_VERSION_FULL})
-  install (
-    TARGETS ${_name}
-    EXPORT ${_name}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    COMPONENT shlib)
-
-# Export and install target
-export(
-  EXPORT ${_name}
-  FILE ${PROJECT_BINARY_DIR}/cmake/${sdf_target_output_filename}
-  NAMESPACE ${PROJECT_EXPORT_NAME}::)
-
-install(
-  EXPORT ${_name}
-  DESTINATION ${sdf_config_install_dir}
-  FILE ${sdf_target_output_filename}
-  NAMESPACE ${PROJECT_EXPORT_NAME}::)
-
-endmacro ()
-
-#################################################
-macro (sdf_install_executable _name)
-  set_target_properties(${_name} PROPERTIES VERSION ${SDF_VERSION_FULL})
-  install (TARGETS ${_name} DESTINATION ${BIN_INSTALL_DIR})
-endmacro ()
-
-#################################################
-macro (sdf_setup_unix)
-endmacro()
-
-#################################################
-macro (sdf_setup_windows)
-  # Need for M_PI constant
-  add_definitions(-D_USE_MATH_DEFINES -DWINDOWS_LEAN_AND_MEAN)
-  # And force linking to MSVC dynamic runtime
-  set(CMAKE_C_FLAGS_DEBUG "/MDd ${CMAKE_C_FLAGS_DEBUG}")
-  set(CMAKE_C_FLAGS_RELEASE "/MD ${CMAKE_C_FLAGS_RELEASE}")
-endmacro()
-
-#################################################
-macro (sdf_setup_apple)
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined -Wl,dynamic_lookup")
-endmacro()
-
 #################################################
 # VAR: SDF_BUILD_TESTS_EXTRA_EXE_SRCS
 # Hack: extra sources to build binaries can be supplied to gz_build_tests in
@@ -141,7 +17,7 @@ macro (sdf_build_tests)
     )
 
     add_dependencies(${BINARY_NAME}
-      gtest gtest_main ${sdf_target}
+      gtest gtest_main ${PROJECT_LIBRARY_TARGET_NAME}
       )
 
     link_directories(${IGNITION-MATH_LIBRARY_DIRS})
@@ -151,7 +27,7 @@ macro (sdf_build_tests)
       target_link_libraries(${BINARY_NAME} PRIVATE
         libgtest.a
         libgtest_main.a
-        ${sdf_target}
+        ${PROJECT_LIBRARY_TARGET_NAME}
         pthread
         ${IGNITION-MATH_LIBRARIES}
       )
@@ -159,14 +35,14 @@ macro (sdf_build_tests)
       target_link_libraries(${BINARY_NAME} PRIVATE
         gtest.lib
         gtest_main.lib
-        ${sdf_target}
+        ${PROJECT_LIBRARY_TARGET_NAME}
         ${IGNITION-MATH_LIBRARIES}
       )
 
       # Copy in sdformat library
       add_custom_command(TARGET ${BINARY_NAME}
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        $<TARGET_FILE:sdformat${SDF_MAJOR_VERSION}>
+        $<TARGET_FILE:sdformat${PROJECT_VERSION_MAJOR}>
         $<TARGET_FILE_DIR:${BINARY_NAME}> VERBATIM)
 
     endif()
@@ -212,20 +88,6 @@ macro (sdf_build_tests)
   set(GZ_BUILD_TESTS_EXTRA_EXE_SRCS "")
 endmacro()
 
-#################################################
-# Macro to setup supported compiler warnings
-# Based on work of Florent Lamiraux, Thomas Moulard, JRL, CNRS/AIST.
-include(CheckCXXCompilerFlag)
-
-macro(filter_valid_compiler_warnings)
-  foreach(flag ${ARGN})
-    CHECK_CXX_COMPILER_FLAG(${flag} R${flag})
-    if(${R${flag}})
-      set(WARNING_CXX_FLAGS "${WARNING_CXX_FLAGS} ${flag}")
-    endif()
-  endforeach()
-endmacro()
-
 #################################################
 # Copied from catkin/cmake/empy.cmake
 function(find_python_module module)
diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
index b46ead127..8a83ba98d 100644
--- a/cmake/SearchForStuff.cmake
+++ b/cmake/SearchForStuff.cmake
@@ -1,14 +1,8 @@
-include (FindPkgConfig)
-
-# Detect the architecture
-include (${project_cmake_dir}/TargetArch.cmake)
-target_architecture(ARCH)
 message(STATUS "Building for arch: ${ARCH}")
 
 #################################################
 # Find tinyxml2.
-list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
-find_package(TinyXML2 REQUIRED)
+ign_find_package(TINYXML2 REQUIRED)
 
 ################################################
 # Find urdfdom parser. Logic:
@@ -16,50 +10,25 @@ find_package(TinyXML2 REQUIRED)
 #  1. if USE_INTERNAL_URDF is unset, try to use system installation, fallback to internal copy
 #  2. if USE_INTERNAL_URDF is set to True, use the internal copy
 #  3. if USE_INTERNAL_URDF is set to False, force to search system installation, fail on error
-
-if (NOT PKG_CONFIG_FOUND)
-  if (NOT DEFINED USE_INTERNAL_URDF)
-    BUILD_WARNING("Couldn't find pkg-config for urdfdom, using internal copy")
-    set(USE_INTERNAL_URDF true)
-  elseif(NOT USE_INTERNAL_URDF)
-    BUILD_ERROR("Couldn't find pkg-config for urdfdom")
-  endif()
-endif()
-
 if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF)
-  # check for urdfdom with pkg-config
-  pkg_check_modules(URDF urdfdom>=1.0)
-
-  if (NOT URDF_FOUND)
-    find_package(urdfdom)
-    if (urdfdom_FOUND)
-      set(URDF_INCLUDE_DIRS ${urdfdom_INCLUDE_DIRS})
-      # ${urdfdom_LIBRARIES} already contains absolute library filenames
-      set(URDF_LIBRARY_DIRS "")
-      set(URDF_LIBRARIES ${urdfdom_LIBRARIES})
-    elseif (NOT DEFINED USE_INTERNAL_URDF)
-      message(STATUS "Couldn't find urdfdom >= 1.0, using internal copy")
-      set(USE_INTERNAL_URDF true)
+  ign_find_package(IgnURDFDOM VERSION 1.0 QUIET)
+  if (NOT IgnURDFDOM_FOUND)
+    if (NOT DEFINED USE_INTERNAL_URDF)
+      # fallback to internal urdf
+      set(USE_INTERNAL_URDF ON)
     else()
-      BUILD_ERROR("Couldn't find the urdfdom >= 1.0 system installation")
+      ign_build_error("Couldn't find the urdfdom >= 1.0 system installation")
     endif()
-  else()
-    # what am I doing here? pkg-config and cmake
-    set(URDF_INCLUDE_DIRS ${URDF_INCLUDEDIR})
-    set(URDF_LIBRARY_DIRS ${URDF_LIBDIR})
   endif()
 endif()
 
+if (USE_INTERNAL_URDF)
+  message(STATUS "Using internal URDF")
+endif()
+
 #################################################
 # Find ign command line utility:
-find_package(ignition-tools)
-if (IGNITION-TOOLS_BINARY_DIRS)
-  message(STATUS "Looking for ignition-tools-config.cmake - found")
-else()
-  BUILD_WARNING ("ignition-tools not found, for command line utilities and for \
-generating aggregated SDFormat descriptions for sdformat.org, please install \
-ignition-tools.")
-endif()
+ign_find_package(ignition-tools)
 
 ################################################
 # Find the Python interpreter for running the
@@ -70,7 +39,7 @@ find_package(PythonInterp 3 QUIET)
 # Find psutil python package for memory tests
 find_python_module(psutil)
 if(NOT PY_PSUTIL)
-  BUILD_WARNING("Python psutil package not found. Memory leak tests will be skipped")
+  ign_build_warning("Python psutil package not found. Memory leak tests will be skipped")
 endif()
 
 ################################################
@@ -80,41 +49,21 @@ find_program(VALGRIND_PROGRAM NAMES valgrind PATH ${VALGRIND_ROOT}/bin)
 option(SDFORMAT_RUN_VALGRIND_TESTS "Run sdformat tests with Valgrind" FALSE)
 mark_as_advanced(SDFORMAT_RUN_VALGRIND_TESTS)
 if (SDFORMAT_RUN_VALGRIND_TESTS AND NOT VALGRIND_PROGRAM)
-  BUILD_WARNING("valgrind not found. Memory check tests will be skipped.")
+  ign_build_warning("valgrind not found. Memory check tests will be skipped.")
 endif()
 
 ################################################
 # Find ruby executable to produce xml schemas
 find_program(RUBY ruby)
 if (NOT RUBY)
-    BUILD_ERROR ("Ruby version 1.9 is needed to build xml schemas")
+    ign_build_error ("Ruby version 1.9 is needed to build xml schemas")
 else()
     message(STATUS "Found ruby executable: ${RUBY}")
 endif()
 
-#################################################
-# Macro to check for visibility capability in compiler
-# Original idea from: https://gitorious.org/ferric-cmake-stuff/
-macro (check_gcc_visibility)
-  include (CheckCXXCompilerFlag)
-  check_cxx_compiler_flag(-fvisibility=hidden GCC_SUPPORTS_VISIBILITY)
-endmacro()
-
-########################################
-# Find ignition cmake2
-# Only for using the testing macros and creating the codecheck target, not 
-# really being use to configure the whole project
-find_package(ignition-cmake2 2.3 REQUIRED)
-set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
-
 ########################################
 # Find ignition math
 # Set a variable for generating ProjectConfig.cmake
-find_package(ignition-math6 QUIET)
-if (NOT ignition-math6_FOUND)
-  message(STATUS "Looking for ignition-math6-config.cmake - not found")
-  BUILD_ERROR ("Missing: Ignition math (libignition-math6-dev)")
-else()
-  set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
-  message(STATUS "Looking for ignition-math${IGN_MATH_VER}-config.cmake - found")
-endif()
+ign_find_package(ignition-math6 VERSION REQUIRED)
+set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
+
diff --git a/cmake/TargetArch.cmake b/cmake/TargetArch.cmake
deleted file mode 100644
index d50073c82..000000000
--- a/cmake/TargetArch.cmake
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright (c) 2012 Petroules Corporation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-#     Redistributions of source code must retain the above copyright notice, this
-#     list of conditions and the following disclaimer.  Redistributions in binary
-#     form must reproduce the above copyright notice, this list of conditions and
-#     the following disclaimer in the documentation and/or other materials
-#     provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Based on the Qt 5 processor detection code, so should be very accurate
-# https://qt.gitorious.org/qt/qtbase/blobs/master/src/corelib/global/qprocessordetection.h
-# Currently handles arm (v5, v6, v7), x86 (32/64), ia64, and ppc (32/64)
-
-# Regarding POWER/PowerPC, just as is noted in the Qt source,
-# "There are many more known variants/revisions that we do not handle/detect."
-
-
-
-set(archdetect_c_code "
-#if defined(__arm__) || defined(__TARGET_ARCH_ARM)
-    #if defined(__ARM_ARCH_7__) \\
-        || defined(__ARM_ARCH_7A__) \\
-        || defined(__ARM_ARCH_7R__) \\
-        || defined(__ARM_ARCH_7M__) \\
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 7)
-        #error cmake_ARCH armv7
-    #elif defined(__ARM_ARCH_6__) \\
-        || defined(__ARM_ARCH_6J__) \\
-        || defined(__ARM_ARCH_6T2__) \\
-        || defined(__ARM_ARCH_6Z__) \\
-        || defined(__ARM_ARCH_6K__) \\
-        || defined(__ARM_ARCH_6ZK__) \\
-        || defined(__ARM_ARCH_6M__) \\
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 6)
-        #error cmake_ARCH armv6
-    #elif defined(__ARM_ARCH_5TEJ__) \\
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 5)
-        #error cmake_ARCH armv5
-    #else
-        #error cmake_ARCH arm
-    #endif
-#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
-    #error cmake_ARCH i386
-#elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
-    #error cmake_ARCH x86_64
-#elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
-    #error cmake_ARCH ia64
-#elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__) \\
-      || defined(_ARCH_COM) || defined(_ARCH_PWR) || defined(_ARCH_PPC)  \\
-      || defined(_M_MPPC) || defined(_M_PPC)
-    #if defined(__ppc64__) || defined(__powerpc64__) || defined(__64BIT__)
-        #error cmake_ARCH ppc64
-    #else
-        #error cmake_ARCH ppc
-    #endif
-#endif
-
-#error cmake_ARCH unknown
-")
-
-# Set ppc_support to TRUE before including this file or ppc and ppc64
-# will be treated as invalid architectures since they are no longer supported by Apple
-
-function(target_architecture output_var)
-    if(APPLE AND CMAKE_OSX_ARCHITECTURES)
-        # On OS X we use CMAKE_OSX_ARCHITECTURES *if* it was set
-        # First let's normalize the order of the values
-
-        # Note that it's not possible to compile PowerPC applications if you are using
-        # the OS X SDK version 10.6 or later - you'll need 10.4/10.5 for that, so we
-        # disable it by default
-        # See this page for more information:
-        # http://stackoverflow.com/questions/5333490/how-can-we-restore-ppc-ppc64-as-well-as-full-10-4-10-5-sdk-support-to-xcode-4
-
-        # Architecture defaults to i386 or ppc on OS X 10.5 and earlier, depending on the CPU type detected at runtime.
-        # On OS X 10.6+ the default is x86_64 if the CPU supports it, i386 otherwise.
-
-        foreach(osx_arch ${CMAKE_OSX_ARCHITECTURES})
-            if("${osx_arch}" STREQUAL "ppc" AND ppc_support)
-                set(osx_arch_ppc TRUE)
-            elseif("${osx_arch}" STREQUAL "i386")
-                set(osx_arch_i386 TRUE)
-            elseif("${osx_arch}" STREQUAL "x86_64")
-                set(osx_arch_x86_64 TRUE)
-            elseif("${osx_arch}" STREQUAL "ppc64" AND ppc_support)
-                set(osx_arch_ppc64 TRUE)
-            else()
-                message(FATAL_ERROR "Invalid OS X arch name: ${osx_arch}")
-            endif()
-        endforeach()
-
-        # Now add all the architectures in our normalized order
-        if(osx_arch_ppc)
-            list(APPEND ARCH ppc)
-        endif()
-
-        if(osx_arch_i386)
-            list(APPEND ARCH i386)
-        endif()
-
-        if(osx_arch_x86_64)
-            list(APPEND ARCH x86_64)
-        endif()
-
-        if(osx_arch_ppc64)
-            list(APPEND ARCH ppc64)
-        endif()
-    else()
-        file(WRITE "${CMAKE_BINARY_DIR}/arch.c" "${archdetect_c_code}")
-
-        enable_language(C)
-
-        # Detect the architecture in a rather creative way...
-        # This compiles a small C program which is a series of ifdefs that selects a
-        # particular #error preprocessor directive whose message string contains the
-        # target architecture. The program will always fail to compile (both because
-        # file is not a valid C program, and obviously because of the presence of the
-        # #error preprocessor directives... but by exploiting the preprocessor in this
-        # way, we can detect the correct target architecture even when cross-compiling,
-        # since the program itself never needs to be run (only the compiler/preprocessor)
-        try_run(
-            run_result_unused
-            compile_result_unused
-            "${CMAKE_BINARY_DIR}"
-            "${CMAKE_BINARY_DIR}/arch.c"
-            COMPILE_OUTPUT_VARIABLE ARCH
-            CMAKE_FLAGS CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
-        )
-
-        # Parse the architecture name from the compiler output
-        string(REGEX MATCH "cmake_ARCH ([a-zA-Z0-9_]+)" ARCH "${ARCH}")
-
-        # Get rid of the value marker leaving just the architecture name
-        string(REPLACE "cmake_ARCH " "" ARCH "${ARCH}")
-
-        # If we are compiling with an unknown architecture this variable should
-        # already be set to "unknown" but in the case that it's empty (i.e. due
-        # to a typo in the code), then set it to unknown
-        if (NOT ARCH)
-            set(ARCH unknown)
-        endif()
-    endif()
-
-    set(${output_var} "${ARCH}" PARENT_SCOPE)
-endfunction()
diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in
deleted file mode 100644
index 2037e3653..000000000
--- a/cmake/cmake_uninstall.cmake.in
+++ /dev/null
@@ -1,21 +0,0 @@
-if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-
-file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
-string(REGEX REPLACE "\n" ";" files "${files}")
-foreach(file ${files})
-  message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
-  if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-    exec_program(
-      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
-      OUTPUT_VARIABLE rm_out
-      RETURN_VALUE rm_retval
-      )
-    if(NOT "${rm_retval}" STREQUAL 0)
-      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
-    endif(NOT "${rm_retval}" STREQUAL 0)
-  else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
-  endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-endforeach(file)
diff --git a/cmake/cpack_options.cmake.in b/cmake/cpack_options.cmake.in
deleted file mode 100644
index b5cb6d5c1..000000000
--- a/cmake/cpack_options.cmake.in
+++ /dev/null
@@ -1,23 +0,0 @@
-set(CPACK_PACKAGE_NAME "@PROJECT_NAME_NO_VERSION@")
-set(CPACK_PACKAGE_VENDOR "sdformat.org")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Scene Description Format (SDF)")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME_NO_VERSION_LOWER@")
-set(CPACK_RESOURCE_FILE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@/LICENSE")
-set(CPACK_RESOURCE_FILE_README "@CMAKE_CURRENT_SOURCE_DIR@/README.md")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "@CMAKE_CURRENT_SOURCE_DIR@/README.md")
-set(CPACK_PACKAGE_MAINTAINER "Nate Koenig <nate@osrfoundation.org>")
-set(CPACK_PACKAGE_CONTACT "Nate Koenig <nate@osrfoundation.org>")
-
-set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "@DPKG_ARCH@")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "@DEBIAN_PACKAGE_DEPENDS@")
-set(CPACK_DEBIAN_PACKAGE_SECTION "devel")
-set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
-set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Format and parser for scene description files.")
-
-set(CPACK_RPM_PACKAGE_ARCHITECTURE "@DPKG_ARCH@")
-set(CPACK_RPM_PACKAGE_REQUIRES "@DEBIAN_PACKAGE_DEPENDS@")
-set(CPACK_RPM_PACKAGE_DESCRIPTION "Format and parser for scene description files.")
-
-set (CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_NO_VERSION_LOWER@-@SDF_VERSION_FULL@")
-set (CPACK_SOURCE_PACKAGE_FILE_NAME "@PROJECT_NAME_NO_VERSION_LOWER@-@SDF_VERSION_FULL@")
diff --git a/cmake/sdf_config.cmake.in b/cmake/sdf_config.cmake.in
deleted file mode 100644
index f4c511fa9..000000000
--- a/cmake/sdf_config.cmake.in
+++ /dev/null
@@ -1,40 +0,0 @@
-# We explicitly set the desired cmake version to ensure that the policy settings
-# of users or of toolchains do not result in the wrong behavior for our modules.
-# Note that the call to find_package(~) will PUSH a new policy stack before
-# taking on these version settings, and then that stack will POP after the
-# find_package(~) has exited, so this will not affect the cmake policy settings
-# of a caller.
-cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
-
-if(@PKG_NAME@_CONFIG_INCLUDED)
-  return()
-endif()
-set(@PKG_NAME@_CONFIG_INCLUDED TRUE)
-
-@PACKAGE_INIT@
-
-if(NOT TARGET @sdf_import_target_name@)
-  include("${CMAKE_CURRENT_LIST_DIR}/@sdf_target_output_filename@")
-endif()
-
-list(APPEND @PKG_NAME@_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include/sdformat-@SDF_VERSION@")
-
-list(APPEND @PKG_NAME@_CFLAGS "-I@CMAKE_INSTALL_PREFIX@/include/sdformat-@SDF_VERSION@")
-if (NOT WIN32)
-  list(APPEND @PKG_NAME@_CXX_FLAGS "${@PKG_NAME@_CFLAGS} -std=c++17")
-endif()
-
-list(APPEND @PKG_NAME@_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@")
-
-set(@PKG_NAME@_LIBRARIES @sdf_import_target_name@)
-
-# These variables are used by ignition-cmake to automatically configure the
-# pkgconfig files for ignition projects.
-set(@PROJECT_NAME_LOWER@_PKGCONFIG_ENTRY "@PROJECT_NAME_LOWER@")
-set(@PROJECT_NAME_LOWER@_PKGCONFIG_TYPE PKGCONFIG_REQUIRES)
-
-find_package(ignition-math@IGN_MATH_VER@)
-list(APPEND @PKG_NAME@_INCLUDE_DIRS ${IGNITION-MATH_INCLUDE_DIRS})
-list(APPEND @PKG_NAME@_LIBRARY_DIRS ${IGNITION-MATH_LIBRARY_DIRS})
-
-list(APPEND @PKG_NAME@_LDFLAGS "-L@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@")
diff --git a/cmake/sdf_cpack.cmake b/cmake/sdf_cpack.cmake
deleted file mode 100644
index 6267aae34..000000000
--- a/cmake/sdf_cpack.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-#Find available package generators
-
-# DEB
-if ("${CMAKE_SYSTEM}" MATCHES "Linux")
-  find_program(DPKG_PROGRAM dpkg)
-  if (EXISTS ${DPKG_PROGRAM})
-    list (APPEND CPACK_GENERATOR "DEB")
-  endif(EXISTS ${DPKG_PROGRAM})
-
-  find_program(RPMBUILD_PROGRAM rpmbuild)
-endif()
-
-list (APPEND CPACK_SOURCE_GENERATOR "TBZ2")
-list (APPEND CPACK_SOURCE_GENERATOR "ZIP")
-list (APPEND CPACK_SOURCE_IGNORE_FILES ";TODO;/.hg/;.swp$;/build/")
-
-include (InstallRequiredSystemLibraries)
-
-#execute_process(COMMAND dpkg --print-architecture _NPROCE)
-set (DEBIAN_PACKAGE_DEPENDS "libtinyxml-dev")
-
-set (RPM_PACKAGE_DEPENDS "libtinyxml-dev")
-
-set (SDF_CPACK_CFG_FILE "${PROJECT_BINARY_DIR}/cpack_options.cmake")
diff --git a/cmake/sdformat_pc.in b/cmake/sdformat_pc.in
deleted file mode 100644
index c95a781e2..000000000
--- a/cmake/sdformat_pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix="@CMAKE_INSTALL_PREFIX@"
-libdir=${prefix}/@LIB_INSTALL_DIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-
-Name: SDF
-Description: Robot Modeling Language (SDF)
-Version: @SDF_VERSION_FULL@
-Requires: ignition-math@IGN_MATH_VER@
-Libs: -L${libdir} -lsdformat@SDF_MAJOR_VERSION@
-CFlags: -I${includedir}/sdformat-@SDF_VERSION@ -std=c++17
diff --git a/cmake/upload_doc.sh.in b/cmake/upload_doc.sh.in
index 41a088b9a..04a58ddc0 100644
--- a/cmake/upload_doc.sh.in
+++ b/cmake/upload_doc.sh.in
@@ -18,7 +18,7 @@ make sdf_descriptions
 
 # Date/time stamp sdf descriptions
 for f in @CMAKE_BINARY_DIR@/sdf/full_*.sdf; do
-  cp ${f} ${f%.sdf}_@SDF_VERSION_FULL@_$(date +%Y%m%d_%H%M%S).sdf
+  cp ${f} ${f%.sdf}_@PROJECT_VERSION_FULL@_$(date +%Y%m%d_%H%M%S).sdf
 done
 
 # Upload sdf descriptions
@@ -39,11 +39,11 @@ if [ ! -f "@CMAKE_BINARY_DIR@/doxygen/html/index.html" ]; then
 fi
 
 # The code API
-s3cmd sync @CMAKE_BINARY_DIR@/doxygen/html/* s3://osrf-distributions/sdformat/api/@SDF_VERSION_FULL@/ --dry-run -v
+s3cmd sync @CMAKE_BINARY_DIR@/doxygen/html/* s3://osrf-distributions/sdformat/api/@PROJECT_VERSION_FULL@/ --dry-run -v
 
 echo -n "Upload code API(Y/n)? "
 read ans
 
 if [ "$ans" = "y" ] || [ "$ans" = "Y" ]; then
-  s3cmd sync @CMAKE_BINARY_DIR@/doxygen/html/* s3://osrf-distributions/sdformat/api/@SDF_VERSION_FULL@/ -v
+  s3cmd sync @CMAKE_BINARY_DIR@/doxygen/html/* s3://osrf-distributions/sdformat/api/@PROJECT_VERSION_FULL@/ -v
 fi
diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
index 001e28ee5..fd3b6d278 100644
--- a/conf/CMakeLists.txt
+++ b/conf/CMakeLists.txt
@@ -1,23 +1,23 @@
 # Used only for internal testing.
-set(ign_library_path "${CMAKE_BINARY_DIR}/test/lib/ruby/ignition/cmd${sdf_target}")
+set(ign_library_path "${CMAKE_BINARY_DIR}/test/lib/ruby/ignition/cmd${PROJECT_NAME}")
 
 # Generate a configuration file for internal testing.
 # Note that the major version of the library is included in the name.
 # Ex: sdformat0.yaml
 configure_file(
   "${PROJECT_NAME_NO_VERSION_LOWER}.yaml.in"
-    "${CMAKE_BINARY_DIR}/test/conf/${sdf_target}.yaml" @ONLY)
+    "${CMAKE_BINARY_DIR}/test/conf/${PROJECT_NAME}.yaml" @ONLY)
 
 # Used for the installed version.
-set(ign_library_path "${CMAKE_INSTALL_PREFIX}/lib/ruby/ignition/cmd${sdf_target}")
+set(ign_library_path "${CMAKE_INSTALL_PREFIX}/lib/ruby/ignition/cmd${PROJECT_NAME}")
 
 # Generate the configuration file that is installed.
 # Note that the major version of the library is included in the name.
 # Ex: sdformat0.yaml
 configure_file(
   "${PROJECT_NAME_NO_VERSION_LOWER}.yaml.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/${sdf_target}.yaml" @ONLY)
+  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.yaml" @ONLY)
 
 # Install the yaml configuration files in an unversioned location.
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${sdf_target}.yaml
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.yaml
   DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/)
diff --git a/conf/sdformat.yaml.in b/conf/sdformat.yaml.in
index e570ac97e..579e91bab 100644
--- a/conf/sdformat.yaml.in
+++ b/conf/sdformat.yaml.in
@@ -1,7 +1,7 @@
 --- # Subcommands available inside sdformat.
 format: 1.0.0
 library_name: @PROJECT_NAME_NO_VERSION@
-library_version: @SDF_VERSION_FULL@
+library_version: @PROJECT_VERSION_FULL@
 library_path: @ign_library_path@
 commands:
     - sdf   : Utilities for SDF files.
diff --git a/doc/sdf.in b/doc/sdf.in
index 39b19d004..5361dfc95 100644
--- a/doc/sdf.in
+++ b/doc/sdf.in
@@ -32,7 +32,7 @@ PROJECT_NAME           = SDF
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = @SDF_VERSION_FULL@
+PROJECT_NUMBER         = @PROJECT_VERSION_FULL@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
new file mode 100644
index 000000000..722dbe56c
--- /dev/null
+++ b/include/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(sdf)
diff --git a/include/sdf/CMakeLists.txt b/include/sdf/CMakeLists.txt
index 0a62d171d..94f57dcfe 100644
--- a/include/sdf/CMakeLists.txt
+++ b/include/sdf/CMakeLists.txt
@@ -1,63 +1,8 @@
-include (${sdf_cmake_dir}/SDFUtils.cmake)
-
-set (headers
-  Actor.hh
-  AirPressure.hh
-  Altimeter.hh
-  Assert.hh
-  Atmosphere.hh
-  Box.hh
-  Camera.hh
-  Collision.hh
-  Console.hh
-  Cylinder.hh
-  Element.hh
-  Error.hh
-  Exception.hh
-  Filesystem.hh
-  ForceTorque.hh
-  Frame.hh
-  Geometry.hh
-  Gui.hh
-  Heightmap.hh
-  Imu.hh
-  Joint.hh
-  JointAxis.hh
-  Lidar.hh
-  Light.hh
-  Link.hh
-  Magnetometer.hh
-  Material.hh
-  Mesh.hh
-  Model.hh
-  NavSat.hh
-  Noise.hh
-  Param.hh
-  parser.hh
-  ParticleEmitter.hh
-  Pbr.hh
-  Physics.hh
-  Plane.hh
-  Root.hh
-  Scene.hh
-  SDFImpl.hh
-  SemanticPose.hh
-  Sensor.hh
-  Sky.hh
-  Sphere.hh
-  Surface.hh
-  Types.hh
-  system_util.hh
-  Visual.hh
-  World.hh
+# Exlcude some files so that they are not added to the master header.
+ign_install_all_headers(EXCLUDE_FILES sdf.hh sdf_config.h)
+install(
+  FILES
+    sdf.hh
+    sdf_config.h
+  DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}/${PROJECT_INCLUDE_DIR}
 )
-
-set (sdf_headers "" CACHE INTERNAL "SDF headers" FORCE)
-foreach (hdr ${headers})
-  set(sdf_headers "${sdf_headers}#include <sdf/${hdr}>\n")
-endforeach()
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/sdf.hh.in
-                ${CMAKE_CURRENT_BINARY_DIR}/sdf.hh)
-
-sdf_install_includes("" ${headers}
-  ${CMAKE_CURRENT_BINARY_DIR}/sdf.hh)
diff --git a/cmake/sdf_config.h.in b/include/sdf/config.hh.in
similarity index 59%
rename from cmake/sdf_config.h.in
rename to include/sdf/config.hh.in
index 524088664..cf9482c43 100644
--- a/cmake/sdf_config.h.in
+++ b/include/sdf/config.hh.in
@@ -1,4 +1,7 @@
-/* config.h. Generated by CMake for @PROJECT_NAME@. */
+/* config.hh. Generated by CMake for @PROJECT_NAME@. */
+
+#ifndef SDF_CONFIG_HH_
+#define SDF_CONFIG_HH_
 
 /* Protocol version */
 #define SDF_PROTOCOL_VERSION "${SDF_PROTOCOL_VERSION}"
@@ -11,18 +14,18 @@
 #define SDF_VERSION "${SDF_PROTOCOL_VERSION}"
 
 /* Package version number */
-#define SDF_MAJOR_VERSION ${SDF_MAJOR_VERSION}
-#define SDF_MINOR_VERSION ${SDF_MINOR_VERSION}
-#define SDF_PATCH_VERSION ${SDF_PATCH_VERSION}
+#define SDF_MAJOR_VERSION ${PROJECT_VERSION_MAJOR}
+#define SDF_MINOR_VERSION ${PROJECT_VERSION_MINOR}
+#define SDF_PATCH_VERSION ${PROJECT_VERSION_PATCH}
 
-#define SDF_MAJOR_VERSION_STR "${SDF_MAJOR_VERSION}"
-#define SDF_MINOR_VERSION_STR "${SDF_MINOR_VERSION}"
-#define SDF_PATCH_VERSION_STR "${SDF_PATCH_VERSION}"
+#define SDF_MAJOR_VERSION_STR "${PROJECT_VERSION_MAJOR}"
+#define SDF_MINOR_VERSION_STR "${PROJECT_VERSION_MINOR}"
+#define SDF_PATCH_VERSION_STR "${PROJECT_VERSION_PATCH}"
 
-#define SDF_PKG_VERSION "${SDF_VERSION}"
-#define SDF_VERSION_FULL "${SDF_VERSION_FULL}"
-#define SDF_VERSION_NAME ${SDF_VERSION_NAME}
-#define SDF_VERSION_NAMESPACE v${SDF_MAJOR_VERSION}
+#define SDF_PKG_VERSION "${PROJECT_VERSION}"
+#define SDF_VERSION_FULL "${PROJECT_VERSION_FULL}"
+#define SDF_VERSION_NAME ${PROJECT_VERSION_NAME}
+#define SDF_VERSION_NAMESPACE v${PROJECT_VERSION_MAJOR}
 
 #define SDF_VERSION_HEADER "Simulation Description Format (SDF), version ${SDF_PROTOCOL_VERSION}\nCopyright (C) 2014 Open Source Robotics Foundation.\nReleased under the Apache 2 License.\nhttp://gazebosim.org/sdf\n\n"
 
@@ -35,3 +38,5 @@
 
 #define SDF_SHARE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/"
 #define SDF_VERSION_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/${SDF_PKG_VERSION}"
+
+#endif  // #ifndef SDF_CONFIG_HH_
diff --git a/include/sdf/sdf.hh b/include/sdf/sdf.hh
new file mode 100644
index 000000000..1421078c5
--- /dev/null
+++ b/include/sdf/sdf.hh
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef SDF_SDF_HH_
+#define SDF_SDF_HH_
+
+// TODO: deprecate this header?
+// #pragma message("sdf/sdf.hh is deprecated, use sdformat.hh instead")
+
+#include <sdformat.hh>
+
+#endif
diff --git a/include/sdf/sdf_config.h b/include/sdf/sdf_config.h
new file mode 100644
index 000000000..03798db07
--- /dev/null
+++ b/include/sdf/sdf_config.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef SDF_SDF_CONFIG_H_
+#define SDF_SDF_CONFIG_H_
+
+// TODO: deprecate this header?
+// #pragma message("sdf/sdf_config.h is deprecated, use sdf/config.hh instead")
+
+#include <sdf/config.hh>
+
+#endif
diff --git a/sdf/1.0/CMakeLists.txt b/sdf/1.0/CMakeLists.txt
index 1695588b1..dd62ae21c 100644
--- a/sdf/1.0/CMakeLists.txt
+++ b/sdf/1.0/CMakeLists.txt
@@ -27,4 +27,4 @@ set (sdfs
   world.sdf
 )
 
-install(FILES ${sdfs} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/1.0/)
+install(FILES ${sdfs} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${PROJECT_VERSION_MAJOR}/1.0/)
diff --git a/sdf/1.2/CMakeLists.txt b/sdf/1.2/CMakeLists.txt
index a37e84191..051e49e55 100644
--- a/sdf/1.2/CMakeLists.txt
+++ b/sdf/1.2/CMakeLists.txt
@@ -28,4 +28,4 @@ set (sdfs
   world.sdf
 )
 
-install(FILES ${sdfs} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/1.2)
+install(FILES ${sdfs} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${PROJECT_VERSION_MAJOR}/1.2)
diff --git a/sdf/1.3/CMakeLists.txt b/sdf/1.3/CMakeLists.txt
index b737f0e50..9325a7e19 100644
--- a/sdf/1.3/CMakeLists.txt
+++ b/sdf/1.3/CMakeLists.txt
@@ -29,4 +29,4 @@ set (sdfs
   world.sdf
 )
 
-install(FILES ${sdfs} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/1.3)
+install(FILES ${sdfs} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${PROJECT_VERSION_MAJOR}/1.3)
diff --git a/sdf/1.4/CMakeLists.txt b/sdf/1.4/CMakeLists.txt
index a59f4ea68..657bd085e 100644
--- a/sdf/1.4/CMakeLists.txt
+++ b/sdf/1.4/CMakeLists.txt
@@ -44,4 +44,4 @@ set (sdfs
   world.sdf
 )
 
-install(FILES ${sdfs} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/1.4)
+install(FILES ${sdfs} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${PROJECT_VERSION_MAJOR}/1.4)
diff --git a/sdf/1.5/CMakeLists.txt b/sdf/1.5/CMakeLists.txt
index 60fd6a15a..89e721573 100644
--- a/sdf/1.5/CMakeLists.txt
+++ b/sdf/1.5/CMakeLists.txt
@@ -76,5 +76,5 @@ add_custom_target(schema1_5 ALL DEPENDS ${SDF_SCHEMA})
 
 set_source_files_properties(${SDF_SCHEMA} PROPERTIES GENERATED TRUE)
 
-install(FILES 1_4.convert ${sdfs} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/1.5)
-install(FILES ${SDF_SCHEMA} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/1.5)
+install(FILES 1_4.convert ${sdfs} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${PROJECT_VERSION_MAJOR}/1.5)
+install(FILES ${SDF_SCHEMA} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${PROJECT_VERSION_MAJOR}/1.5)
diff --git a/sdf/1.6/CMakeLists.txt b/sdf/1.6/CMakeLists.txt
index c77c738ec..efedf3c3d 100644
--- a/sdf/1.6/CMakeLists.txt
+++ b/sdf/1.6/CMakeLists.txt
@@ -77,5 +77,5 @@ add_custom_target(schema1_6 ALL DEPENDS ${SDF_SCHEMA})
 
 set_source_files_properties(${SDF_SCHEMA} PROPERTIES GENERATED TRUE)
 
-install(FILES 1_5.convert ${sdfs} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/1.6)
-install(FILES ${SDF_SCHEMA} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/1.6)
+install(FILES 1_5.convert ${sdfs} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${PROJECT_VERSION_MAJOR}/1.6)
+install(FILES ${SDF_SCHEMA} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${PROJECT_VERSION_MAJOR}/1.6)
diff --git a/sdf/1.7/CMakeLists.txt b/sdf/1.7/CMakeLists.txt
index c170977c9..b59e58f0f 100644
--- a/sdf/1.7/CMakeLists.txt
+++ b/sdf/1.7/CMakeLists.txt
@@ -77,5 +77,5 @@ add_custom_target(schema1_7 ALL DEPENDS ${SDF_SCHEMA})
 
 set_source_files_properties(${SDF_SCHEMA} PROPERTIES GENERATED TRUE)
 
-install(FILES 1_6.convert ${sdfs} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/1.7)
-install(FILES ${SDF_SCHEMA} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/1.7)
+install(FILES 1_6.convert ${sdfs} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${PROJECT_VERSION_MAJOR}/1.7)
+install(FILES ${SDF_SCHEMA} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${PROJECT_VERSION_MAJOR}/1.7)
diff --git a/sdf/CMakeLists.txt b/sdf/CMakeLists.txt
index 6de59a3a4..7d50012da 100644
--- a/sdf/CMakeLists.txt
+++ b/sdf/CMakeLists.txt
@@ -38,5 +38,5 @@ if (IGNITION-TOOLS_BINARY_DIRS)
       COMMENT "Generating full description for spec ${desc_ver}"
       VERBATIM)
   endforeach()
-  add_custom_target(sdf_descriptions DEPENDS ${description_targets} ${sdf_target})
+  add_custom_target(sdf_descriptions DEPENDS ${description_targets} ${PROJECT_LIBRARY_TARGET_NAME})
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 75ae5c054..cd174abfc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,10 +4,6 @@ link_directories(
   ${PROJECT_BINARY_DIR}/test
 )
 
-if (NOT USE_INTERNAL_URDF)
-  link_directories(${URDF_LIBRARY_DIRS})
-endif()
-
 set (sources
   Actor.cc
   AirPressure.cc
@@ -79,8 +75,6 @@ if (USE_INTERNAL_URDF)
   urdf/urdf_parser/urdf_model_state.cpp
   urdf/urdf_parser/urdf_sensor.cpp
   urdf/urdf_parser/world.cpp)
-else()
-  include_directories(${URDF_INCLUDE_DIRS})
 endif()
 
 if (BUILD_SDF_TEST)
@@ -141,9 +135,9 @@ if (BUILD_SDF_TEST)
     )
   endif()
 
-  include_directories(${PROJECT_SOURCE_DIR}/test)
-  sdf_build_tests(${gtest_sources})
+  ign_build_tests(SOURCES ${gtest_sources} INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/test)
 
+  include_directories(${PROJECT_SOURCE_DIR}/test)
   if (TARGET UNIT_ign_TEST)
     # Link the libraries that we always need.
     target_link_libraries("UNIT_ign_TEST"
@@ -161,7 +155,7 @@ if (BUILD_SDF_TEST)
     set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS XmlUtils.cc)
     sdf_build_tests(XmlUtils_TEST.cc)
     target_link_libraries(UNIT_XmlUtils_TEST PRIVATE
-      ${TinyXML2_LIBRARIES})
+      TINYXML2::TINYXML2)
   endif()
 
   if (NOT WIN32)
@@ -173,21 +167,17 @@ if (BUILD_SDF_TEST)
     set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS Converter.cc EmbeddedSdf.cc XmlUtils.cc)
     sdf_build_tests(Converter_TEST.cc)
     target_link_libraries(UNIT_Converter_TEST PRIVATE
-      ${TinyXML2_LIBRARIES})
+      TINYXML2::TINYXML2)
   endif()
 
   if (NOT WIN32)
     set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS SDFExtension.cc parser_urdf.cc XmlUtils.cc)
     sdf_build_tests(parser_urdf_TEST.cc)
     if (NOT USE_INTERNAL_URDF)
-      target_compile_options(UNIT_parser_urdf_TEST PRIVATE ${URDF_CFLAGS})
-      if (${CMAKE_VERSION} VERSION_GREATER 3.13)
-        target_link_options(UNIT_parser_urdf_TEST PRIVATE ${URDF_LDFLAGS})
-      endif()
-      target_link_libraries(UNIT_parser_urdf_TEST PRIVATE ${URDF_LIBRARIES})
+      target_link_libraries(UNIT_parser_urdf_TEST PRIVATE IgnURDFDOM::IgnURDFDOM)
     endif()
     target_link_libraries(UNIT_parser_urdf_TEST PRIVATE
-      ${TinyXML2_LIBRARIES})
+      TINYXML2::TINYXML2)
   endif()
 
   if (NOT WIN32)
@@ -195,48 +185,40 @@ if (BUILD_SDF_TEST)
           parser_urdf.cc FrameSemantics.cc Converter.cc EmbeddedSdf.cc SDFExtension.cc)
     sdf_build_tests(ParamPassing_TEST.cc)
     if (NOT USE_INTERNAL_URDF)
-      target_compile_options(UNIT_ParamPassing_TEST PRIVATE ${URDF_CFLAGS})
-      if (${CMAKE_VERSION} VERSION_GREATER 3.13)
-        target_link_options(UNIT_ParamPassing_TEST PRIVATE ${URDF_LDFLAGS})
-      endif()
-      target_link_libraries(UNIT_ParamPassing_TEST PRIVATE ${URDF_LIBRARIES})
+      target_link_libraries(UNIT_ParamPassing_TEST PRIVATE IgnURDFDOM::IgnURDFDOM)
     endif()
     target_link_libraries(UNIT_ParamPassing_TEST PRIVATE
-      ${TinyXML2_LIBRARIES})
+      TINYXML2::TINYXML2)
   endif()
 endif()
 
-sdf_add_library(${sdf_target} ${sources})
-target_compile_features(${sdf_target} PUBLIC cxx_std_17)
-target_link_libraries(${sdf_target}
+ign_create_core_library(SOURCES ${sources} CXX_STANDARD 17)
+
+target_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
     ignition-math${IGN_MATH_VER}::ignition-math${IGN_MATH_VER}
   PRIVATE
-    ${TinyXML2_LIBRARIES})
+    TINYXML2::TINYXML2)
 
 if (WIN32)
-  target_compile_definitions(${sdf_target} PRIVATE URDFDOM_STATIC)
+  target_compile_definitions(${PROJECT_LIBRARY_TARGET_NAME} PRIVATE URDFDOM_STATIC)
 endif()
 
-target_include_directories(${sdf_target}
+target_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/..>
 )
 
-message (STATUS "URDF_LIBRARY_DIRS=${URDF_LIBRARY_DIRS}")
-message (STATUS "URDF_LIBRARIES=${URDF_LIBRARIES}")
-
 if (NOT USE_INTERNAL_URDF)
-  target_compile_options(${sdf_target} PRIVATE ${URDF_CFLAGS})
-  if (${CMAKE_VERSION} VERSION_GREATER 3.13)
-    target_link_options(${sdf_target} PRIVATE ${URDF_LDFLAGS})
-  endif()
-  target_link_libraries(${sdf_target} PRIVATE ${URDF_LIBRARIES})
+  target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} PRIVATE IgnURDFDOM::IgnURDFDOM)
 endif()
 
-sdf_install_library(${sdf_target})
-
 if(NOT WIN32)
   add_subdirectory(cmd)
 endif()
diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
index 89534f7aa..e831d413a 100644
--- a/src/cmd/CMakeLists.txt
+++ b/src/cmd/CMakeLists.txt
@@ -2,12 +2,12 @@
 # Generate the ruby script for internal testing.
 # Note that the major version of the library is included in the name.
 # Ex: cmdsdformat0.rb
-set(cmd_script_generated_test "${CMAKE_BINARY_DIR}/test/lib/ruby/ignition/cmd${sdf_target}.rb")
+set(cmd_script_generated_test "${CMAKE_BINARY_DIR}/test/lib/ruby/ignition/cmd${PROJECT_NAME}.rb")
 set(cmd_script_configured_test "${cmd_script_generated_test}.configured")
 
 # Set the library_location variable to the full path of the library file within
 # the build directory.
-set(library_location "$<TARGET_FILE:${sdf_target}>")
+set(library_location "$<TARGET_FILE:${PROJECT_NAME}>")
 
 configure_file(
   "cmd${PROJECT_NAME_NO_VERSION_LOWER}.rb.in"
@@ -24,12 +24,12 @@ file(GENERATE
 # Generate the ruby script that gets installed.
 # Note that the major version of the library is included in the name.
 # Ex: cmdsdformat0.rb
-set(cmd_script_generated "${CMAKE_CURRENT_BINARY_DIR}/cmd${sdf_target}.rb")
+set(cmd_script_generated "${CMAKE_CURRENT_BINARY_DIR}/cmd${PROJECT_NAME}.rb")
 set(cmd_script_configured "${cmd_script_generated}.configured")
 
 # Set the library_location variable to the relative path to the library file
 # within the install directory structure.
-set(library_location "../../../${CMAKE_INSTALL_LIBDIR}/$<TARGET_FILE_NAME:${sdf_target}>")
+set(library_location "../../../${CMAKE_INSTALL_LIBDIR}/$<TARGET_FILE_NAME:${PROJECT_NAME}>")
 
 configure_file(
   "cmd${PROJECT_NAME_NO_VERSION_LOWER}.rb.in"
diff --git a/src/cmd/cmdsdformat.rb.in b/src/cmd/cmdsdformat.rb.in
index 4d354c3b9..ea564f415 100644
--- a/src/cmd/cmdsdformat.rb.in
+++ b/src/cmd/cmdsdformat.rb.in
@@ -29,7 +29,7 @@ require 'optparse'
 
 # Constants.
 LIBRARY_NAME = '@library_location@'
-LIBRARY_VERSION = '@SDF_VERSION_FULL@'
+LIBRARY_VERSION = '@PROJECT_VERSION_FULL@'
 COMMON_OPTIONS =
                "  -h [ --help ]                    Print this help message.\n"\
                "  --force-version <VERSION>        Use a specific library version.\n"\
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 22926fd5a..c1bffcf4c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,33 +1,17 @@
-include_directories (
-  ${PROJECT_SOURCE_DIR}/include
-  ${PROJECT_BINARY_DIR}/include
-  ${PROJECT_SOURCE_DIR}/test/gtest/include
-  ${PROJECT_SOURCE_DIR}/test/gtest
-  ${PROJECT_SOURCE_DIR}/test
-  ${IGNITION-MATH_INCLUDE_DIRS}
-)
-
-link_directories(
-  ${IGNITION-MATH_LIBRARY_DIRS}
-)
-
-if (USE_EXTERNAL_TINYXML)
-  include_directories(${tinyxml_INCLUDE_DIRS})
-  link_directories(${tinyxml_LIBRARY_DIRS})
-endif()
-
-configure_file(test_config.h.in ${PROJECT_BINARY_DIR}/test_config.h)
+configure_file(test_config.h.in ${PROJECT_BINARY_DIR}/include/test_config.h)
 
 # Build gtest
 add_library(gtest STATIC gtest/src/gtest-all.cc)
+target_include_directories(gtest
+  PRIVATE
+    ${PROJECT_SOURCE_DIR}/test/gtest/include
+    ${PROJECT_SOURCE_DIR}/test/gtest
+)
 add_library(gtest_main STATIC gtest/src/gtest_main.cc)
 target_link_libraries(gtest_main gtest)
-set(GTEST_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest.a")
-set(GTEST_MAIN_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest_main.a")
 
 execute_process(COMMAND cmake -E remove_directory ${CMAKE_BINARY_DIR}/test_results)
 execute_process(COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test_results)
-include_directories(${GTEST_INCLUDE_DIRS})
 
 add_subdirectory(integration)
 add_subdirectory(performance)
diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt
index 22635b46b..0423ec1f2 100644
--- a/test/integration/CMakeLists.txt
+++ b/test/integration/CMakeLists.txt
@@ -56,12 +56,10 @@ find_program(XMLLINT_EXE xmllint)
 if (EXISTS ${XMLLINT_EXE})
   set (tests ${tests} schema_test.cc)
 else()
-  BUILD_WARNING("xmllint not found. schema_test won't be run")
+  ign_build_warning("xmllint not found. schema_test won't be run")
 endif()
 
-link_directories(${PROJECT_BINARY_DIR}/test)
-
-sdf_build_tests(${tests})
+ign_build_tests(TYPE ${TEST_TYPE} SOURCES ${tests} INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/test)
 
 if (EXISTS ${XMLLINT_EXE})
   # Need to run schema target (build .xsd files) before running schema_test
@@ -72,5 +70,5 @@ endif()
 if (UNIX AND NOT APPLE)
   configure_file(all_symbols_have_version.bash.in ${CMAKE_CURRENT_BINARY_DIR}/all_symbols_have_version.bash @ONLY)
   add_test(NAME INTEGRATION_versioned_symbols
-    COMMAND bash ${CMAKE_CURRENT_BINARY_DIR}/all_symbols_have_version.bash ${CMAKE_BINARY_DIR}/src/libsdformat${SDF_MAJOR_VERSION}.so)
+    COMMAND bash ${CMAKE_CURRENT_BINARY_DIR}/all_symbols_have_version.bash ${CMAKE_BINARY_DIR}/src/libsdformat${PROJECT_VERSION_MAJOR}.so)
 endif()
diff --git a/test/integration/all_symbols_have_version.bash.in b/test/integration/all_symbols_have_version.bash.in
index cdb5055d1..d69a58442 100644
--- a/test/integration/all_symbols_have_version.bash.in
+++ b/test/integration/all_symbols_have_version.bash.in
@@ -1,7 +1,7 @@
 # Returns non-zero exit code if there are symbols which don't contain the project major version
 
 LIBPATH=$1
-VERSIONED_NS=v@SDF_MAJOR_VERSION@
+VERSIONED_NS=v@PROJECT_VERSION_MAJOR@
 
 # Sanity check - there should be at least one symbol
 NUM_SYMBOLS=$(nm $LIBPATH | grep -e "sdf" | wc -l)
diff --git a/test/performance/CMakeLists.txt b/test/performance/CMakeLists.txt
index 8df89ac74..807cb38e6 100644
--- a/test/performance/CMakeLists.txt
+++ b/test/performance/CMakeLists.txt
@@ -4,6 +4,4 @@ set(tests
   parser_urdf.cc
 )
 
-link_directories(${PROJECT_BINARY_DIR}/test)
-
-sdf_build_tests(${tests})
+ign_build_tests(TYPE ${TEST_TYPE} SOURCES ${tests} INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/test)

From 920296f5ef2afffe13792570f172ba4f57debb15 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Wed, 8 Dec 2021 20:30:43 -0800
Subject: [PATCH 02/28] Find packages in root CMakeLists.txt

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 CMakeLists.txt             | 70 +++++++++++++++++++++++++++++++++++++-
 cmake/SearchForStuff.cmake | 69 -------------------------------------
 2 files changed, 69 insertions(+), 70 deletions(-)
 delete mode 100644 cmake/SearchForStuff.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbed65594..e0cdc08f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,8 +34,76 @@ if (BUILD_SDF)
     REPLACE_IGNITION_INCLUDE_PATH sdf)
 
   message (STATUS "\n\n====== Finding 3rd Party Packages ======")
+  message(STATUS "Building for arch: ${ARCH}")
+
+  #################################################
+  # Find tinyxml2.
+  ign_find_package(TINYXML2 REQUIRED)
+
+  ################################################
+  # Find urdfdom parser. Logic:
+  #
+  #  1. if USE_INTERNAL_URDF is unset, try to use system installation, fallback to internal copy
+  #  2. if USE_INTERNAL_URDF is set to True, use the internal copy
+  #  3. if USE_INTERNAL_URDF is set to False, force to search system installation, fail on error
+  if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF)
+    ign_find_package(IgnURDFDOM VERSION 1.0 QUIET)
+    if (NOT IgnURDFDOM_FOUND)
+      if (NOT DEFINED USE_INTERNAL_URDF)
+        # fallback to internal urdf
+        set(USE_INTERNAL_URDF ON)
+      else()
+        ign_build_error("Couldn't find the urdfdom >= 1.0 system installation")
+      endif()
+    endif()
+  endif()
+
+  if (USE_INTERNAL_URDF)
+    message(STATUS "Using internal URDF")
+  endif()
+
+  #################################################
+  # Find ign command line utility:
+  ign_find_package(ignition-tools)
+
+  ################################################
+  # Find the Python interpreter for running the
+  # check_test_ran.py script
+  find_package(PythonInterp 3 QUIET)
+
+  ################################################
+  # Find psutil python package for memory tests
   include (${sdf_cmake_dir}/SDFUtils.cmake)
-  include (${sdf_cmake_dir}/SearchForStuff.cmake)
+  find_python_module(psutil)
+  if(NOT PY_PSUTIL)
+    ign_build_warning("Python psutil package not found. Memory leak tests will be skipped")
+  endif()
+
+  ################################################
+  # Find Valgrind for checking memory leaks in the
+  # tests
+  find_program(VALGRIND_PROGRAM NAMES valgrind PATH ${VALGRIND_ROOT}/bin)
+  option(SDFORMAT_RUN_VALGRIND_TESTS "Run sdformat tests with Valgrind" FALSE)
+  mark_as_advanced(SDFORMAT_RUN_VALGRIND_TESTS)
+  if (SDFORMAT_RUN_VALGRIND_TESTS AND NOT VALGRIND_PROGRAM)
+    ign_build_warning("valgrind not found. Memory check tests will be skipped.")
+  endif()
+
+  ################################################
+  # Find ruby executable to produce xml schemas
+  find_program(RUBY ruby)
+  if (NOT RUBY)
+      ign_build_error ("Ruby version 1.9 is needed to build xml schemas")
+  else()
+      message(STATUS "Found ruby executable: ${RUBY}")
+  endif()
+
+  ########################################
+  # Find ignition math
+  # Set a variable for generating ProjectConfig.cmake
+  ign_find_package(ignition-math6 VERSION REQUIRED)
+  set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
+
   message (STATUS "----------------------------------------\n")
 
   ign_configure_build(QUIT_IF_BUILD_ERRORS)
diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
deleted file mode 100644
index 8a83ba98d..000000000
--- a/cmake/SearchForStuff.cmake
+++ /dev/null
@@ -1,69 +0,0 @@
-message(STATUS "Building for arch: ${ARCH}")
-
-#################################################
-# Find tinyxml2.
-ign_find_package(TINYXML2 REQUIRED)
-
-################################################
-# Find urdfdom parser. Logic:
-#
-#  1. if USE_INTERNAL_URDF is unset, try to use system installation, fallback to internal copy
-#  2. if USE_INTERNAL_URDF is set to True, use the internal copy
-#  3. if USE_INTERNAL_URDF is set to False, force to search system installation, fail on error
-if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF)
-  ign_find_package(IgnURDFDOM VERSION 1.0 QUIET)
-  if (NOT IgnURDFDOM_FOUND)
-    if (NOT DEFINED USE_INTERNAL_URDF)
-      # fallback to internal urdf
-      set(USE_INTERNAL_URDF ON)
-    else()
-      ign_build_error("Couldn't find the urdfdom >= 1.0 system installation")
-    endif()
-  endif()
-endif()
-
-if (USE_INTERNAL_URDF)
-  message(STATUS "Using internal URDF")
-endif()
-
-#################################################
-# Find ign command line utility:
-ign_find_package(ignition-tools)
-
-################################################
-# Find the Python interpreter for running the
-# check_test_ran.py script
-find_package(PythonInterp 3 QUIET)
-
-################################################
-# Find psutil python package for memory tests
-find_python_module(psutil)
-if(NOT PY_PSUTIL)
-  ign_build_warning("Python psutil package not found. Memory leak tests will be skipped")
-endif()
-
-################################################
-# Find Valgrind for checking memory leaks in the
-# tests
-find_program(VALGRIND_PROGRAM NAMES valgrind PATH ${VALGRIND_ROOT}/bin)
-option(SDFORMAT_RUN_VALGRIND_TESTS "Run sdformat tests with Valgrind" FALSE)
-mark_as_advanced(SDFORMAT_RUN_VALGRIND_TESTS)
-if (SDFORMAT_RUN_VALGRIND_TESTS AND NOT VALGRIND_PROGRAM)
-  ign_build_warning("valgrind not found. Memory check tests will be skipped.")
-endif()
-
-################################################
-# Find ruby executable to produce xml schemas
-find_program(RUBY ruby)
-if (NOT RUBY)
-    ign_build_error ("Ruby version 1.9 is needed to build xml schemas")
-else()
-    message(STATUS "Found ruby executable: ${RUBY}")
-endif()
-
-########################################
-# Find ignition math
-# Set a variable for generating ProjectConfig.cmake
-ign_find_package(ignition-math6 VERSION REQUIRED)
-set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
-

From cd75113b4a406f041fb4d82d0792a71901a57509 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 9 Dec 2021 10:21:21 -0800
Subject: [PATCH 03/28] system_util.hh: use macros from Export.hh

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 include/sdf/system_util.hh | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/include/sdf/system_util.hh b/include/sdf/system_util.hh
index a94b9f46e..8d244f38c 100644
--- a/include/sdf/system_util.hh
+++ b/include/sdf/system_util.hh
@@ -17,38 +17,17 @@
 #ifndef SDF_VISIBLE_HH_
 #define SDF_VISIBLE_HH_
 
+#include <sdf/Export.hh>
+
 /** \def SDFORMAT_VISIBLE
  * Use to represent "symbol visible" if supported
  */
+#define SDFORMAT_VISIBLE IGNITION_SDFORMAT_VISIBLE
 
 /** \def SDFORMAT_HIDDEN
  * Use to represent "symbol hidden" if supported
  */
-
-#if defined _WIN32 || defined __CYGWIN__
-  #ifdef BUILDING_DLL
-    #ifdef __GNUC__
-      #define SDFORMAT_VISIBLE __attribute__ ((dllexport))
-    #else
-      #define SDFORMAT_VISIBLE __declspec(dllexport)
-    #endif
-  #else
-    #ifdef __GNUC__
-      #define SDFORMAT_VISIBLE __attribute__ ((dllimport))
-    #else
-      #define SDFORMAT_VISIBLE __declspec(dllimport)
-    #endif
-  #endif
-  #define SDFORMAT_HIDDEN
-#else
-  #if __GNUC__ >= 4 && !defined SDFORMAT_STATIC_DEFINE
-    #define SDFORMAT_VISIBLE __attribute__ ((visibility ("default")))
-    #define SDFORMAT_HIDDEN  __attribute__ ((visibility ("hidden")))
-  #else
-    #define SDFORMAT_VISIBLE
-    #define SDFORMAT_HIDDEN
-  #endif
-#endif
+#define SDFORMAT_HIDDEN IGNITION_SDFORMAT_HIDDEN
 
 // SDF_VISIBLE_HH_
 #endif

From dc2587a733895cea1bdb140a8e9707949c2f3d7c Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 9 Dec 2021 10:22:03 -0800
Subject: [PATCH 04/28] try ci_matching_branch_bionic branch in workflow

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2914eb5d5..79271c3e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Compile and test
         id: ci
-        uses: ignition-tooling/action-ignition-ci@bionic
+        uses: ignition-tooling/action-ignition-ci@ci_matching_branch_bionic
         with:
           codecov-enabled: true
   focal-ci:

From 74b44f9a959f86a4b1d3f73bb6d41d4c0bdede92 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 9 Dec 2021 11:43:49 -0800
Subject: [PATCH 05/28] Add anyone to todo comments

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 include/sdf/sdf.hh       | 2 +-
 include/sdf/sdf_config.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/sdf/sdf.hh b/include/sdf/sdf.hh
index 1421078c5..c32ef5812 100644
--- a/include/sdf/sdf.hh
+++ b/include/sdf/sdf.hh
@@ -18,7 +18,7 @@
 #ifndef SDF_SDF_HH_
 #define SDF_SDF_HH_
 
-// TODO: deprecate this header?
+// TODO(anyone): deprecate this header?
 // #pragma message("sdf/sdf.hh is deprecated, use sdformat.hh instead")
 
 #include <sdformat.hh>
diff --git a/include/sdf/sdf_config.h b/include/sdf/sdf_config.h
index 03798db07..6ea2f29b4 100644
--- a/include/sdf/sdf_config.h
+++ b/include/sdf/sdf_config.h
@@ -18,7 +18,7 @@
 #ifndef SDF_SDF_CONFIG_H_
 #define SDF_SDF_CONFIG_H_
 
-// TODO: deprecate this header?
+// TODO(anyone): deprecate this header?
 // #pragma message("sdf/sdf_config.h is deprecated, use sdf/config.hh instead")
 
 #include <sdf/config.hh>

From 407b76059411c1310724ad904ee9e145f127c1b3 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 9 Dec 2021 12:01:43 -0800
Subject: [PATCH 06/28] Fix versioned_symbols test

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 test/integration/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt
index 0423ec1f2..eed5cea69 100644
--- a/test/integration/CMakeLists.txt
+++ b/test/integration/CMakeLists.txt
@@ -70,5 +70,5 @@ endif()
 if (UNIX AND NOT APPLE)
   configure_file(all_symbols_have_version.bash.in ${CMAKE_CURRENT_BINARY_DIR}/all_symbols_have_version.bash @ONLY)
   add_test(NAME INTEGRATION_versioned_symbols
-    COMMAND bash ${CMAKE_CURRENT_BINARY_DIR}/all_symbols_have_version.bash ${CMAKE_BINARY_DIR}/src/libsdformat${PROJECT_VERSION_MAJOR}.so)
+    COMMAND bash ${CMAKE_CURRENT_BINARY_DIR}/all_symbols_have_version.bash $<TARGET_FILE:${PROJECT_NAME}>)
 endif()

From aa33fe54d3a20886220c972158f26d75fd531885 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 9 Dec 2021 14:56:48 -0800
Subject: [PATCH 07/28] Revert to bionic branch for action

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 79271c3e6..2914eb5d5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Compile and test
         id: ci
-        uses: ignition-tooling/action-ignition-ci@ci_matching_branch_bionic
+        uses: ignition-tooling/action-ignition-ci@bionic
         with:
           codecov-enabled: true
   focal-ci:

From 9847dbcdafeb23b348f32acd66188b5e9b7c3a94 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 9 Dec 2021 14:57:04 -0800
Subject: [PATCH 08/28] Restore sdf_setup_windows

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 CMakeLists.txt       | 4 ++++
 cmake/SDFUtils.cmake | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0cdc08f6..0cce631aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,10 @@ if (BUILD_SDF)
 
   message (STATUS "----------------------------------------\n")
 
+  if (WIN32)
+    sdf_setup_windows()
+  endif ()
+
   ign_configure_build(QUIT_IF_BUILD_ERRORS)
   ign_create_packages()
 
diff --git a/cmake/SDFUtils.cmake b/cmake/SDFUtils.cmake
index 95633665c..c1e0bac38 100644
--- a/cmake/SDFUtils.cmake
+++ b/cmake/SDFUtils.cmake
@@ -1,3 +1,12 @@
+#################################################
+macro (sdf_setup_windows)
+  # Need for M_PI constant
+  add_definitions(-D_USE_MATH_DEFINES -DWINDOWS_LEAN_AND_MEAN)
+  # And force linking to MSVC dynamic runtime
+  set(CMAKE_C_FLAGS_DEBUG "/MDd ${CMAKE_C_FLAGS_DEBUG}")
+  set(CMAKE_C_FLAGS_RELEASE "/MD ${CMAKE_C_FLAGS_RELEASE}")
+endmacro()
+
 #################################################
 # VAR: SDF_BUILD_TESTS_EXTRA_EXE_SRCS
 # Hack: extra sources to build binaries can be supplied to gz_build_tests in

From 08bda5088e32d892e08ee7535c7d5871258c90d2 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 9 Dec 2021 14:58:04 -0800
Subject: [PATCH 09/28] Update examples/CMakeLists.txt to use targets

This may represent a breakage for downstream users
of the SDFormat_* cmake variables.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 examples/CMakeLists.txt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 298f0e6f9..e14ff2b3f 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -4,11 +4,8 @@ find_package(sdformat10 REQUIRED)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 
-include_directories(${SDFormat_INCLUDE_DIRS})
-link_directories(${SDFormat_LIBRARY_DIRS})
-
 add_executable(simple simple.cc)
-target_link_libraries(simple ${SDFormat_LIBRARIES})
+target_link_libraries(simple sdformat10::sdformat10
 
 add_executable(dom dom.cc)
-target_link_libraries(dom ${SDFormat_LIBRARIES})
+target_link_libraries(dom sdformat10::sdformat10)

From 0a3212854358ba2cc3860836d4e36119f41c9396 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 9 Dec 2021 15:25:25 -0800
Subject: [PATCH 10/28] fix )

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 examples/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index e14ff2b3f..5593038b1 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -5,7 +5,7 @@ find_package(sdformat10 REQUIRED)
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 
 add_executable(simple simple.cc)
-target_link_libraries(simple sdformat10::sdformat10
+target_link_libraries(simple sdformat10::sdformat10)
 
 add_executable(dom dom.cc)
 target_link_libraries(dom sdformat10::sdformat10)

From 775ebb925a0674b30de9c13b16e21f1f442ba112 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 9 Dec 2021 16:16:35 -0800
Subject: [PATCH 11/28] Filesystem: try adding windows header

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 src/Filesystem.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Filesystem.cc b/src/Filesystem.cc
index 5096a6427..287f818fe 100644
--- a/src/Filesystem.cc
+++ b/src/Filesystem.cc
@@ -50,6 +50,7 @@
 #include <unistd.h>
 #else
 #include <windows.h>
+#include <winioctl.h>
 #include <winnt.h>
 #endif
 

From 1db01222114b7b9fce5552100e77fed67c0e1bab Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 9 Dec 2021 17:18:49 -0800
Subject: [PATCH 12/28] Try removing sdf_setup_windows

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 CMakeLists.txt       |  4 ----
 cmake/SDFUtils.cmake |  9 ---------
 src/CMakeLists.txt   | 11 +++++++++--
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cce631aa..e0cdc08f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,10 +106,6 @@ if (BUILD_SDF)
 
   message (STATUS "----------------------------------------\n")
 
-  if (WIN32)
-    sdf_setup_windows()
-  endif ()
-
   ign_configure_build(QUIT_IF_BUILD_ERRORS)
   ign_create_packages()
 
diff --git a/cmake/SDFUtils.cmake b/cmake/SDFUtils.cmake
index c1e0bac38..95633665c 100644
--- a/cmake/SDFUtils.cmake
+++ b/cmake/SDFUtils.cmake
@@ -1,12 +1,3 @@
-#################################################
-macro (sdf_setup_windows)
-  # Need for M_PI constant
-  add_definitions(-D_USE_MATH_DEFINES -DWINDOWS_LEAN_AND_MEAN)
-  # And force linking to MSVC dynamic runtime
-  set(CMAKE_C_FLAGS_DEBUG "/MDd ${CMAKE_C_FLAGS_DEBUG}")
-  set(CMAKE_C_FLAGS_RELEASE "/MD ${CMAKE_C_FLAGS_RELEASE}")
-endmacro()
-
 #################################################
 # VAR: SDF_BUILD_TESTS_EXTRA_EXE_SRCS
 # Hack: extra sources to build binaries can be supplied to gz_build_tests in
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cd174abfc..452531264 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -65,7 +65,6 @@ set (sources
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 if (USE_INTERNAL_URDF)
-  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/urdf)
   set(sources ${sources}
   urdf/urdf_parser/model.cpp
   urdf/urdf_parser/link.cpp
@@ -215,7 +214,15 @@ target_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
     $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/..>
 )
 
-if (NOT USE_INTERNAL_URDF)
+if (USE_INTERNAL_URDF)
+  target_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
+    PRIVATE
+      ${CMAKE_CURRENT_SOURCE_DIR}/urdf
+  )
+  if (WIN32)
+    target_compile_definitions(${PROJECT_LIBRARY_TARGET_NAME} PRIVATE -D_USE_MATH_DEFINES)
+  endif()
+else()
   target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} PRIVATE IgnURDFDOM::IgnURDFDOM)
 endif()
 

From e1917735792647c8459c9a1c3cdcffec4ec3f5a3 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Tue, 14 Dec 2021 14:51:21 -0800
Subject: [PATCH 13/28] Fix comments, whitespace, example

Per code review suggestions.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 CMakeLists.txt          | 12 +++++-------
 examples/CMakeLists.txt |  5 +++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0cdc08f6..8158587c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,15 +7,13 @@ endif(COMMAND CMAKE_POLICY)
 
 project (sdformat10 VERSION 10.6.0)
 
-# The protocol version has nothing to do with the package version set below.
-# It represents the current version of sdformat implement by the software
+# The protocol version has nothing to do with the package version.
+# It represents the current version of SDFormat implemented by the software
 set (SDF_PROTOCOL_VERSION 1.7)
 
 set (project_cmake_dir ${PROJECT_SOURCE_DIR}/cmake
   CACHE PATH "Location of CMake scripts")
 
-message (STATUS "${PROJECT_NAME} version ${PROJECT_VERSION_FULL}")
-
 OPTION(SDFORMAT_DISABLE_CONSOLE_LOGFILE "Disable the sdformat console logfile" OFF)
 
 set (BUILD_SDF ON CACHE INTERNAL "Build SDF" FORCE)
@@ -75,7 +73,7 @@ if (BUILD_SDF)
   # Find psutil python package for memory tests
   include (${sdf_cmake_dir}/SDFUtils.cmake)
   find_python_module(psutil)
-  if(NOT PY_PSUTIL)
+  if (NOT PY_PSUTIL)
     ign_build_warning("Python psutil package not found. Memory leak tests will be skipped")
   endif()
 
@@ -93,9 +91,9 @@ if (BUILD_SDF)
   # Find ruby executable to produce xml schemas
   find_program(RUBY ruby)
   if (NOT RUBY)
-      ign_build_error ("Ruby version 1.9 is needed to build xml schemas")
+    ign_build_error ("Ruby version 1.9 is needed to build xml schemas")
   else()
-      message(STATUS "Found ruby executable: ${RUBY}")
+    message(STATUS "Found ruby executable: ${RUBY}")
   endif()
 
   ########################################
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 5593038b1..664bda830 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,11 +1,12 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
 find_package(sdformat10 REQUIRED)
+set(SDFORMAT_VER ${sdformat10_VERSION_MAJOR})
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 
 add_executable(simple simple.cc)
-target_link_libraries(simple sdformat10::sdformat10)
+target_link_libraries(simple sdformat${SDFORMAT_VER}::sdformat${SDFORMAT_VER})
 
 add_executable(dom dom.cc)
-target_link_libraries(dom sdformat10::sdformat10)
+target_link_libraries(dom sdformat${SDFORMAT_VER}::sdformat${SDFORMAT_VER})

From a13f9e5e65f8f941619eb9dd41324bad89981875 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Tue, 14 Dec 2021 14:57:43 -0800
Subject: [PATCH 14/28] Remove TODO comments about deprecating headers

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 include/sdf/sdf.hh       | 3 ---
 include/sdf/sdf_config.h | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/include/sdf/sdf.hh b/include/sdf/sdf.hh
index c32ef5812..c03d12d74 100644
--- a/include/sdf/sdf.hh
+++ b/include/sdf/sdf.hh
@@ -18,9 +18,6 @@
 #ifndef SDF_SDF_HH_
 #define SDF_SDF_HH_
 
-// TODO(anyone): deprecate this header?
-// #pragma message("sdf/sdf.hh is deprecated, use sdformat.hh instead")
-
 #include <sdformat.hh>
 
 #endif
diff --git a/include/sdf/sdf_config.h b/include/sdf/sdf_config.h
index 6ea2f29b4..fdf7d347b 100644
--- a/include/sdf/sdf_config.h
+++ b/include/sdf/sdf_config.h
@@ -18,9 +18,6 @@
 #ifndef SDF_SDF_CONFIG_H_
 #define SDF_SDF_CONFIG_H_
 
-// TODO(anyone): deprecate this header?
-// #pragma message("sdf/sdf_config.h is deprecated, use sdf/config.hh instead")
-
 #include <sdf/config.hh>
 
 #endif

From a1d7bc530c36cd6fc56e9b46ab166b13606105e2 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Tue, 14 Dec 2021 16:10:25 -0800
Subject: [PATCH 15/28] Fix configuration of unit tests

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 src/CMakeLists.txt | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 452531264..3f314d790 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -76,7 +76,7 @@ if (USE_INTERNAL_URDF)
   urdf/urdf_parser/world.cpp)
 endif()
 
-if (BUILD_SDF_TEST)
+if (BUILD_TESTING)
   set (gtest_sources
     Actor_TEST.cc
     AirPressure_TEST.cc
@@ -134,14 +134,17 @@ if (BUILD_SDF_TEST)
     )
   endif()
 
-  ign_build_tests(SOURCES ${gtest_sources} INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/test)
+  ign_build_tests(
+    TYPE UNIT
+    SOURCES ${gtest_sources}
+    INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/test
+  )
 
   include_directories(${PROJECT_SOURCE_DIR}/test)
   if (TARGET UNIT_ign_TEST)
     # Link the libraries that we always need.
     target_link_libraries("UNIT_ign_TEST"
-      PUBLIC
-        ignition-cmake${IGN_CMAKE_VER}::utilities
+      ignition-cmake${IGN_CMAKE_VER}::utilities
     )
   endif()
 

From d740f494039c6aa73fa16834293f64c93644ff4a Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Tue, 14 Dec 2021 18:18:53 -0800
Subject: [PATCH 16/28] fix linking in sdf_build_tests

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 cmake/SDFUtils.cmake | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/cmake/SDFUtils.cmake b/cmake/SDFUtils.cmake
index 95633665c..e9c97152c 100644
--- a/cmake/SDFUtils.cmake
+++ b/cmake/SDFUtils.cmake
@@ -21,24 +21,18 @@ macro (sdf_build_tests)
       )
 
     link_directories(${IGNITION-MATH_LIBRARY_DIRS})
-    target_link_libraries(${BINARY_NAME} ${tinyxml2_LIBRARIES})
+    target_link_libraries(${BINARY_NAME} PRIVATE
+      gtest
+      gtest_main
+      ${IGNITION-MATH_LIBRARIES}
+      ${PROJECT_LIBRARY_TARGET_NAME}
+      ${tinyxml2_LIBRARIES})
 
     if (UNIX)
       target_link_libraries(${BINARY_NAME} PRIVATE
-        libgtest.a
-        libgtest_main.a
-        ${PROJECT_LIBRARY_TARGET_NAME}
         pthread
-        ${IGNITION-MATH_LIBRARIES}
       )
     elseif(WIN32)
-      target_link_libraries(${BINARY_NAME} PRIVATE
-        gtest.lib
-        gtest_main.lib
-        ${PROJECT_LIBRARY_TARGET_NAME}
-        ${IGNITION-MATH_LIBRARIES}
-      )
-
       # Copy in sdformat library
       add_custom_command(TARGET ${BINARY_NAME}
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
@@ -47,8 +41,8 @@ macro (sdf_build_tests)
 
     endif()
 
-    add_test(${BINARY_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_NAME}
-      --gtest_output=xml:${CMAKE_BINARY_DIR}/test_results/${BINARY_NAME}.xml)
+    add_test(NAME ${BINARY_NAME} COMMAND
+      ${BINARY_NAME} --gtest_output=xml:${CMAKE_BINARY_DIR}/test_results/${BINARY_NAME}.xml)
 
     set (_env_vars)
     set (sdf_paths)

From 62bc3440ae79e0f8813333ef9af822f4e4d858b9 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Tue, 14 Dec 2021 23:20:33 -0800
Subject: [PATCH 17/28] remove linter files in tools/

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 tools/code_check.sh             |   67 -
 tools/cpplint.py                | 6923 -------------------------------
 tools/cpplint_to_cppcheckxml.py |   53 -
 3 files changed, 7043 deletions(-)
 delete mode 100755 tools/code_check.sh
 delete mode 100644 tools/cpplint.py
 delete mode 100644 tools/cpplint_to_cppcheckxml.py

diff --git a/tools/code_check.sh b/tools/code_check.sh
deleted file mode 100755
index bd24da512..000000000
--- a/tools/code_check.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-
-# Jenkins will pass -xml, in which case we want to generate XML output
-xmlout=0
-if test "$1" = "-xmldir" -a -n "$2"; then
-  xmlout=1
-  xmldir=$2
-  mkdir -p $xmldir
-  rm -rf $xmldir/*.xml
-  # Assuming that Jenkins called, the `build` directory is a sibling to the src dir
-  builddir=../build
-else
-  # This is a heuristic guess; not every developer puts the `build` dir in the src dir
-  builddir=./build
-fi
-
-# Use a suppression file for spurious errors
-SUPPRESS=/tmp/sdf_cpp_check.suppress
-echo "" > $SUPPRESS
-
-# Use another suppression file for unused function checking
-SUPPRESS2=/tmp/sdf_cpp_check2.suppress
-echo "*:src/parser_urdf.cc" > $SUPPRESS2
-
-CHECK_FILE_DIRS="./src ./include ./examples ./test/performance ./test/integration"
-
-#cppcheck
-CPPCHECK_BASE="cppcheck -q --suppressions-list=$SUPPRESS --inline-suppr"
-CPPCHECK_BASE2="cppcheck -q --suppressions-list=$SUPPRESS2 --inline-suppr"
-CPPCHECK_FILES=`find $CHECK_FILE_DIRS -name "*.cc"`
-CPPCHECK_INCLUDES="-I include -I test -I . -I $builddir -I $builddir/include"
-CPPCHECK_COMMAND1="-j 4 --enable=style,performance,portability,information $CPPCHECK_FILES"
-# Unused function checking must happen in one job
-CPPCHECK_COMMAND2="--enable=unusedFunction $CPPCHECK_FILES"
-# -j 4 was used previously in CPPCHECK_COMMAND3 but it will generate a false
-# warning as described in bug:
-# http://sourceforge.net/apps/trac/cppcheck/ticket/4946
-CPPCHECK_COMMAND3="-j 1 --enable=missingInclude --suppress=missingIncludeSystem $CPPCHECK_FILES $CPPCHECK_INCLUDES --check-config"
-if [ $xmlout -eq 1 ]; then
-  # Performance, style, portability, and information
-  ($CPPCHECK_BASE --xml --xml-version=2 $CPPCHECK_COMMAND1) 2> $xmldir/cppcheck.xml
-
-  # Unused function checking
-  ($CPPCHECK_BASE2 --xml --xml-version=2 $CPPCHECK_COMMAND2) 2> $xmldir/cppcheck-unused-functions.xml
-
-  # Check the configuration
-  ($CPPCHECK_BASE --xml --xml-version=2 $CPPCHECK_COMMAND3) 2> $xmldir/cppcheck-configuration.xml
-else
-  # Performance, style, portability, and information
-  $CPPCHECK_BASE $CPPCHECK_COMMAND1 2>&1
-
-  # Unused function checking
-  $CPPCHECK_BASE2 $CPPCHECK_COMMAND2 2>&1
-
-  # Check the configuration
-  $CPPCHECK_BASE $CPPCHECK_COMMAND3 2>&1
-fi
-
-# cpplint
-# exclude urdf files for now, since they generate lots of errors
-CPPLINT_FILES=`find $CHECK_FILE_DIRS -name "*.cc" -o -name "*.hh" | grep -iv "/urdf"`
-if [ $xmlout -eq 1 ]; then
-  (echo $CPPLINT_FILES | xargs python tools/cpplint.py 2>&1) \
-    | python tools/cpplint_to_cppcheckxml.py 2> $xmldir/cpplint.xml
-else
-  echo $CPPLINT_FILES | xargs python tools/cpplint.py 2>&1
-fi
diff --git a/tools/cpplint.py b/tools/cpplint.py
deleted file mode 100644
index 1632bed19..000000000
--- a/tools/cpplint.py
+++ /dev/null
@@ -1,6923 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2009 Google Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Imported from https://github.com/cpplint/cpplint:
-# https://github.com/cpplint/cpplint/blob/0f2319741f3407d8638cdc7c41e4fc9bad217f68/cpplint.py
-
-"""Does google-lint on c++ files.
-
-The goal of this script is to identify places in the code that *may*
-be in non-compliance with google style.  It does not attempt to fix
-up these problems -- the point is to educate.  It does also not
-attempt to find all problems, or to ensure that everything it does
-find is legitimately a problem.
-
-In particular, we can get very confused by /* and // inside strings!
-We do a small hack, which is to ignore //'s with "'s after them on the
-same line, but it is far from perfect (in either direction).
-"""
-
-import codecs
-import copy
-import getopt
-import glob
-import itertools
-import math  # for log
-import os
-import re
-import sre_compile
-import string
-import sys
-import sysconfig
-import unicodedata
-import xml.etree.ElementTree
-
-# if empty, use defaults
-_valid_extensions = set([])
-
-__VERSION__ = '1.5.4'
-
-try:
-  xrange          # Python 2
-except NameError:
-  #  -- pylint: disable=redefined-builtin
-  xrange = range  # Python 3
-
-
-_USAGE = """
-Syntax: cpplint.py [--verbose=#] [--output=emacs|eclipse|vs7|junit|sed|gsed]
-                   [--filter=-x,+y,...]
-                   [--counting=total|toplevel|detailed] [--root=subdir]
-                   [--repository=path]
-                   [--linelength=digits] [--headers=x,y,...]
-                   [--recursive]
-                   [--exclude=path]
-                   [--extensions=hpp,cpp,...]
-                   [--includeorder=default|standardcfirst]
-                   [--quiet]
-                   [--version]
-        <file> [file] ...
-
-  Style checker for C/C++ source files.
-  This is a fork of the Google style checker with minor extensions.
-
-  The style guidelines this tries to follow are those in
-    https://google.github.io/styleguide/cppguide.html
-
-  Every problem is given a confidence score from 1-5, with 5 meaning we are
-  certain of the problem, and 1 meaning it could be a legitimate construct.
-  This will miss some errors, and is not a substitute for a code review.
-
-  To suppress false-positive errors of a certain category, add a
-  'NOLINT(category)' comment to the line.  NOLINT or NOLINT(*)
-  suppresses errors of all categories on that line.
-
-  The files passed in will be linted; at least one file must be provided.
-  Default linted extensions are %s.
-  Other file types will be ignored.
-  Change the extensions with the --extensions flag.
-
-  Flags:
-
-    output=emacs|eclipse|vs7|junit|sed|gsed
-      By default, the output is formatted to ease emacs parsing.  Visual Studio
-      compatible output (vs7) may also be used.  Further support exists for
-      eclipse (eclipse), and JUnit (junit). XML parsers such as those used
-      in Jenkins and Bamboo may also be used.
-      The sed format outputs sed commands that should fix some of the errors.
-      Note that this requires gnu sed. If that is installed as gsed on your
-      system (common e.g. on macOS with homebrew) you can use the gsed output
-      format. Sed commands are written to stdout, not stderr, so you should be
-      able to pipe output straight to a shell to run the fixes.
-
-    verbose=#
-      Specify a number 0-5 to restrict errors to certain verbosity levels.
-      Errors with lower verbosity levels have lower confidence and are more
-      likely to be false positives.
-
-    quiet
-      Don't print anything if no errors are found.
-
-    filter=-x,+y,...
-      Specify a comma-separated list of category-filters to apply: only
-      error messages whose category names pass the filters will be printed.
-      (Category names are printed with the message and look like
-      "[whitespace/indent]".)  Filters are evaluated left to right.
-      "-FOO" and "FOO" means "do not print categories that start with FOO".
-      "+FOO" means "do print categories that start with FOO".
-
-      Examples: --filter=-whitespace,+whitespace/braces
-                --filter=whitespace,runtime/printf,+runtime/printf_format
-                --filter=-,+build/include_what_you_use
-
-      To see a list of all the categories used in cpplint, pass no arg:
-         --filter=
-
-    counting=total|toplevel|detailed
-      The total number of errors found is always printed. If
-      'toplevel' is provided, then the count of errors in each of
-      the top-level categories like 'build' and 'whitespace' will
-      also be printed. If 'detailed' is provided, then a count
-      is provided for each category like 'build/class'.
-
-    repository=path
-      The top level directory of the repository, used to derive the header
-      guard CPP variable. By default, this is determined by searching for a
-      path that contains .git, .hg, or .svn. When this flag is specified, the
-      given path is used instead. This option allows the header guard CPP
-      variable to remain consistent even if members of a team have different
-      repository root directories (such as when checking out a subdirectory
-      with SVN). In addition, users of non-mainstream version control systems
-      can use this flag to ensure readable header guard CPP variables.
-
-      Examples:
-        Assuming that Alice checks out ProjectName and Bob checks out
-        ProjectName/trunk and trunk contains src/chrome/ui/browser.h, then
-        with no --repository flag, the header guard CPP variable will be:
-
-        Alice => TRUNK_SRC_CHROME_BROWSER_UI_BROWSER_H_
-        Bob   => SRC_CHROME_BROWSER_UI_BROWSER_H_
-
-        If Alice uses the --repository=trunk flag and Bob omits the flag or
-        uses --repository=. then the header guard CPP variable will be:
-
-        Alice => SRC_CHROME_BROWSER_UI_BROWSER_H_
-        Bob   => SRC_CHROME_BROWSER_UI_BROWSER_H_
-
-    root=subdir
-      The root directory used for deriving header guard CPP variable.
-      This directory is relative to the top level directory of the repository
-      which by default is determined by searching for a directory that contains
-      .git, .hg, or .svn but can also be controlled with the --repository flag.
-      If the specified directory does not exist, this flag is ignored.
-
-      Examples:
-        Assuming that src is the top level directory of the repository (and
-        cwd=top/src), the header guard CPP variables for
-        src/chrome/browser/ui/browser.h are:
-
-        No flag => CHROME_BROWSER_UI_BROWSER_H_
-        --root=chrome => BROWSER_UI_BROWSER_H_
-        --root=chrome/browser => UI_BROWSER_H_
-        --root=.. => SRC_CHROME_BROWSER_UI_BROWSER_H_
-
-    linelength=digits
-      This is the allowed line length for the project. The default value is
-      80 characters.
-
-      Examples:
-        --linelength=120
-
-    recursive
-      Search for files to lint recursively. Each directory given in the list
-      of files to be linted is replaced by all files that descend from that
-      directory. Files with extensions not in the valid extensions list are
-      excluded.
-
-    exclude=path
-      Exclude the given path from the list of files to be linted. Relative
-      paths are evaluated relative to the current directory and shell globbing
-      is performed. This flag can be provided multiple times to exclude
-      multiple files.
-
-      Examples:
-        --exclude=one.cc
-        --exclude=src/*.cc
-        --exclude=src/*.cc --exclude=test/*.cc
-
-    extensions=extension,extension,...
-      The allowed file extensions that cpplint will check
-
-      Examples:
-        --extensions=%s
-
-    includeorder=default|standardcfirst
-      For the build/include_order rule, the default is to blindly assume angle
-      bracket includes with file extension are c-system-headers (default),
-      even knowing this will have false classifications.
-      The default is established at google.
-      standardcfirst means to instead use an allow-list of known c headers and
-      treat all others as separate group of "other system headers". The C headers
-      included are those of the C-standard lib and closely related ones.
-
-    headers=x,y,...
-      The header extensions that cpplint will treat as .h in checks. Values are
-      automatically added to --extensions list.
-     (by default, only files with extensions %s will be assumed to be headers)
-
-      Examples:
-        --headers=%s
-        --headers=hpp,hxx
-        --headers=hpp
-
-    cpplint.py supports per-directory configurations specified in CPPLINT.cfg
-    files. CPPLINT.cfg file can contain a number of key=value pairs.
-    Currently the following options are supported:
-
-      set noparent
-      filter=+filter1,-filter2,...
-      exclude_files=regex
-      linelength=80
-      root=subdir
-      headers=x,y,...
-
-    "set noparent" option prevents cpplint from traversing directory tree
-    upwards looking for more .cfg files in parent directories. This option
-    is usually placed in the top-level project directory.
-
-    The "filter" option is similar in function to --filter flag. It specifies
-    message filters in addition to the |_DEFAULT_FILTERS| and those specified
-    through --filter command-line flag.
-
-    "exclude_files" allows to specify a regular expression to be matched against
-    a file name. If the expression matches, the file is skipped and not run
-    through the linter.
-
-    "linelength" allows to specify the allowed line length for the project.
-
-    The "root" option is similar in function to the --root flag (see example
-    above). Paths are relative to the directory of the CPPLINT.cfg.
-
-    The "headers" option is similar in function to the --headers flag
-    (see example above).
-
-    CPPLINT.cfg has an effect on files in the same directory and all
-    sub-directories, unless overridden by a nested configuration file.
-
-      Example file:
-        filter=-build/include_order,+build/include_alpha
-        exclude_files=.*\\.cc
-
-    The above example disables build/include_order warning and enables
-    build/include_alpha as well as excludes all .cc from being
-    processed by linter, in the current directory (where the .cfg
-    file is located) and all sub-directories.
-"""
-
-# We categorize each error message we print.  Here are the categories.
-# We want an explicit list so we can list them all in cpplint --filter=.
-# If you add a new error message with a new category, add it to the list
-# here!  cpplint_unittest.py should tell you if you forget to do this.
-_ERROR_CATEGORIES = [
-    'build/class',
-    'build/c++11',
-    'build/c++14',
-    'build/c++tr1',
-    'build/deprecated',
-    'build/endif_comment',
-    'build/explicit_make_pair',
-    'build/forward_decl',
-    'build/header_guard',
-    'build/include',
-    'build/include_subdir',
-    'build/include_alpha',
-    'build/include_order',
-    'build/include_what_you_use',
-    'build/namespaces_headers',
-    'build/namespaces_literals',
-    'build/namespaces',
-    'build/printf_format',
-    'build/storage_class',
-    'legal/copyright',
-    'readability/alt_tokens',
-    'readability/braces',
-    'readability/casting',
-    'readability/check',
-    'readability/constructors',
-    'readability/fn_size',
-    'readability/inheritance',
-    'readability/multiline_comment',
-    'readability/multiline_string',
-    'readability/namespace',
-    'readability/nolint',
-    'readability/nul',
-    'readability/strings',
-    'readability/todo',
-    'readability/utf8',
-    'runtime/arrays',
-    'runtime/casting',
-    'runtime/explicit',
-    'runtime/int',
-    'runtime/init',
-    'runtime/invalid_increment',
-    'runtime/member_string_references',
-    'runtime/memset',
-    'runtime/indentation_namespace',
-    'runtime/operator',
-    'runtime/printf',
-    'runtime/printf_format',
-    'runtime/references',
-    'runtime/string',
-    'runtime/threadsafe_fn',
-    'runtime/vlog',
-    'whitespace/blank_line',
-    'whitespace/braces',
-    'whitespace/comma',
-    'whitespace/comments',
-    'whitespace/empty_conditional_body',
-    'whitespace/empty_if_body',
-    'whitespace/empty_loop_body',
-    'whitespace/end_of_line',
-    'whitespace/ending_newline',
-    'whitespace/forcolon',
-    'whitespace/indent',
-    'whitespace/line_length',
-    'whitespace/newline',
-    'whitespace/operators',
-    'whitespace/parens',
-    'whitespace/semicolon',
-    'whitespace/tab',
-    'whitespace/todo',
-    ]
-
-# keywords to use with --outputs which generate stdout for machine processing
-_MACHINE_OUTPUTS = [
-  'junit',
-  'sed',
-  'gsed'
-]
-
-# These error categories are no longer enforced by cpplint, but for backwards-
-# compatibility they may still appear in NOLINT comments.
-_LEGACY_ERROR_CATEGORIES = [
-    'readability/streams',
-    'readability/function',
-    ]
-
-# The default state of the category filter. This is overridden by the --filter=
-# flag. By default all errors are on, so only add here categories that should be
-# off by default (i.e., categories that must be enabled by the --filter= flags).
-# All entries here should start with a '-' or '+', as in the --filter= flag.
-_DEFAULT_FILTERS = [
-        '-build/c++11',
-        '-build/header_guard',
-        '-build/include_alpha',
-        '-build/include_order',
-        '-build/include_subdir',
-        '-build/namespaces',
-        '-readability/namespace',
-        '-runtime/indentation_namespace',
-        '-runtime/references',
-        '-whitespace/blank_line',
-        '-whitespace/braces',
-        '-whitespace/indent',
-        '-whitespace/newline',
-        '-whitespace/parens',
-        ]
-
-# The default list of categories suppressed for C (not C++) files.
-_DEFAULT_C_SUPPRESSED_CATEGORIES = [
-    'readability/casting',
-    ]
-
-# The default list of categories suppressed for Linux Kernel files.
-_DEFAULT_KERNEL_SUPPRESSED_CATEGORIES = [
-    'whitespace/tab',
-    ]
-
-# We used to check for high-bit characters, but after much discussion we
-# decided those were OK, as long as they were in UTF-8 and didn't represent
-# hard-coded international strings, which belong in a separate i18n file.
-
-# C++ headers
-_CPP_HEADERS = frozenset([
-    # Legacy
-    'algobase.h',
-    'algo.h',
-    'alloc.h',
-    'builtinbuf.h',
-    'bvector.h',
-    'complex.h',
-    'defalloc.h',
-    'deque.h',
-    'editbuf.h',
-    'fstream.h',
-    'function.h',
-    'hash_map',
-    'hash_map.h',
-    'hash_set',
-    'hash_set.h',
-    'hashtable.h',
-    'heap.h',
-    'indstream.h',
-    'iomanip.h',
-    'iostream.h',
-    'istream.h',
-    'iterator.h',
-    'list.h',
-    'map.h',
-    'multimap.h',
-    'multiset.h',
-    'ostream.h',
-    'pair.h',
-    'parsestream.h',
-    'pfstream.h',
-    'procbuf.h',
-    'pthread_alloc',
-    'pthread_alloc.h',
-    'rope',
-    'rope.h',
-    'ropeimpl.h',
-    'set.h',
-    'slist',
-    'slist.h',
-    'stack.h',
-    'stdiostream.h',
-    'stl_alloc.h',
-    'stl_relops.h',
-    'streambuf.h',
-    'stream.h',
-    'strfile.h',
-    'strstream.h',
-    'tempbuf.h',
-    'tree.h',
-    'type_traits.h',
-    'vector.h',
-    # 17.6.1.2 C++ library headers
-    'algorithm',
-    'array',
-    'atomic',
-    'bitset',
-    'chrono',
-    'codecvt',
-    'complex',
-    'condition_variable',
-    'deque',
-    'exception',
-    'forward_list',
-    'fstream',
-    'functional',
-    'future',
-    'initializer_list',
-    'iomanip',
-    'ios',
-    'iosfwd',
-    'iostream',
-    'istream',
-    'iterator',
-    'limits',
-    'list',
-    'locale',
-    'map',
-    'memory',
-    'mutex',
-    'new',
-    'numeric',
-    'ostream',
-    'queue',
-    'random',
-    'ratio',
-    'regex',
-    'scoped_allocator',
-    'set',
-    'sstream',
-    'stack',
-    'stdexcept',
-    'streambuf',
-    'string',
-    'strstream',
-    'system_error',
-    'thread',
-    'tuple',
-    'typeindex',
-    'typeinfo',
-    'type_traits',
-    'unordered_map',
-    'unordered_set',
-    'utility',
-    'valarray',
-    'vector',
-    # 17.6.1.2 C++14 headers
-    'shared_mutex',
-    # 17.6.1.2 C++17 headers
-    'any',
-    'charconv',
-    'codecvt',
-    'execution',
-    'filesystem',
-    'memory_resource',
-    'optional',
-    'string_view',
-    'variant',
-    # 17.6.1.2 C++ headers for C library facilities
-    'cassert',
-    'ccomplex',
-    'cctype',
-    'cerrno',
-    'cfenv',
-    'cfloat',
-    'cinttypes',
-    'ciso646',
-    'climits',
-    'clocale',
-    'cmath',
-    'csetjmp',
-    'csignal',
-    'cstdalign',
-    'cstdarg',
-    'cstdbool',
-    'cstddef',
-    'cstdint',
-    'cstdio',
-    'cstdlib',
-    'cstring',
-    'ctgmath',
-    'ctime',
-    'cuchar',
-    'cwchar',
-    'cwctype',
-    ])
-
-# C headers
-_C_HEADERS = frozenset([
-    # System C headers
-    'assert.h',
-    'complex.h',
-    'ctype.h',
-    'errno.h',
-    'fenv.h',
-    'float.h',
-    'inttypes.h',
-    'iso646.h',
-    'limits.h',
-    'locale.h',
-    'math.h',
-    'setjmp.h',
-    'signal.h',
-    'stdalign.h',
-    'stdarg.h',
-    'stdatomic.h',
-    'stdbool.h',
-    'stddef.h',
-    'stdint.h',
-    'stdio.h',
-    'stdlib.h',
-    'stdnoreturn.h',
-    'string.h',
-    'tgmath.h',
-    'threads.h',
-    'time.h',
-    'uchar.h',
-    'wchar.h',
-    'wctype.h',
-    # additional POSIX C headers
-    'aio.h',
-    'arpa/inet.h',
-    'cpio.h',
-    'dirent.h',
-    'dlfcn.h',
-    'fcntl.h',
-    'fmtmsg.h',
-    'fnmatch.h',
-    'ftw.h',
-    'glob.h',
-    'grp.h',
-    'iconv.h',
-    'langinfo.h',
-    'libgen.h',
-    'monetary.h',
-    'mqueue.h',
-    'ndbm.h',
-    'net/if.h',
-    'netdb.h',
-    'netinet/in.h',
-    'netinet/tcp.h',
-    'nl_types.h',
-    'poll.h',
-    'pthread.h',
-    'pwd.h',
-    'regex.h',
-    'sched.h',
-    'search.h',
-    'semaphore.h',
-    'setjmp.h',
-    'signal.h',
-    'spawn.h',
-    'strings.h',
-    'stropts.h',
-    'syslog.h',
-    'tar.h',
-    'termios.h',
-    'trace.h',
-    'ulimit.h',
-    'unistd.h',
-    'utime.h',
-    'utmpx.h',
-    'wordexp.h',
-    # additional GNUlib headers
-    'a.out.h',
-    'aliases.h',
-    'alloca.h',
-    'ar.h',
-    'argp.h',
-    'argz.h',
-    'byteswap.h',
-    'crypt.h',
-    'endian.h',
-    'envz.h',
-    'err.h',
-    'error.h',
-    'execinfo.h',
-    'fpu_control.h',
-    'fstab.h',
-    'fts.h',
-    'getopt.h',
-    'gshadow.h',
-    'ieee754.h',
-    'ifaddrs.h',
-    'libintl.h',
-    'mcheck.h',
-    'mntent.h',
-    'obstack.h',
-    'paths.h',
-    'printf.h',
-    'pty.h',
-    'resolv.h',
-    'shadow.h',
-    'sysexits.h',
-    'ttyent.h',
-    # Additional linux glibc headers
-    'dlfcn.h',
-    'elf.h',
-    'features.h',
-    'gconv.h',
-    'gnu-versions.h',
-    'lastlog.h',
-    'libio.h',
-    'link.h',
-    'malloc.h',
-    'memory.h',
-    'netash/ash.h',
-    'netatalk/at.h',
-    'netax25/ax25.h',
-    'neteconet/ec.h',
-    'netipx/ipx.h',
-    'netiucv/iucv.h',
-    'netpacket/packet.h',
-    'netrom/netrom.h',
-    'netrose/rose.h',
-    'nfs/nfs.h',
-    'nl_types.h',
-    'nss.h',
-    're_comp.h',
-    'regexp.h',
-    'sched.h',
-    'sgtty.h',
-    'stab.h',
-    'stdc-predef.h',
-    'stdio_ext.h',
-    'syscall.h',
-    'termio.h',
-    'thread_db.h',
-    'ucontext.h',
-    'ustat.h',
-    'utmp.h',
-    'values.h',
-    'wait.h',
-    'xlocale.h',
-    # Hardware specific headers
-    'arm_neon.h',
-    'emmintrin.h',
-    'xmmintin.h',
-    ])
-
-# Folders of C libraries so commonly used in C++,
-# that they have parity with standard C libraries.
-C_STANDARD_HEADER_FOLDERS = frozenset([
-    # standard C library
-    "sys",
-    # glibc for linux
-    "arpa",
-    "asm-generic",
-    "bits",
-    "gnu",
-    "net",
-    "netinet",
-    "protocols",
-    "rpc",
-    "rpcsvc",
-    "scsi",
-    # linux kernel header
-    "drm",
-    "linux",
-    "misc",
-    "mtd",
-    "rdma",
-    "sound",
-    "video",
-    "xen",
-  ])
-
-# Type names
-_TYPES = re.compile(
-    r'^(?:'
-    # [dcl.type.simple]
-    r'(char(16_t|32_t)?)|wchar_t|'
-    r'bool|short|int|long|signed|unsigned|float|double|'
-    # [support.types]
-    r'(ptrdiff_t|size_t|max_align_t|nullptr_t)|'
-    # [cstdint.syn]
-    r'(u?int(_fast|_least)?(8|16|32|64)_t)|'
-    r'(u?int(max|ptr)_t)|'
-    r')$')
-
-
-# These headers are excluded from [build/include] and [build/include_order]
-# checks:
-# - Anything not following google file name conventions (containing an
-#   uppercase character, such as Python.h or nsStringAPI.h, for example).
-# - Lua headers.
-_THIRD_PARTY_HEADERS_PATTERN = re.compile(
-    r'^(?:[^/]*[A-Z][^/]*\.h|lua\.h|lauxlib\.h|lualib\.h)$')
-
-# Pattern for matching FileInfo.BaseName() against test file name
-_test_suffixes = ['_test', '_regtest', '_unittest']
-_TEST_FILE_SUFFIX = '(' + '|'.join(_test_suffixes) + r')$'
-
-# Pattern that matches only complete whitespace, possibly across multiple lines.
-_EMPTY_CONDITIONAL_BODY_PATTERN = re.compile(r'^\s*$', re.DOTALL)
-
-# Assertion macros.  These are defined in base/logging.h and
-# testing/base/public/gunit.h.
-_CHECK_MACROS = [
-    'DCHECK', 'CHECK',
-    'EXPECT_TRUE', 'ASSERT_TRUE',
-    'EXPECT_FALSE', 'ASSERT_FALSE',
-    ]
-
-# Replacement macros for CHECK/DCHECK/EXPECT_TRUE/EXPECT_FALSE
-_CHECK_REPLACEMENT = dict([(macro_var, {}) for macro_var in _CHECK_MACROS])
-
-for op, replacement in [('==', 'EQ'), ('!=', 'NE'),
-                        ('>=', 'GE'), ('>', 'GT'),
-                        ('<=', 'LE'), ('<', 'LT')]:
-  _CHECK_REPLACEMENT['DCHECK'][op] = 'DCHECK_%s' % replacement
-  _CHECK_REPLACEMENT['CHECK'][op] = 'CHECK_%s' % replacement
-  _CHECK_REPLACEMENT['EXPECT_TRUE'][op] = 'EXPECT_%s' % replacement
-  _CHECK_REPLACEMENT['ASSERT_TRUE'][op] = 'ASSERT_%s' % replacement
-
-for op, inv_replacement in [('==', 'NE'), ('!=', 'EQ'),
-                            ('>=', 'LT'), ('>', 'LE'),
-                            ('<=', 'GT'), ('<', 'GE')]:
-  _CHECK_REPLACEMENT['EXPECT_FALSE'][op] = 'EXPECT_%s' % inv_replacement
-  _CHECK_REPLACEMENT['ASSERT_FALSE'][op] = 'ASSERT_%s' % inv_replacement
-
-# Alternative tokens and their replacements.  For full list, see section 2.5
-# Alternative tokens [lex.digraph] in the C++ standard.
-#
-# Digraphs (such as '%:') are not included here since it's a mess to
-# match those on a word boundary.
-_ALT_TOKEN_REPLACEMENT = {
-    'and': '&&',
-    'bitor': '|',
-    'or': '||',
-    'xor': '^',
-    'compl': '~',
-    'bitand': '&',
-    'and_eq': '&=',
-    'or_eq': '|=',
-    'xor_eq': '^=',
-    'not': '!',
-    'not_eq': '!='
-    }
-
-# Compile regular expression that matches all the above keywords.  The "[ =()]"
-# bit is meant to avoid matching these keywords outside of boolean expressions.
-#
-# False positives include C-style multi-line comments and multi-line strings
-# but those have always been troublesome for cpplint.
-_ALT_TOKEN_REPLACEMENT_PATTERN = re.compile(
-    r'[ =()](' + ('|'.join(_ALT_TOKEN_REPLACEMENT.keys())) + r')(?=[ (]|$)')
-
-
-# These constants define types of headers for use with
-# _IncludeState.CheckNextIncludeOrder().
-_C_SYS_HEADER = 1
-_CPP_SYS_HEADER = 2
-_OTHER_SYS_HEADER = 3
-_LIKELY_MY_HEADER = 4
-_POSSIBLE_MY_HEADER = 5
-_OTHER_HEADER = 6
-
-# These constants define the current inline assembly state
-_NO_ASM = 0       # Outside of inline assembly block
-_INSIDE_ASM = 1   # Inside inline assembly block
-_END_ASM = 2      # Last line of inline assembly block
-_BLOCK_ASM = 3    # The whole block is an inline assembly block
-
-# Match start of assembly blocks
-_MATCH_ASM = re.compile(r'^\s*(?:asm|_asm|__asm|__asm__)'
-                        r'(?:\s+(volatile|__volatile__))?'
-                        r'\s*[{(]')
-
-# Match strings that indicate we're working on a C (not C++) file.
-_SEARCH_C_FILE = re.compile(r'\b(?:LINT_C_FILE|'
-                            r'vim?:\s*.*(\s*|:)filetype=c(\s*|:|$))')
-
-# Match string that indicates we're working on a Linux Kernel file.
-_SEARCH_KERNEL_FILE = re.compile(r'\b(?:LINT_KERNEL_FILE)')
-
-# Commands for sed to fix the problem
-_SED_FIXUPS = {
-  'Remove spaces around =': r's/ = /=/',
-  'Remove spaces around !=': r's/ != /!=/',
-  'Remove space before ( in if (': r's/if (/if(/',
-  'Remove space before ( in for (': r's/for (/for(/',
-  'Remove space before ( in while (': r's/while (/while(/',
-  'Remove space before ( in switch (': r's/switch (/switch(/',
-  'Should have a space between // and comment': r's/\/\//\/\/ /',
-  'Missing space before {': r's/\([^ ]\){/\1 {/',
-  'Tab found, replace by spaces': r's/\t/  /g',
-  'Line ends in whitespace.  Consider deleting these extra spaces.': r's/\s*$//',
-  'You don\'t need a ; after a }': r's/};/}/',
-  'Missing space after ,': r's/,\([^ ]\)/, \1/g',
-}
-
-_regexp_compile_cache = {}
-
-# {str, set(int)}: a map from error categories to sets of linenumbers
-# on which those errors are expected and should be suppressed.
-_error_suppressions = {}
-
-# The root directory used for deriving header guard CPP variable.
-# This is set by --root flag.
-_root = None
-_root_debug = False
-
-# The top level repository directory. If set, _root is calculated relative to
-# this directory instead of the directory containing version control artifacts.
-# This is set by the --repository flag.
-_repository = None
-
-# Files to exclude from linting. This is set by the --exclude flag.
-_excludes = None
-
-# Whether to supress all PrintInfo messages, UNRELATED to --quiet flag
-_quiet = False
-
-# The allowed line length of files.
-# This is set by --linelength flag.
-_line_length = 80
-
-# This allows to use different include order rule than default
-_include_order = "default"
-
-try:
-  unicode
-except NameError:
-  #  -- pylint: disable=redefined-builtin
-  basestring = unicode = str
-
-try:
-  long
-except NameError:
-  #  -- pylint: disable=redefined-builtin
-  long = int
-
-if sys.version_info < (3,):
-  #  -- pylint: disable=no-member
-  # BINARY_TYPE = str
-  itervalues = dict.itervalues
-  iteritems = dict.iteritems
-else:
-  # BINARY_TYPE = bytes
-  itervalues = dict.values
-  iteritems = dict.items
-
-def unicode_escape_decode(x):
-  if sys.version_info < (3,):
-    return codecs.unicode_escape_decode(x)[0]
-  else:
-    return x
-
-# Treat all headers starting with 'h' equally: .h, .hpp, .hxx etc.
-# This is set by --headers flag.
-_hpp_headers = set([])
-
-# {str, bool}: a map from error categories to booleans which indicate if the
-# category should be suppressed for every line.
-_global_error_suppressions = {}
-
-def ProcessHppHeadersOption(val):
-  global _hpp_headers
-  try:
-    _hpp_headers = {ext.strip() for ext in val.split(',')}
-  except ValueError:
-    PrintUsage('Header extensions must be comma separated list.')
-
-def ProcessIncludeOrderOption(val):
-  if val is None or val == "default":
-    pass
-  elif val == "standardcfirst":
-    global _include_order
-    _include_order = val
-  else:
-    PrintUsage('Invalid includeorder value %s. Expected default|standardcfirst')
-
-def IsHeaderExtension(file_extension):
-  return file_extension in GetHeaderExtensions()
-
-def GetHeaderExtensions():
-  if _hpp_headers:
-    return _hpp_headers
-  if _valid_extensions:
-    return {h for h in _valid_extensions if 'h' in h}
-  return set(['h', 'hh', 'hpp', 'hxx', 'h++', 'cuh'])
-
-# The allowed extensions for file names
-# This is set by --extensions flag
-def GetAllExtensions():
-  return GetHeaderExtensions().union(_valid_extensions or set(
-    ['c', 'cc', 'cpp', 'cxx', 'c++', 'cu']))
-
-def ProcessExtensionsOption(val):
-  global _valid_extensions
-  try:
-    extensions = [ext.strip() for ext in val.split(',')]
-    _valid_extensions = set(extensions)
-  except ValueError:
-    PrintUsage('Extensions should be a comma-separated list of values;'
-               'for example: extensions=hpp,cpp\n'
-               'This could not be parsed: "%s"' % (val,))
-
-def GetNonHeaderExtensions():
-  return GetAllExtensions().difference(GetHeaderExtensions())
-
-def ParseNolintSuppressions(filename, raw_line, linenum, error):
-  """Updates the global list of line error-suppressions.
-
-  Parses any NOLINT comments on the current line, updating the global
-  error_suppressions store.  Reports an error if the NOLINT comment
-  was malformed.
-
-  Args:
-    filename: str, the name of the input file.
-    raw_line: str, the line of input text, with comments.
-    linenum: int, the number of the current line.
-    error: function, an error handler.
-  """
-  matched = Search(r'\bNOLINT(NEXTLINE)?\b(\([^)]+\))?', raw_line)
-  if matched:
-    if matched.group(1):
-      suppressed_line = linenum + 1
-    else:
-      suppressed_line = linenum
-    category = matched.group(2)
-    if category in (None, '(*)'):  # => "suppress all"
-      _error_suppressions.setdefault(None, set()).add(suppressed_line)
-    else:
-      if category.startswith('(') and category.endswith(')'):
-        category = category[1:-1]
-        if category in _ERROR_CATEGORIES:
-          _error_suppressions.setdefault(category, set()).add(suppressed_line)
-        elif category not in _LEGACY_ERROR_CATEGORIES:
-          error(filename, linenum, 'readability/nolint', 5,
-                'Unknown NOLINT error category: %s' % category)
-
-
-def ProcessGlobalSuppresions(lines):
-  """Updates the list of global error suppressions.
-
-  Parses any lint directives in the file that have global effect.
-
-  Args:
-    lines: An array of strings, each representing a line of the file, with the
-           last element being empty if the file is terminated with a newline.
-  """
-  for line in lines:
-    if _SEARCH_C_FILE.search(line):
-      for category in _DEFAULT_C_SUPPRESSED_CATEGORIES:
-        _global_error_suppressions[category] = True
-    if _SEARCH_KERNEL_FILE.search(line):
-      for category in _DEFAULT_KERNEL_SUPPRESSED_CATEGORIES:
-        _global_error_suppressions[category] = True
-
-
-def ResetNolintSuppressions():
-  """Resets the set of NOLINT suppressions to empty."""
-  _error_suppressions.clear()
-  _global_error_suppressions.clear()
-
-
-def IsErrorSuppressedByNolint(category, linenum):
-  """Returns true if the specified error category is suppressed on this line.
-
-  Consults the global error_suppressions map populated by
-  ParseNolintSuppressions/ProcessGlobalSuppresions/ResetNolintSuppressions.
-
-  Args:
-    category: str, the category of the error.
-    linenum: int, the current line number.
-  Returns:
-    bool, True iff the error should be suppressed due to a NOLINT comment or
-    global suppression.
-  """
-  return (_global_error_suppressions.get(category, False) or
-          linenum in _error_suppressions.get(category, set()) or
-          linenum in _error_suppressions.get(None, set()))
-
-
-def Match(pattern, s):
-  """Matches the string with the pattern, caching the compiled regexp."""
-  # The regexp compilation caching is inlined in both Match and Search for
-  # performance reasons; factoring it out into a separate function turns out
-  # to be noticeably expensive.
-  if pattern not in _regexp_compile_cache:
-    _regexp_compile_cache[pattern] = sre_compile.compile(pattern)
-  return _regexp_compile_cache[pattern].match(s)
-
-
-def ReplaceAll(pattern, rep, s):
-  """Replaces instances of pattern in a string with a replacement.
-
-  The compiled regex is kept in a cache shared by Match and Search.
-
-  Args:
-    pattern: regex pattern
-    rep: replacement text
-    s: search string
-
-  Returns:
-    string with replacements made (or original string if no replacements)
-  """
-  if pattern not in _regexp_compile_cache:
-    _regexp_compile_cache[pattern] = sre_compile.compile(pattern)
-  return _regexp_compile_cache[pattern].sub(rep, s)
-
-
-def Search(pattern, s):
-  """Searches the string for the pattern, caching the compiled regexp."""
-  if pattern not in _regexp_compile_cache:
-    _regexp_compile_cache[pattern] = sre_compile.compile(pattern)
-  return _regexp_compile_cache[pattern].search(s)
-
-
-def _IsSourceExtension(s):
-  """File extension (excluding dot) matches a source file extension."""
-  return s in GetNonHeaderExtensions()
-
-
-class _IncludeState(object):
-  """Tracks line numbers for includes, and the order in which includes appear.
-
-  include_list contains list of lists of (header, line number) pairs.
-  It's a lists of lists rather than just one flat list to make it
-  easier to update across preprocessor boundaries.
-
-  Call CheckNextIncludeOrder() once for each header in the file, passing
-  in the type constants defined above. Calls in an illegal order will
-  raise an _IncludeError with an appropriate error message.
-
-  """
-  # self._section will move monotonically through this set. If it ever
-  # needs to move backwards, CheckNextIncludeOrder will raise an error.
-  _INITIAL_SECTION = 0
-  _MY_H_SECTION = 1
-  _C_SECTION = 2
-  _CPP_SECTION = 3
-  _OTHER_SYS_SECTION = 4
-  _OTHER_H_SECTION = 5
-
-  _TYPE_NAMES = {
-      _C_SYS_HEADER: 'C system header',
-      _CPP_SYS_HEADER: 'C++ system header',
-      _OTHER_SYS_HEADER: 'other system header',
-      _LIKELY_MY_HEADER: 'header this file implements',
-      _POSSIBLE_MY_HEADER: 'header this file may implement',
-      _OTHER_HEADER: 'other header',
-      }
-  _SECTION_NAMES = {
-      _INITIAL_SECTION: "... nothing. (This can't be an error.)",
-      _MY_H_SECTION: 'a header this file implements',
-      _C_SECTION: 'C system header',
-      _CPP_SECTION: 'C++ system header',
-      _OTHER_SYS_SECTION: 'other system header',
-      _OTHER_H_SECTION: 'other header',
-      }
-
-  def __init__(self):
-    self.include_list = [[]]
-    self._section = None
-    self._last_header = None
-    self.ResetSection('')
-
-  def FindHeader(self, header):
-    """Check if a header has already been included.
-
-    Args:
-      header: header to check.
-    Returns:
-      Line number of previous occurrence, or -1 if the header has not
-      been seen before.
-    """
-    for section_list in self.include_list:
-      for f in section_list:
-        if f[0] == header:
-          return f[1]
-    return -1
-
-  def ResetSection(self, directive):
-    """Reset section checking for preprocessor directive.
-
-    Args:
-      directive: preprocessor directive (e.g. "if", "else").
-    """
-    # The name of the current section.
-    self._section = self._INITIAL_SECTION
-    # The path of last found header.
-    self._last_header = ''
-
-    # Update list of includes.  Note that we never pop from the
-    # include list.
-    if directive in ('if', 'ifdef', 'ifndef'):
-      self.include_list.append([])
-    elif directive in ('else', 'elif'):
-      self.include_list[-1] = []
-
-  def SetLastHeader(self, header_path):
-    self._last_header = header_path
-
-  def CanonicalizeAlphabeticalOrder(self, header_path):
-    """Returns a path canonicalized for alphabetical comparison.
-
-    - replaces "-" with "_" so they both cmp the same.
-    - removes '-inl' since we don't require them to be after the main header.
-    - lowercase everything, just in case.
-
-    Args:
-      header_path: Path to be canonicalized.
-
-    Returns:
-      Canonicalized path.
-    """
-    return header_path.replace('-inl.h', '.h').replace('-', '_').lower()
-
-  def IsInAlphabeticalOrder(self, clean_lines, linenum, header_path):
-    """Check if a header is in alphabetical order with the previous header.
-
-    Args:
-      clean_lines: A CleansedLines instance containing the file.
-      linenum: The number of the line to check.
-      header_path: Canonicalized header to be checked.
-
-    Returns:
-      Returns true if the header is in alphabetical order.
-    """
-    # If previous section is different from current section, _last_header will
-    # be reset to empty string, so it's always less than current header.
-    #
-    # If previous line was a blank line, assume that the headers are
-    # intentionally sorted the way they are.
-    if (self._last_header > header_path and
-        Match(r'^\s*#\s*include\b', clean_lines.elided[linenum - 1])):
-      return False
-    return True
-
-  def CheckNextIncludeOrder(self, header_type):
-    """Returns a non-empty error message if the next header is out of order.
-
-    This function also updates the internal state to be ready to check
-    the next include.
-
-    Args:
-      header_type: One of the _XXX_HEADER constants defined above.
-
-    Returns:
-      The empty string if the header is in the right order, or an
-      error message describing what's wrong.
-
-    """
-    error_message = ('Found %s after %s' %
-                     (self._TYPE_NAMES[header_type],
-                      self._SECTION_NAMES[self._section]))
-
-    last_section = self._section
-
-    if header_type == _C_SYS_HEADER:
-      if self._section <= self._C_SECTION:
-        self._section = self._C_SECTION
-      else:
-        self._last_header = ''
-        return error_message
-    elif header_type == _CPP_SYS_HEADER:
-      if self._section <= self._CPP_SECTION:
-        self._section = self._CPP_SECTION
-      else:
-        self._last_header = ''
-        return error_message
-    elif header_type == _OTHER_SYS_HEADER:
-      if self._section <= self._OTHER_SYS_SECTION:
-        self._section = self._OTHER_SYS_SECTION
-      else:
-        self._last_header = ''
-        return error_message
-    elif header_type == _LIKELY_MY_HEADER:
-      if self._section <= self._MY_H_SECTION:
-        self._section = self._MY_H_SECTION
-      else:
-        self._section = self._OTHER_H_SECTION
-    elif header_type == _POSSIBLE_MY_HEADER:
-      if self._section <= self._MY_H_SECTION:
-        self._section = self._MY_H_SECTION
-      else:
-        # This will always be the fallback because we're not sure
-        # enough that the header is associated with this file.
-        self._section = self._OTHER_H_SECTION
-    else:
-      assert header_type == _OTHER_HEADER
-      self._section = self._OTHER_H_SECTION
-
-    if last_section != self._section:
-      self._last_header = ''
-
-    return ''
-
-
-class _CppLintState(object):
-  """Maintains module-wide state.."""
-
-  def __init__(self):
-    self.verbose_level = 1  # global setting.
-    self.error_count = 0    # global count of reported errors
-    # filters to apply when emitting error messages
-    self.filters = _DEFAULT_FILTERS[:]
-    # backup of filter list. Used to restore the state after each file.
-    self._filters_backup = self.filters[:]
-    self.counting = 'total'  # In what way are we counting errors?
-    self.errors_by_category = {}  # string to int dict storing error counts
-    self.quiet = False  # Suppress non-error messagess?
-
-    # output format:
-    # "emacs" - format that emacs can parse (default)
-    # "eclipse" - format that eclipse can parse
-    # "vs7" - format that Microsoft Visual Studio 7 can parse
-    # "junit" - format that Jenkins, Bamboo, etc can parse
-    # "sed" - returns a gnu sed command to fix the problem
-    # "gsed" - like sed, but names the command gsed, e.g. for macOS homebrew users
-    self.output_format = 'emacs'
-
-    # For JUnit output, save errors and failures until the end so that they
-    # can be written into the XML
-    self._junit_errors = []
-    self._junit_failures = []
-
-  def SetOutputFormat(self, output_format):
-    """Sets the output format for errors."""
-    self.output_format = output_format
-
-  def SetQuiet(self, quiet):
-    """Sets the module's quiet settings, and returns the previous setting."""
-    last_quiet = self.quiet
-    self.quiet = quiet
-    return last_quiet
-
-  def SetVerboseLevel(self, level):
-    """Sets the module's verbosity, and returns the previous setting."""
-    last_verbose_level = self.verbose_level
-    self.verbose_level = level
-    return last_verbose_level
-
-  def SetCountingStyle(self, counting_style):
-    """Sets the module's counting options."""
-    self.counting = counting_style
-
-  def SetFilters(self, filters):
-    """Sets the error-message filters.
-
-    These filters are applied when deciding whether to emit a given
-    error message.
-
-    Args:
-      filters: A string of comma-separated filters (eg "+whitespace/indent").
-               Each filter should start with + or -; else we die.
-
-    Raises:
-      ValueError: The comma-separated filters did not all start with '+' or '-'.
-                  E.g. "-,+whitespace,-whitespace/indent,whitespace/badfilter"
-    """
-    # Default filters always have less priority than the flag ones.
-    self.filters = _DEFAULT_FILTERS[:]
-    self.AddFilters(filters)
-
-  def AddFilters(self, filters):
-    """ Adds more filters to the existing list of error-message filters. """
-    for filt in filters.split(','):
-      clean_filt = filt.strip()
-      if clean_filt:
-        self.filters.append(clean_filt)
-    for filt in self.filters:
-      if not (filt.startswith('+') or filt.startswith('-')):
-        raise ValueError('Every filter in --filters must start with + or -'
-                         ' (%s does not)' % filt)
-
-  def BackupFilters(self):
-    """ Saves the current filter list to backup storage."""
-    self._filters_backup = self.filters[:]
-
-  def RestoreFilters(self):
-    """ Restores filters previously backed up."""
-    self.filters = self._filters_backup[:]
-
-  def ResetErrorCounts(self):
-    """Sets the module's error statistic back to zero."""
-    self.error_count = 0
-    self.errors_by_category = {}
-
-  def IncrementErrorCount(self, category):
-    """Bumps the module's error statistic."""
-    self.error_count += 1
-    if self.counting in ('toplevel', 'detailed'):
-      if self.counting != 'detailed':
-        category = category.split('/')[0]
-      if category not in self.errors_by_category:
-        self.errors_by_category[category] = 0
-      self.errors_by_category[category] += 1
-
-  def PrintErrorCounts(self):
-    """Print a summary of errors by category, and the total."""
-    for category, count in sorted(iteritems(self.errors_by_category)):
-      self.PrintInfo('Category \'%s\' errors found: %d\n' %
-                       (category, count))
-    if self.error_count > 0:
-      self.PrintInfo('Total errors found: %d\n' % self.error_count)
-
-  def PrintInfo(self, message):
-    # _quiet does not represent --quiet flag.
-    # Hide infos from stdout to keep stdout pure for machine consumption
-    if not _quiet and self.output_format not in _MACHINE_OUTPUTS:
-      sys.stdout.write(message)
-
-  def PrintError(self, message):
-    if self.output_format == 'junit':
-      self._junit_errors.append(message)
-    else:
-      sys.stderr.write(message)
-
-  def AddJUnitFailure(self, filename, linenum, message, category, confidence):
-    self._junit_failures.append((filename, linenum, message, category,
-        confidence))
-
-  def FormatJUnitXML(self):
-    num_errors = len(self._junit_errors)
-    num_failures = len(self._junit_failures)
-
-    testsuite = xml.etree.ElementTree.Element('testsuite')
-    testsuite.attrib['errors'] = str(num_errors)
-    testsuite.attrib['failures'] = str(num_failures)
-    testsuite.attrib['name'] = 'cpplint'
-
-    if num_errors == 0 and num_failures == 0:
-      testsuite.attrib['tests'] = str(1)
-      xml.etree.ElementTree.SubElement(testsuite, 'testcase', name='passed')
-
-    else:
-      testsuite.attrib['tests'] = str(num_errors + num_failures)
-      if num_errors > 0:
-        testcase = xml.etree.ElementTree.SubElement(testsuite, 'testcase')
-        testcase.attrib['name'] = 'errors'
-        error = xml.etree.ElementTree.SubElement(testcase, 'error')
-        error.text = '\n'.join(self._junit_errors)
-      if num_failures > 0:
-        # Group failures by file
-        failed_file_order = []
-        failures_by_file = {}
-        for failure in self._junit_failures:
-          failed_file = failure[0]
-          if failed_file not in failed_file_order:
-            failed_file_order.append(failed_file)
-            failures_by_file[failed_file] = []
-          failures_by_file[failed_file].append(failure)
-        # Create a testcase for each file
-        for failed_file in failed_file_order:
-          failures = failures_by_file[failed_file]
-          testcase = xml.etree.ElementTree.SubElement(testsuite, 'testcase')
-          testcase.attrib['name'] = failed_file
-          failure = xml.etree.ElementTree.SubElement(testcase, 'failure')
-          template = '{0}: {1} [{2}] [{3}]'
-          texts = [template.format(f[1], f[2], f[3], f[4]) for f in failures]
-          failure.text = '\n'.join(texts)
-
-    xml_decl = '<?xml version="1.0" encoding="UTF-8" ?>\n'
-    return xml_decl + xml.etree.ElementTree.tostring(testsuite, 'utf-8').decode('utf-8')
-
-
-_cpplint_state = _CppLintState()
-
-
-def _OutputFormat():
-  """Gets the module's output format."""
-  return _cpplint_state.output_format
-
-
-def _SetOutputFormat(output_format):
-  """Sets the module's output format."""
-  _cpplint_state.SetOutputFormat(output_format)
-
-def _Quiet():
-  """Return's the module's quiet setting."""
-  return _cpplint_state.quiet
-
-def _SetQuiet(quiet):
-  """Set the module's quiet status, and return previous setting."""
-  return _cpplint_state.SetQuiet(quiet)
-
-
-def _VerboseLevel():
-  """Returns the module's verbosity setting."""
-  return _cpplint_state.verbose_level
-
-
-def _SetVerboseLevel(level):
-  """Sets the module's verbosity, and returns the previous setting."""
-  return _cpplint_state.SetVerboseLevel(level)
-
-
-def _SetCountingStyle(level):
-  """Sets the module's counting options."""
-  _cpplint_state.SetCountingStyle(level)
-
-
-def _Filters():
-  """Returns the module's list of output filters, as a list."""
-  return _cpplint_state.filters
-
-
-def _SetFilters(filters):
-  """Sets the module's error-message filters.
-
-  These filters are applied when deciding whether to emit a given
-  error message.
-
-  Args:
-    filters: A string of comma-separated filters (eg "whitespace/indent").
-             Each filter should start with + or -; else we die.
-  """
-  _cpplint_state.SetFilters(filters)
-
-def _AddFilters(filters):
-  """Adds more filter overrides.
-
-  Unlike _SetFilters, this function does not reset the current list of filters
-  available.
-
-  Args:
-    filters: A string of comma-separated filters (eg "whitespace/indent").
-             Each filter should start with + or -; else we die.
-  """
-  _cpplint_state.AddFilters(filters)
-
-def _BackupFilters():
-  """ Saves the current filter list to backup storage."""
-  _cpplint_state.BackupFilters()
-
-def _RestoreFilters():
-  """ Restores filters previously backed up."""
-  _cpplint_state.RestoreFilters()
-
-class _FunctionState(object):
-  """Tracks current function name and the number of lines in its body."""
-
-  _NORMAL_TRIGGER = 250  # for --v=0, 500 for --v=1, etc.
-  _TEST_TRIGGER = 400    # about 50% more than _NORMAL_TRIGGER.
-
-  def __init__(self):
-    self.in_a_function = False
-    self.lines_in_function = 0
-    self.current_function = ''
-
-  def Begin(self, function_name):
-    """Start analyzing function body.
-
-    Args:
-      function_name: The name of the function being tracked.
-    """
-    self.in_a_function = True
-    self.lines_in_function = 0
-    self.current_function = function_name
-
-  def Count(self):
-    """Count line in current function body."""
-    if self.in_a_function:
-      self.lines_in_function += 1
-
-  def Check(self, error, filename, linenum):
-    """Report if too many lines in function body.
-
-    Args:
-      error: The function to call with any errors found.
-      filename: The name of the current file.
-      linenum: The number of the line to check.
-    """
-    if not self.in_a_function:
-      return
-
-    if Match(r'T(EST|est)', self.current_function):
-      base_trigger = self._TEST_TRIGGER
-    else:
-      base_trigger = self._NORMAL_TRIGGER
-    trigger = base_trigger * 2**_VerboseLevel()
-
-    if self.lines_in_function > trigger:
-      error_level = int(math.log(self.lines_in_function / base_trigger, 2))
-      # 50 => 0, 100 => 1, 200 => 2, 400 => 3, 800 => 4, 1600 => 5, ...
-      if error_level > 5:
-        error_level = 5
-      error(filename, linenum, 'readability/fn_size', error_level,
-            'Small and focused functions are preferred:'
-            ' %s has %d non-comment lines'
-            ' (error triggered by exceeding %d lines).'  % (
-                self.current_function, self.lines_in_function, trigger))
-
-  def End(self):
-    """Stop analyzing function body."""
-    self.in_a_function = False
-
-
-class _IncludeError(Exception):
-  """Indicates a problem with the include order in a file."""
-  pass
-
-
-class FileInfo(object):
-  """Provides utility functions for filenames.
-
-  FileInfo provides easy access to the components of a file's path
-  relative to the project root.
-  """
-
-  def __init__(self, filename):
-    self._filename = filename
-
-  def FullName(self):
-    """Make Windows paths like Unix."""
-    return os.path.abspath(self._filename).replace('\\', '/')
-
-  def RepositoryName(self):
-    r"""FullName after removing the local path to the repository.
-
-    If we have a real absolute path name here we can try to do something smart:
-    detecting the root of the checkout and truncating /path/to/checkout from
-    the name so that we get header guards that don't include things like
-    "C:\\Documents and Settings\\..." or "/home/username/..." in them and thus
-    people on different computers who have checked the source out to different
-    locations won't see bogus errors.
-    """
-    fullname = self.FullName()
-
-    if os.path.exists(fullname):
-      project_dir = os.path.dirname(fullname)
-
-      # If the user specified a repository path, it exists, and the file is
-      # contained in it, use the specified repository path
-      if _repository:
-        repo = FileInfo(_repository).FullName()
-        root_dir = project_dir
-        while os.path.exists(root_dir):
-          # allow case insensitive compare on Windows
-          if os.path.normcase(root_dir) == os.path.normcase(repo):
-            return os.path.relpath(fullname, root_dir).replace('\\', '/')
-          one_up_dir = os.path.dirname(root_dir)
-          if one_up_dir == root_dir:
-            break
-          root_dir = one_up_dir
-
-      if os.path.exists(os.path.join(project_dir, ".svn")):
-        # If there's a .svn file in the current directory, we recursively look
-        # up the directory tree for the top of the SVN checkout
-        root_dir = project_dir
-        one_up_dir = os.path.dirname(root_dir)
-        while os.path.exists(os.path.join(one_up_dir, ".svn")):
-          root_dir = os.path.dirname(root_dir)
-          one_up_dir = os.path.dirname(one_up_dir)
-
-        prefix = os.path.commonprefix([root_dir, project_dir])
-        return fullname[len(prefix) + 1:]
-
-      # Not SVN <= 1.6? Try to find a git, hg, or svn top level directory by
-      # searching up from the current path.
-      root_dir = current_dir = os.path.dirname(fullname)
-      while current_dir != os.path.dirname(current_dir):
-        if (os.path.exists(os.path.join(current_dir, ".git")) or
-            os.path.exists(os.path.join(current_dir, ".hg")) or
-            os.path.exists(os.path.join(current_dir, ".svn"))):
-          root_dir = current_dir
-        current_dir = os.path.dirname(current_dir)
-
-      if (os.path.exists(os.path.join(root_dir, ".git")) or
-          os.path.exists(os.path.join(root_dir, ".hg")) or
-          os.path.exists(os.path.join(root_dir, ".svn"))):
-        prefix = os.path.commonprefix([root_dir, project_dir])
-        return fullname[len(prefix) + 1:]
-
-    # Don't know what to do; header guard warnings may be wrong...
-    return fullname
-
-  def Split(self):
-    """Splits the file into the directory, basename, and extension.
-
-    For 'chrome/browser/browser.cc', Split() would
-    return ('chrome/browser', 'browser', '.cc')
-
-    Returns:
-      A tuple of (directory, basename, extension).
-    """
-
-    googlename = self.RepositoryName()
-    project, rest = os.path.split(googlename)
-    return (project,) + os.path.splitext(rest)
-
-  def BaseName(self):
-    """File base name - text after the final slash, before the final period."""
-    return self.Split()[1]
-
-  def Extension(self):
-    """File extension - text following the final period, includes that period."""
-    return self.Split()[2]
-
-  def NoExtension(self):
-    """File has no source file extension."""
-    return '/'.join(self.Split()[0:2])
-
-  def IsSource(self):
-    """File has a source file extension."""
-    return _IsSourceExtension(self.Extension()[1:])
-
-
-def _ShouldPrintError(category, confidence, linenum):
-  """If confidence >= verbose, category passes filter and is not suppressed."""
-
-  # There are three ways we might decide not to print an error message:
-  # a "NOLINT(category)" comment appears in the source,
-  # the verbosity level isn't high enough, or the filters filter it out.
-  if IsErrorSuppressedByNolint(category, linenum):
-    return False
-
-  if confidence < _cpplint_state.verbose_level:
-    return False
-
-  is_filtered = False
-  for one_filter in _Filters():
-    if one_filter.startswith('-'):
-      if category.startswith(one_filter[1:]):
-        is_filtered = True
-    elif one_filter.startswith('+'):
-      if category.startswith(one_filter[1:]):
-        is_filtered = False
-    else:
-      assert False  # should have been checked for in SetFilter.
-  if is_filtered:
-    return False
-
-  return True
-
-
-def Error(filename, linenum, category, confidence, message):
-  """Logs the fact we've found a lint error.
-
-  We log where the error was found, and also our confidence in the error,
-  that is, how certain we are this is a legitimate style regression, and
-  not a misidentification or a use that's sometimes justified.
-
-  False positives can be suppressed by the use of
-  "cpplint(category)"  comments on the offending line.  These are
-  parsed into _error_suppressions.
-
-  Args:
-    filename: The name of the file containing the error.
-    linenum: The number of the line containing the error.
-    category: A string used to describe the "category" this bug
-      falls under: "whitespace", say, or "runtime".  Categories
-      may have a hierarchy separated by slashes: "whitespace/indent".
-    confidence: A number from 1-5 representing a confidence score for
-      the error, with 5 meaning that we are certain of the problem,
-      and 1 meaning that it could be a legitimate construct.
-    message: The error message.
-  """
-  if _ShouldPrintError(category, confidence, linenum):
-    _cpplint_state.IncrementErrorCount(category)
-    if _cpplint_state.output_format == 'vs7':
-      _cpplint_state.PrintError('%s(%s): error cpplint: [%s] %s [%d]\n' % (
-          filename, linenum, category, message, confidence))
-    elif _cpplint_state.output_format == 'eclipse':
-      sys.stderr.write('%s:%s: warning: %s  [%s] [%d]\n' % (
-          filename, linenum, message, category, confidence))
-    elif _cpplint_state.output_format == 'junit':
-      _cpplint_state.AddJUnitFailure(filename, linenum, message, category,
-          confidence)
-    elif _cpplint_state.output_format in ['sed', 'gsed']:
-      if message in _SED_FIXUPS:
-        sys.stdout.write(_cpplint_state.output_format + " -i '%s%s' %s # %s  [%s] [%d]\n" % (
-            linenum, _SED_FIXUPS[message], filename, message, category, confidence))
-      else:
-        sys.stderr.write('# %s:%s:  "%s"  [%s] [%d]\n' % (
-            filename, linenum, message, category, confidence))
-    else:
-      final_message = '%s:%s:  %s  [%s] [%d]\n' % (
-          filename, linenum, message, category, confidence)
-      sys.stderr.write(final_message)
-
-# Matches standard C++ escape sequences per 2.13.2.3 of the C++ standard.
-_RE_PATTERN_CLEANSE_LINE_ESCAPES = re.compile(
-    r'\\([abfnrtv?"\\\']|\d+|x[0-9a-fA-F]+)')
-# Match a single C style comment on the same line.
-_RE_PATTERN_C_COMMENTS = r'/\*(?:[^*]|\*(?!/))*\*/'
-# Matches multi-line C style comments.
-# This RE is a little bit more complicated than one might expect, because we
-# have to take care of space removals tools so we can handle comments inside
-# statements better.
-# The current rule is: We only clear spaces from both sides when we're at the
-# end of the line. Otherwise, we try to remove spaces from the right side,
-# if this doesn't work we try on left side but only if there's a non-character
-# on the right.
-_RE_PATTERN_CLEANSE_LINE_C_COMMENTS = re.compile(
-    r'(\s*' + _RE_PATTERN_C_COMMENTS + r'\s*$|' +
-    _RE_PATTERN_C_COMMENTS + r'\s+|' +
-    r'\s+' + _RE_PATTERN_C_COMMENTS + r'(?=\W)|' +
-    _RE_PATTERN_C_COMMENTS + r')')
-
-
-def IsCppString(line):
-  """Does line terminate so, that the next symbol is in string constant.
-
-  This function does not consider single-line nor multi-line comments.
-
-  Args:
-    line: is a partial line of code starting from the 0..n.
-
-  Returns:
-    True, if next character appended to 'line' is inside a
-    string constant.
-  """
-
-  line = line.replace(r'\\', 'XX')  # after this, \\" does not match to \"
-  return ((line.count('"') - line.count(r'\"') - line.count("'\"'")) & 1) == 1
-
-
-def CleanseRawStrings(raw_lines):
-  """Removes C++11 raw strings from lines.
-
-    Before:
-      static const char kData[] = R"(
-          multi-line string
-          )";
-
-    After:
-      static const char kData[] = ""
-          (replaced by blank line)
-          "";
-
-  Args:
-    raw_lines: list of raw lines.
-
-  Returns:
-    list of lines with C++11 raw strings replaced by empty strings.
-  """
-
-  delimiter = None
-  lines_without_raw_strings = []
-  for line in raw_lines:
-    if delimiter:
-      # Inside a raw string, look for the end
-      end = line.find(delimiter)
-      if end >= 0:
-        # Found the end of the string, match leading space for this
-        # line and resume copying the original lines, and also insert
-        # a "" on the last line.
-        leading_space = Match(r'^(\s*)\S', line)
-        line = leading_space.group(1) + '""' + line[end + len(delimiter):]
-        delimiter = None
-      else:
-        # Haven't found the end yet, append a blank line.
-        line = '""'
-
-    # Look for beginning of a raw string, and replace them with
-    # empty strings.  This is done in a loop to handle multiple raw
-    # strings on the same line.
-    while delimiter is None:
-      # Look for beginning of a raw string.
-      # See 2.14.15 [lex.string] for syntax.
-      #
-      # Once we have matched a raw string, we check the prefix of the
-      # line to make sure that the line is not part of a single line
-      # comment.  It's done this way because we remove raw strings
-      # before removing comments as opposed to removing comments
-      # before removing raw strings.  This is because there are some
-      # cpplint checks that requires the comments to be preserved, but
-      # we don't want to check comments that are inside raw strings.
-      matched = Match(r'^(.*?)\b(?:R|u8R|uR|UR|LR)"([^\s\\()]*)\((.*)$', line)
-      if (matched and
-          not Match(r'^([^\'"]|\'(\\.|[^\'])*\'|"(\\.|[^"])*")*//',
-                    matched.group(1))):
-        delimiter = ')' + matched.group(2) + '"'
-
-        end = matched.group(3).find(delimiter)
-        if end >= 0:
-          # Raw string ended on same line
-          line = (matched.group(1) + '""' +
-                  matched.group(3)[end + len(delimiter):])
-          delimiter = None
-        else:
-          # Start of a multi-line raw string
-          line = matched.group(1) + '""'
-      else:
-        break
-
-    lines_without_raw_strings.append(line)
-
-  # TODO(unknown): if delimiter is not None here, we might want to
-  # emit a warning for unterminated string.
-  return lines_without_raw_strings
-
-
-def FindNextMultiLineCommentStart(lines, lineix):
-  """Find the beginning marker for a multiline comment."""
-  while lineix < len(lines):
-    if lines[lineix].strip().startswith('/*'):
-      # Only return this marker if the comment goes beyond this line
-      if lines[lineix].strip().find('*/', 2) < 0:
-        return lineix
-    lineix += 1
-  return len(lines)
-
-
-def FindNextMultiLineCommentEnd(lines, lineix):
-  """We are inside a comment, find the end marker."""
-  while lineix < len(lines):
-    if lines[lineix].strip().endswith('*/'):
-      return lineix
-    lineix += 1
-  return len(lines)
-
-
-def RemoveMultiLineCommentsFromRange(lines, begin, end):
-  """Clears a range of lines for multi-line comments."""
-  # Having // <empty> comments makes the lines non-empty, so we will not get
-  # unnecessary blank line warnings later in the code.
-  for i in range(begin, end):
-    lines[i] = '/**/'
-
-
-def RemoveMultiLineComments(filename, lines, error):
-  """Removes multiline (c-style) comments from lines."""
-  lineix = 0
-  while lineix < len(lines):
-    lineix_begin = FindNextMultiLineCommentStart(lines, lineix)
-    if lineix_begin >= len(lines):
-      return
-    lineix_end = FindNextMultiLineCommentEnd(lines, lineix_begin)
-    if lineix_end >= len(lines):
-      error(filename, lineix_begin + 1, 'readability/multiline_comment', 5,
-            'Could not find end of multi-line comment')
-      return
-    RemoveMultiLineCommentsFromRange(lines, lineix_begin, lineix_end + 1)
-    lineix = lineix_end + 1
-
-
-def CleanseComments(line):
-  """Removes //-comments and single-line C-style /* */ comments.
-
-  Args:
-    line: A line of C++ source.
-
-  Returns:
-    The line with single-line comments removed.
-  """
-  commentpos = line.find('//')
-  if commentpos != -1 and not IsCppString(line[:commentpos]):
-    line = line[:commentpos].rstrip()
-  # get rid of /* ... */
-  return _RE_PATTERN_CLEANSE_LINE_C_COMMENTS.sub('', line)
-
-
-class CleansedLines(object):
-  """Holds 4 copies of all lines with different preprocessing applied to them.
-
-  1) elided member contains lines without strings and comments.
-  2) lines member contains lines without comments.
-  3) raw_lines member contains all the lines without processing.
-  4) lines_without_raw_strings member is same as raw_lines, but with C++11 raw
-     strings removed.
-  All these members are of <type 'list'>, and of the same length.
-  """
-
-  def __init__(self, lines):
-    self.elided = []
-    self.lines = []
-    self.raw_lines = lines
-    self.num_lines = len(lines)
-    self.lines_without_raw_strings = CleanseRawStrings(lines)
-    for linenum in range(len(self.lines_without_raw_strings)):
-      self.lines.append(CleanseComments(
-          self.lines_without_raw_strings[linenum]))
-      elided = self._CollapseStrings(self.lines_without_raw_strings[linenum])
-      self.elided.append(CleanseComments(elided))
-
-  def NumLines(self):
-    """Returns the number of lines represented."""
-    return self.num_lines
-
-  @staticmethod
-  def _CollapseStrings(elided):
-    """Collapses strings and chars on a line to simple "" or '' blocks.
-
-    We nix strings first so we're not fooled by text like '"http://"'
-
-    Args:
-      elided: The line being processed.
-
-    Returns:
-      The line with collapsed strings.
-    """
-    if _RE_PATTERN_INCLUDE.match(elided):
-      return elided
-
-    # Remove escaped characters first to make quote/single quote collapsing
-    # basic.  Things that look like escaped characters shouldn't occur
-    # outside of strings and chars.
-    elided = _RE_PATTERN_CLEANSE_LINE_ESCAPES.sub('', elided)
-
-    # Replace quoted strings and digit separators.  Both single quotes
-    # and double quotes are processed in the same loop, otherwise
-    # nested quotes wouldn't work.
-    collapsed = ''
-    while True:
-      # Find the first quote character
-      match = Match(r'^([^\'"]*)([\'"])(.*)$', elided)
-      if not match:
-        collapsed += elided
-        break
-      head, quote, tail = match.groups()
-
-      if quote == '"':
-        # Collapse double quoted strings
-        second_quote = tail.find('"')
-        if second_quote >= 0:
-          collapsed += head + '""'
-          elided = tail[second_quote + 1:]
-        else:
-          # Unmatched double quote, don't bother processing the rest
-          # of the line since this is probably a multiline string.
-          collapsed += elided
-          break
-      else:
-        # Found single quote, check nearby text to eliminate digit separators.
-        #
-        # There is no special handling for floating point here, because
-        # the integer/fractional/exponent parts would all be parsed
-        # correctly as long as there are digits on both sides of the
-        # separator.  So we are fine as long as we don't see something
-        # like "0.'3" (gcc 4.9.0 will not allow this literal).
-        if Search(r'\b(?:0[bBxX]?|[1-9])[0-9a-fA-F]*$', head):
-          match_literal = Match(r'^((?:\'?[0-9a-zA-Z_])*)(.*)$', "'" + tail)
-          collapsed += head + match_literal.group(1).replace("'", '')
-          elided = match_literal.group(2)
-        else:
-          second_quote = tail.find('\'')
-          if second_quote >= 0:
-            collapsed += head + "''"
-            elided = tail[second_quote + 1:]
-          else:
-            # Unmatched single quote
-            collapsed += elided
-            break
-
-    return collapsed
-
-
-def FindEndOfExpressionInLine(line, startpos, stack):
-  """Find the position just after the end of current parenthesized expression.
-
-  Args:
-    line: a CleansedLines line.
-    startpos: start searching at this position.
-    stack: nesting stack at startpos.
-
-  Returns:
-    On finding matching end: (index just after matching end, None)
-    On finding an unclosed expression: (-1, None)
-    Otherwise: (-1, new stack at end of this line)
-  """
-  for i in xrange(startpos, len(line)):
-    char = line[i]
-    if char in '([{':
-      # Found start of parenthesized expression, push to expression stack
-      stack.append(char)
-    elif char == '<':
-      # Found potential start of template argument list
-      if i > 0 and line[i - 1] == '<':
-        # Left shift operator
-        if stack and stack[-1] == '<':
-          stack.pop()
-          if not stack:
-            return (-1, None)
-      elif i > 0 and Search(r'\boperator\s*$', line[0:i]):
-        # operator<, don't add to stack
-        continue
-      else:
-        # Tentative start of template argument list
-        stack.append('<')
-    elif char in ')]}':
-      # Found end of parenthesized expression.
-      #
-      # If we are currently expecting a matching '>', the pending '<'
-      # must have been an operator.  Remove them from expression stack.
-      while stack and stack[-1] == '<':
-        stack.pop()
-      if not stack:
-        return (-1, None)
-      if ((stack[-1] == '(' and char == ')') or
-          (stack[-1] == '[' and char == ']') or
-          (stack[-1] == '{' and char == '}')):
-        stack.pop()
-        if not stack:
-          return (i + 1, None)
-      else:
-        # Mismatched parentheses
-        return (-1, None)
-    elif char == '>':
-      # Found potential end of template argument list.
-
-      # Ignore "->" and operator functions
-      if (i > 0 and
-          (line[i - 1] == '-' or Search(r'\boperator\s*$', line[0:i - 1]))):
-        continue
-
-      # Pop the stack if there is a matching '<'.  Otherwise, ignore
-      # this '>' since it must be an operator.
-      if stack:
-        if stack[-1] == '<':
-          stack.pop()
-          if not stack:
-            return (i + 1, None)
-    elif char == ';':
-      # Found something that look like end of statements.  If we are currently
-      # expecting a '>', the matching '<' must have been an operator, since
-      # template argument list should not contain statements.
-      while stack and stack[-1] == '<':
-        stack.pop()
-      if not stack:
-        return (-1, None)
-
-  # Did not find end of expression or unbalanced parentheses on this line
-  return (-1, stack)
-
-
-def CloseExpression(clean_lines, linenum, pos):
-  """If input points to ( or { or [ or <, finds the position that closes it.
-
-  If lines[linenum][pos] points to a '(' or '{' or '[' or '<', finds the
-  linenum/pos that correspond to the closing of the expression.
-
-  TODO(unknown): cpplint spends a fair bit of time matching parentheses.
-  Ideally we would want to index all opening and closing parentheses once
-  and have CloseExpression be just a simple lookup, but due to preprocessor
-  tricks, this is not so easy.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    pos: A position on the line.
-
-  Returns:
-    A tuple (line, linenum, pos) pointer *past* the closing brace, or
-    (line, len(lines), -1) if we never find a close.  Note we ignore
-    strings and comments when matching; and the line we return is the
-    'cleansed' line at linenum.
-  """
-
-  line = clean_lines.elided[linenum]
-  if (line[pos] not in '({[<') or Match(r'<[<=]', line[pos:]):
-    return (line, clean_lines.NumLines(), -1)
-
-  # Check first line
-  (end_pos, stack) = FindEndOfExpressionInLine(line, pos, [])
-  if end_pos > -1:
-    return (line, linenum, end_pos)
-
-  # Continue scanning forward
-  while stack and linenum < clean_lines.NumLines() - 1:
-    linenum += 1
-    line = clean_lines.elided[linenum]
-    (end_pos, stack) = FindEndOfExpressionInLine(line, 0, stack)
-    if end_pos > -1:
-      return (line, linenum, end_pos)
-
-  # Did not find end of expression before end of file, give up
-  return (line, clean_lines.NumLines(), -1)
-
-
-def FindStartOfExpressionInLine(line, endpos, stack):
-  """Find position at the matching start of current expression.
-
-  This is almost the reverse of FindEndOfExpressionInLine, but note
-  that the input position and returned position differs by 1.
-
-  Args:
-    line: a CleansedLines line.
-    endpos: start searching at this position.
-    stack: nesting stack at endpos.
-
-  Returns:
-    On finding matching start: (index at matching start, None)
-    On finding an unclosed expression: (-1, None)
-    Otherwise: (-1, new stack at beginning of this line)
-  """
-  i = endpos
-  while i >= 0:
-    char = line[i]
-    if char in ')]}':
-      # Found end of expression, push to expression stack
-      stack.append(char)
-    elif char == '>':
-      # Found potential end of template argument list.
-      #
-      # Ignore it if it's a "->" or ">=" or "operator>"
-      if (i > 0 and
-          (line[i - 1] == '-' or
-           Match(r'\s>=\s', line[i - 1:]) or
-           Search(r'\boperator\s*$', line[0:i]))):
-        i -= 1
-      else:
-        stack.append('>')
-    elif char == '<':
-      # Found potential start of template argument list
-      if i > 0 and line[i - 1] == '<':
-        # Left shift operator
-        i -= 1
-      else:
-        # If there is a matching '>', we can pop the expression stack.
-        # Otherwise, ignore this '<' since it must be an operator.
-        if stack and stack[-1] == '>':
-          stack.pop()
-          if not stack:
-            return (i, None)
-    elif char in '([{':
-      # Found start of expression.
-      #
-      # If there are any unmatched '>' on the stack, they must be
-      # operators.  Remove those.
-      while stack and stack[-1] == '>':
-        stack.pop()
-      if not stack:
-        return (-1, None)
-      if ((char == '(' and stack[-1] == ')') or
-          (char == '[' and stack[-1] == ']') or
-          (char == '{' and stack[-1] == '}')):
-        stack.pop()
-        if not stack:
-          return (i, None)
-      else:
-        # Mismatched parentheses
-        return (-1, None)
-    elif char == ';':
-      # Found something that look like end of statements.  If we are currently
-      # expecting a '<', the matching '>' must have been an operator, since
-      # template argument list should not contain statements.
-      while stack and stack[-1] == '>':
-        stack.pop()
-      if not stack:
-        return (-1, None)
-
-    i -= 1
-
-  return (-1, stack)
-
-
-def ReverseCloseExpression(clean_lines, linenum, pos):
-  """If input points to ) or } or ] or >, finds the position that opens it.
-
-  If lines[linenum][pos] points to a ')' or '}' or ']' or '>', finds the
-  linenum/pos that correspond to the opening of the expression.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    pos: A position on the line.
-
-  Returns:
-    A tuple (line, linenum, pos) pointer *at* the opening brace, or
-    (line, 0, -1) if we never find the matching opening brace.  Note
-    we ignore strings and comments when matching; and the line we
-    return is the 'cleansed' line at linenum.
-  """
-  line = clean_lines.elided[linenum]
-  if line[pos] not in ')}]>':
-    return (line, 0, -1)
-
-  # Check last line
-  (start_pos, stack) = FindStartOfExpressionInLine(line, pos, [])
-  if start_pos > -1:
-    return (line, linenum, start_pos)
-
-  # Continue scanning backward
-  while stack and linenum > 0:
-    linenum -= 1
-    line = clean_lines.elided[linenum]
-    (start_pos, stack) = FindStartOfExpressionInLine(line, len(line) - 1, stack)
-    if start_pos > -1:
-      return (line, linenum, start_pos)
-
-  # Did not find start of expression before beginning of file, give up
-  return (line, 0, -1)
-
-
-def CheckForCopyright(filename, lines, error):
-  """Logs an error if no Copyright message appears at the top of the file."""
-
-  # We'll say it should occur by line 10. Don't forget there's a
-  # placeholder line at the front.
-  for line in xrange(1, min(len(lines), 11)):
-    if re.search(r'Copyright', lines[line], re.I): break
-  else:                       # means no copyright line was found
-    error(filename, 0, 'legal/copyright', 5,
-          'No copyright message found.  '
-          'You should have a line: "Copyright [year] <Copyright Owner>"')
-
-
-def GetIndentLevel(line):
-  """Return the number of leading spaces in line.
-
-  Args:
-    line: A string to check.
-
-  Returns:
-    An integer count of leading spaces, possibly zero.
-  """
-  indent = Match(r'^( *)\S', line)
-  if indent:
-    return len(indent.group(1))
-  else:
-    return 0
-
-def PathSplitToList(path):
-  """Returns the path split into a list by the separator.
-
-  Args:
-    path: An absolute or relative path (e.g. '/a/b/c/' or '../a')
-
-  Returns:
-    A list of path components (e.g. ['a', 'b', 'c]).
-  """
-  lst = []
-  while True:
-    (head, tail) = os.path.split(path)
-    if head == path:  # absolute paths end
-      lst.append(head)
-      break
-    if tail == path:  # relative paths end
-      lst.append(tail)
-      break
-
-    path = head
-    lst.append(tail)
-
-  lst.reverse()
-  return lst
-
-def GetHeaderGuardCPPVariable(filename):
-  """Returns the CPP variable that should be used as a header guard.
-
-  Args:
-    filename: The name of a C++ header file.
-
-  Returns:
-    The CPP variable that should be used as a header guard in the
-    named file.
-
-  """
-
-  # Restores original filename in case that cpplint is invoked from Emacs's
-  # flymake.
-  filename = re.sub(r'_flymake\.h$', '.h', filename)
-  filename = re.sub(r'/\.flymake/([^/]*)$', r'/\1', filename)
-  # Replace 'c++' with 'cpp'.
-  filename = filename.replace('C++', 'cpp').replace('c++', 'cpp')
-
-  fileinfo = FileInfo(filename)
-  file_path_from_root = fileinfo.RepositoryName()
-
-  def FixupPathFromRoot():
-    if _root_debug:
-      sys.stderr.write("\n_root fixup, _root = '%s', repository name = '%s'\n"
-          % (_root, fileinfo.RepositoryName()))
-
-    # Process the file path with the --root flag if it was set.
-    if not _root:
-      if _root_debug:
-        sys.stderr.write("_root unspecified\n")
-      return file_path_from_root
-
-    def StripListPrefix(lst, prefix):
-      # f(['x', 'y'], ['w, z']) -> None  (not a valid prefix)
-      if lst[:len(prefix)] != prefix:
-        return None
-      # f(['a, 'b', 'c', 'd'], ['a', 'b']) -> ['c', 'd']
-      return lst[(len(prefix)):]
-
-    # root behavior:
-    #   --root=subdir , lstrips subdir from the header guard
-    maybe_path = StripListPrefix(PathSplitToList(file_path_from_root),
-                                 PathSplitToList(_root))
-
-    if _root_debug:
-      sys.stderr.write(("_root lstrip (maybe_path=%s, file_path_from_root=%s," +
-          " _root=%s)\n") % (maybe_path, file_path_from_root, _root))
-
-    if maybe_path:
-      return os.path.join(*maybe_path)
-
-    #   --root=.. , will prepend the outer directory to the header guard
-    full_path = fileinfo.FullName()
-    # adapt slashes for windows
-    root_abspath = os.path.abspath(_root).replace('\\', '/')
-
-    maybe_path = StripListPrefix(PathSplitToList(full_path),
-                                 PathSplitToList(root_abspath))
-
-    if _root_debug:
-      sys.stderr.write(("_root prepend (maybe_path=%s, full_path=%s, " +
-          "root_abspath=%s)\n") % (maybe_path, full_path, root_abspath))
-
-    if maybe_path:
-      return os.path.join(*maybe_path)
-
-    if _root_debug:
-      sys.stderr.write("_root ignore, returning %s\n" % (file_path_from_root))
-
-    #   --root=FAKE_DIR is ignored
-    return file_path_from_root
-
-  file_path_from_root = FixupPathFromRoot()
-  return re.sub(r'[^a-zA-Z0-9]', '_', file_path_from_root).upper() + '_'
-
-
-def CheckForHeaderGuard(filename, clean_lines, error):
-  """Checks that the file contains a header guard.
-
-  Logs an error if no #ifndef header guard is present.  For other
-  headers, checks that the full pathname is used.
-
-  Args:
-    filename: The name of the C++ header file.
-    clean_lines: A CleansedLines instance containing the file.
-    error: The function to call with any errors found.
-  """
-
-  # Don't check for header guards if there are error suppression
-  # comments somewhere in this file.
-  #
-  # Because this is silencing a warning for a nonexistent line, we
-  # only support the very specific NOLINT(build/header_guard) syntax,
-  # and not the general NOLINT or NOLINT(*) syntax.
-  raw_lines = clean_lines.lines_without_raw_strings
-  for i in raw_lines:
-    if Search(r'//\s*NOLINT\(build/header_guard\)', i):
-      return
-
-  # Allow pragma once instead of header guards
-  for i in raw_lines:
-    if Search(r'^\s*#pragma\s+once', i):
-      return
-
-  cppvar = GetHeaderGuardCPPVariable(filename)
-
-  ifndef = ''
-  ifndef_linenum = 0
-  define = ''
-  endif = ''
-  endif_linenum = 0
-  for linenum, line in enumerate(raw_lines):
-    linesplit = line.split()
-    if len(linesplit) >= 2:
-      # find the first occurrence of #ifndef and #define, save arg
-      if not ifndef and linesplit[0] == '#ifndef':
-        # set ifndef to the header guard presented on the #ifndef line.
-        ifndef = linesplit[1]
-        ifndef_linenum = linenum
-      if not define and linesplit[0] == '#define':
-        define = linesplit[1]
-    # find the last occurrence of #endif, save entire line
-    if line.startswith('#endif'):
-      endif = line
-      endif_linenum = linenum
-
-  if not ifndef or not define or ifndef != define:
-    error(filename, 0, 'build/header_guard', 5,
-          'No #ifndef header guard found, suggested CPP variable is: %s' %
-          cppvar)
-    return
-
-  # The guard should be PATH_FILE_H_, but we also allow PATH_FILE_H__
-  # for backward compatibility.
-  if ifndef != cppvar:
-    error_level = 0
-    if ifndef != cppvar + '_':
-      error_level = 5
-
-    ParseNolintSuppressions(filename, raw_lines[ifndef_linenum], ifndef_linenum,
-                            error)
-    error(filename, ifndef_linenum, 'build/header_guard', error_level,
-          '#ifndef header guard has wrong style, please use: %s' % cppvar)
-
-  # Check for "//" comments on endif line.
-  ParseNolintSuppressions(filename, raw_lines[endif_linenum], endif_linenum,
-                          error)
-  match = Match(r'#endif\s*//\s*' + cppvar + r'(_)?\b', endif)
-  if match:
-    if match.group(1) == '_':
-      # Issue low severity warning for deprecated double trailing underscore
-      error(filename, endif_linenum, 'build/header_guard', 0,
-            '#endif line should be "#endif  // %s"' % cppvar)
-    return
-
-  # Didn't find the corresponding "//" comment.  If this file does not
-  # contain any "//" comments at all, it could be that the compiler
-  # only wants "/**/" comments, look for those instead.
-  no_single_line_comments = True
-  for i in xrange(1, len(raw_lines) - 1):
-    line = raw_lines[i]
-    if Match(r'^(?:(?:\'(?:\.|[^\'])*\')|(?:"(?:\.|[^"])*")|[^\'"])*//', line):
-      no_single_line_comments = False
-      break
-
-  if no_single_line_comments:
-    match = Match(r'#endif\s*/\*\s*' + cppvar + r'(_)?\s*\*/', endif)
-    if match:
-      if match.group(1) == '_':
-        # Low severity warning for double trailing underscore
-        error(filename, endif_linenum, 'build/header_guard', 0,
-              '#endif line should be "#endif  /* %s */"' % cppvar)
-      return
-
-  # Didn't find anything
-  error(filename, endif_linenum, 'build/header_guard', 5,
-        '#endif line should be "#endif  // %s"' % cppvar)
-
-
-def CheckHeaderFileIncluded(filename, include_state, error):
-  """Logs an error if a source file does not include its header."""
-
-  # Do not check test files
-  fileinfo = FileInfo(filename)
-  if Search(_TEST_FILE_SUFFIX, fileinfo.BaseName()):
-    return
-
-  for ext in GetHeaderExtensions():
-    basefilename = filename[0:len(filename) - len(fileinfo.Extension())]
-    headerfile = basefilename + '.' + ext
-    if not os.path.exists(headerfile):
-      continue
-    headername = FileInfo(headerfile).RepositoryName()
-    first_include = None
-    include_uses_unix_dir_aliases = False
-    for section_list in include_state.include_list:
-      for f in section_list:
-        include_text = f[0]
-        if "./" in include_text:
-          include_uses_unix_dir_aliases = True
-        if headername in include_text or include_text in headername:
-          return
-        if not first_include:
-          first_include = f[1]
-
-    message = '%s should include its header file %s' % (fileinfo.RepositoryName(), headername)
-    if include_uses_unix_dir_aliases:
-      message += ". Relative paths like . and .. are not allowed."
-
-    error(filename, first_include, 'build/include', 5, message)
-
-
-def CheckForBadCharacters(filename, lines, error):
-  """Logs an error for each line containing bad characters.
-
-  Two kinds of bad characters:
-
-  1. Unicode replacement characters: These indicate that either the file
-  contained invalid UTF-8 (likely) or Unicode replacement characters (which
-  it shouldn't).  Note that it's possible for this to throw off line
-  numbering if the invalid UTF-8 occurred adjacent to a newline.
-
-  2. NUL bytes.  These are problematic for some tools.
-
-  Args:
-    filename: The name of the current file.
-    lines: An array of strings, each representing a line of the file.
-    error: The function to call with any errors found.
-  """
-  for linenum, line in enumerate(lines):
-    if unicode_escape_decode('\ufffd') in line:
-      error(filename, linenum, 'readability/utf8', 5,
-            'Line contains invalid UTF-8 (or Unicode replacement character).')
-    if '\0' in line:
-      error(filename, linenum, 'readability/nul', 5, 'Line contains NUL byte.')
-
-
-def CheckForNewlineAtEOF(filename, lines, error):
-  """Logs an error if there is no newline char at the end of the file.
-
-  Args:
-    filename: The name of the current file.
-    lines: An array of strings, each representing a line of the file.
-    error: The function to call with any errors found.
-  """
-
-  # The array lines() was created by adding two newlines to the
-  # original file (go figure), then splitting on \n.
-  # To verify that the file ends in \n, we just have to make sure the
-  # last-but-two element of lines() exists and is empty.
-  if len(lines) < 3 or lines[-2]:
-    error(filename, len(lines) - 2, 'whitespace/ending_newline', 5,
-          'Could not find a newline character at the end of the file.')
-
-
-def CheckForMultilineCommentsAndStrings(filename, clean_lines, linenum, error):
-  """Logs an error if we see /* ... */ or "..." that extend past one line.
-
-  /* ... */ comments are legit inside macros, for one line.
-  Otherwise, we prefer // comments, so it's ok to warn about the
-  other.  Likewise, it's ok for strings to extend across multiple
-  lines, as long as a line continuation character (backslash)
-  terminates each line. Although not currently prohibited by the C++
-  style guide, it's ugly and unnecessary. We don't do well with either
-  in this lint program, so we warn about both.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # Remove all \\ (escaped backslashes) from the line. They are OK, and the
-  # second (escaped) slash may trigger later \" detection erroneously.
-  line = line.replace('\\\\', '')
-
-  if line.count('/*') > line.count('*/'):
-    error(filename, linenum, 'readability/multiline_comment', 5,
-          'Complex multi-line /*...*/-style comment found. '
-          'Lint may give bogus warnings.  '
-          'Consider replacing these with //-style comments, '
-          'with #if 0...#endif, '
-          'or with more clearly structured multi-line comments.')
-
-  if (line.count('"') - line.count('\\"')) % 2:
-    error(filename, linenum, 'readability/multiline_string', 5,
-          'Multi-line string ("...") found.  This lint script doesn\'t '
-          'do well with such strings, and may give bogus warnings.  '
-          'Use C++11 raw strings or concatenation instead.')
-
-
-# (non-threadsafe name, thread-safe alternative, validation pattern)
-#
-# The validation pattern is used to eliminate false positives such as:
-#  _rand();               // false positive due to substring match.
-#  ->rand();              // some member function rand().
-#  ACMRandom rand(seed);  // some variable named rand.
-#  ISAACRandom rand();    // another variable named rand.
-#
-# Basically we require the return value of these functions to be used
-# in some expression context on the same line by matching on some
-# operator before the function name.  This eliminates constructors and
-# member function calls.
-_UNSAFE_FUNC_PREFIX = r'(?:[-+*/=%^&|(<]\s*|>\s+)'
-_THREADING_LIST = (
-    ('asctime(', 'asctime_r(', _UNSAFE_FUNC_PREFIX + r'asctime\([^)]+\)'),
-    ('ctime(', 'ctime_r(', _UNSAFE_FUNC_PREFIX + r'ctime\([^)]+\)'),
-    ('getgrgid(', 'getgrgid_r(', _UNSAFE_FUNC_PREFIX + r'getgrgid\([^)]+\)'),
-    ('getgrnam(', 'getgrnam_r(', _UNSAFE_FUNC_PREFIX + r'getgrnam\([^)]+\)'),
-    ('getlogin(', 'getlogin_r(', _UNSAFE_FUNC_PREFIX + r'getlogin\(\)'),
-    ('getpwnam(', 'getpwnam_r(', _UNSAFE_FUNC_PREFIX + r'getpwnam\([^)]+\)'),
-    ('getpwuid(', 'getpwuid_r(', _UNSAFE_FUNC_PREFIX + r'getpwuid\([^)]+\)'),
-    ('gmtime(', 'gmtime_r(', _UNSAFE_FUNC_PREFIX + r'gmtime\([^)]+\)'),
-    ('localtime(', 'localtime_r(', _UNSAFE_FUNC_PREFIX + r'localtime\([^)]+\)'),
-    ('rand(', 'rand_r(', _UNSAFE_FUNC_PREFIX + r'rand\(\)'),
-    ('strtok(', 'strtok_r(',
-     _UNSAFE_FUNC_PREFIX + r'strtok\([^)]+\)'),
-    ('ttyname(', 'ttyname_r(', _UNSAFE_FUNC_PREFIX + r'ttyname\([^)]+\)'),
-    )
-
-
-def CheckPosixThreading(filename, clean_lines, linenum, error):
-  """Checks for calls to thread-unsafe functions.
-
-  Much code has been originally written without consideration of
-  multi-threading. Also, engineers are relying on their old experience;
-  they have learned posix before threading extensions were added. These
-  tests guide the engineers to use thread-safe functions (when using
-  posix directly).
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-  for single_thread_func, multithread_safe_func, pattern in _THREADING_LIST:
-    # Additional pattern matching check to confirm that this is the
-    # function we are looking for
-    if Search(pattern, line):
-      error(filename, linenum, 'runtime/threadsafe_fn', 2,
-            'Consider using ' + multithread_safe_func +
-            '...) instead of ' + single_thread_func +
-            '...) for improved thread safety.')
-
-
-def CheckVlogArguments(filename, clean_lines, linenum, error):
-  """Checks that VLOG() is only used for defining a logging level.
-
-  For example, VLOG(2) is correct. VLOG(INFO), VLOG(WARNING), VLOG(ERROR), and
-  VLOG(FATAL) are not.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-  if Search(r'\bVLOG\((INFO|ERROR|WARNING|DFATAL|FATAL)\)', line):
-    error(filename, linenum, 'runtime/vlog', 5,
-          'VLOG() should be used with numeric verbosity level.  '
-          'Use LOG() if you want symbolic severity levels.')
-
-# Matches invalid increment: *count++, which moves pointer instead of
-# incrementing a value.
-_RE_PATTERN_INVALID_INCREMENT = re.compile(
-    r'^\s*\*\w+(\+\+|--);')
-
-
-def CheckInvalidIncrement(filename, clean_lines, linenum, error):
-  """Checks for invalid increment *count++.
-
-  For example following function:
-  void increment_counter(int* count) {
-    *count++;
-  }
-  is invalid, because it effectively does count++, moving pointer, and should
-  be replaced with ++*count, (*count)++ or *count += 1.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-  if _RE_PATTERN_INVALID_INCREMENT.match(line):
-    error(filename, linenum, 'runtime/invalid_increment', 5,
-          'Changing pointer instead of value (or unused value of operator*).')
-
-
-def IsMacroDefinition(clean_lines, linenum):
-  if Search(r'^#define', clean_lines[linenum]):
-    return True
-
-  if linenum > 0 and Search(r'\\$', clean_lines[linenum - 1]):
-    return True
-
-  return False
-
-
-def IsForwardClassDeclaration(clean_lines, linenum):
-  return Match(r'^\s*(\btemplate\b)*.*class\s+\w+;\s*$', clean_lines[linenum])
-
-
-class _BlockInfo(object):
-  """Stores information about a generic block of code."""
-
-  def __init__(self, linenum, seen_open_brace):
-    self.starting_linenum = linenum
-    self.seen_open_brace = seen_open_brace
-    self.open_parentheses = 0
-    self.inline_asm = _NO_ASM
-    self.check_namespace_indentation = False
-
-  def CheckBegin(self, filename, clean_lines, linenum, error):
-    """Run checks that applies to text up to the opening brace.
-
-    This is mostly for checking the text after the class identifier
-    and the "{", usually where the base class is specified.  For other
-    blocks, there isn't much to check, so we always pass.
-
-    Args:
-      filename: The name of the current file.
-      clean_lines: A CleansedLines instance containing the file.
-      linenum: The number of the line to check.
-      error: The function to call with any errors found.
-    """
-    pass
-
-  def CheckEnd(self, filename, clean_lines, linenum, error):
-    """Run checks that applies to text after the closing brace.
-
-    This is mostly used for checking end of namespace comments.
-
-    Args:
-      filename: The name of the current file.
-      clean_lines: A CleansedLines instance containing the file.
-      linenum: The number of the line to check.
-      error: The function to call with any errors found.
-    """
-    pass
-
-  def IsBlockInfo(self):
-    """Returns true if this block is a _BlockInfo.
-
-    This is convenient for verifying that an object is an instance of
-    a _BlockInfo, but not an instance of any of the derived classes.
-
-    Returns:
-      True for this class, False for derived classes.
-    """
-    return self.__class__ == _BlockInfo
-
-
-class _ExternCInfo(_BlockInfo):
-  """Stores information about an 'extern "C"' block."""
-
-  def __init__(self, linenum):
-    _BlockInfo.__init__(self, linenum, True)
-
-
-class _ClassInfo(_BlockInfo):
-  """Stores information about a class."""
-
-  def __init__(self, name, class_or_struct, clean_lines, linenum):
-    _BlockInfo.__init__(self, linenum, False)
-    self.name = name
-    self.is_derived = False
-    self.check_namespace_indentation = True
-    if class_or_struct == 'struct':
-      self.access = 'public'
-      self.is_struct = True
-    else:
-      self.access = 'private'
-      self.is_struct = False
-
-    # Remember initial indentation level for this class.  Using raw_lines here
-    # instead of elided to account for leading comments.
-    self.class_indent = GetIndentLevel(clean_lines.raw_lines[linenum])
-
-    # Try to find the end of the class.  This will be confused by things like:
-    #   class A {
-    #   } *x = { ...
-    #
-    # But it's still good enough for CheckSectionSpacing.
-    self.last_line = 0
-    depth = 0
-    for i in range(linenum, clean_lines.NumLines()):
-      line = clean_lines.elided[i]
-      depth += line.count('{') - line.count('}')
-      if not depth:
-        self.last_line = i
-        break
-
-  def CheckBegin(self, filename, clean_lines, linenum, error):
-    # Look for a bare ':'
-    if Search('(^|[^:]):($|[^:])', clean_lines.elided[linenum]):
-      self.is_derived = True
-
-  def CheckEnd(self, filename, clean_lines, linenum, error):
-    # If there is a DISALLOW macro, it should appear near the end of
-    # the class.
-    seen_last_thing_in_class = False
-    for i in xrange(linenum - 1, self.starting_linenum, -1):
-      match = Search(
-          r'\b(DISALLOW_COPY_AND_ASSIGN|DISALLOW_IMPLICIT_CONSTRUCTORS)\(' +
-          self.name + r'\)',
-          clean_lines.elided[i])
-      if match:
-        if seen_last_thing_in_class:
-          error(filename, i, 'readability/constructors', 3,
-                match.group(1) + ' should be the last thing in the class')
-        break
-
-      if not Match(r'^\s*$', clean_lines.elided[i]):
-        seen_last_thing_in_class = True
-
-    # Check that closing brace is aligned with beginning of the class.
-    # Only do this if the closing brace is indented by only whitespaces.
-    # This means we will not check single-line class definitions.
-    indent = Match(r'^( *)\}', clean_lines.elided[linenum])
-    if indent and len(indent.group(1)) != self.class_indent:
-      if self.is_struct:
-        parent = 'struct ' + self.name
-      else:
-        parent = 'class ' + self.name
-      error(filename, linenum, 'whitespace/indent', 3,
-            'Closing brace should be aligned with beginning of %s' % parent)
-
-
-class _NamespaceInfo(_BlockInfo):
-  """Stores information about a namespace."""
-
-  def __init__(self, name, linenum):
-    _BlockInfo.__init__(self, linenum, False)
-    self.name = name or ''
-    self.check_namespace_indentation = True
-
-  def CheckEnd(self, filename, clean_lines, linenum, error):
-    """Check end of namespace comments."""
-    line = clean_lines.raw_lines[linenum]
-
-    # Check how many lines is enclosed in this namespace.  Don't issue
-    # warning for missing namespace comments if there aren't enough
-    # lines.  However, do apply checks if there is already an end of
-    # namespace comment and it's incorrect.
-    #
-    # TODO(unknown): We always want to check end of namespace comments
-    # if a namespace is large, but sometimes we also want to apply the
-    # check if a short namespace contained nontrivial things (something
-    # other than forward declarations).  There is currently no logic on
-    # deciding what these nontrivial things are, so this check is
-    # triggered by namespace size only, which works most of the time.
-    if (linenum - self.starting_linenum < 10
-        and not Match(r'^\s*};*\s*(//|/\*).*\bnamespace\b', line)):
-      return
-
-    # Look for matching comment at end of namespace.
-    #
-    # Note that we accept C style "/* */" comments for terminating
-    # namespaces, so that code that terminate namespaces inside
-    # preprocessor macros can be cpplint clean.
-    #
-    # We also accept stuff like "// end of namespace <name>." with the
-    # period at the end.
-    #
-    # Besides these, we don't accept anything else, otherwise we might
-    # get false negatives when existing comment is a substring of the
-    # expected namespace.
-    if self.name:
-      # Named namespace
-      if not Match((r'^\s*};*\s*(//|/\*).*\bnamespace\s+' +
-                    re.escape(self.name) + r'[\*/\.\\\s]*$'),
-                   line):
-        error(filename, linenum, 'readability/namespace', 5,
-              'Namespace should be terminated with "// namespace %s"' %
-              self.name)
-    else:
-      # Anonymous namespace
-      if not Match(r'^\s*};*\s*(//|/\*).*\bnamespace[\*/\.\\\s]*$', line):
-        # If "// namespace anonymous" or "// anonymous namespace (more text)",
-        # mention "// anonymous namespace" as an acceptable form
-        if Match(r'^\s*}.*\b(namespace anonymous|anonymous namespace)\b', line):
-          error(filename, linenum, 'readability/namespace', 5,
-                'Anonymous namespace should be terminated with "// namespace"'
-                ' or "// anonymous namespace"')
-        else:
-          error(filename, linenum, 'readability/namespace', 5,
-                'Anonymous namespace should be terminated with "// namespace"')
-
-
-class _PreprocessorInfo(object):
-  """Stores checkpoints of nesting stacks when #if/#else is seen."""
-
-  def __init__(self, stack_before_if):
-    # The entire nesting stack before #if
-    self.stack_before_if = stack_before_if
-
-    # The entire nesting stack up to #else
-    self.stack_before_else = []
-
-    # Whether we have already seen #else or #elif
-    self.seen_else = False
-
-
-class NestingState(object):
-  """Holds states related to parsing braces."""
-
-  def __init__(self):
-    # Stack for tracking all braces.  An object is pushed whenever we
-    # see a "{", and popped when we see a "}".  Only 3 types of
-    # objects are possible:
-    # - _ClassInfo: a class or struct.
-    # - _NamespaceInfo: a namespace.
-    # - _BlockInfo: some other type of block.
-    self.stack = []
-
-    # Top of the previous stack before each Update().
-    #
-    # Because the nesting_stack is updated at the end of each line, we
-    # had to do some convoluted checks to find out what is the current
-    # scope at the beginning of the line.  This check is simplified by
-    # saving the previous top of nesting stack.
-    #
-    # We could save the full stack, but we only need the top.  Copying
-    # the full nesting stack would slow down cpplint by ~10%.
-    self.previous_stack_top = []
-
-    # Stack of _PreprocessorInfo objects.
-    self.pp_stack = []
-
-  def SeenOpenBrace(self):
-    """Check if we have seen the opening brace for the innermost block.
-
-    Returns:
-      True if we have seen the opening brace, False if the innermost
-      block is still expecting an opening brace.
-    """
-    return (not self.stack) or self.stack[-1].seen_open_brace
-
-  def InNamespaceBody(self):
-    """Check if we are currently one level inside a namespace body.
-
-    Returns:
-      True if top of the stack is a namespace block, False otherwise.
-    """
-    return self.stack and isinstance(self.stack[-1], _NamespaceInfo)
-
-  def InExternC(self):
-    """Check if we are currently one level inside an 'extern "C"' block.
-
-    Returns:
-      True if top of the stack is an extern block, False otherwise.
-    """
-    return self.stack and isinstance(self.stack[-1], _ExternCInfo)
-
-  def InClassDeclaration(self):
-    """Check if we are currently one level inside a class or struct declaration.
-
-    Returns:
-      True if top of the stack is a class/struct, False otherwise.
-    """
-    return self.stack and isinstance(self.stack[-1], _ClassInfo)
-
-  def InAsmBlock(self):
-    """Check if we are currently one level inside an inline ASM block.
-
-    Returns:
-      True if the top of the stack is a block containing inline ASM.
-    """
-    return self.stack and self.stack[-1].inline_asm != _NO_ASM
-
-  def InTemplateArgumentList(self, clean_lines, linenum, pos):
-    """Check if current position is inside template argument list.
-
-    Args:
-      clean_lines: A CleansedLines instance containing the file.
-      linenum: The number of the line to check.
-      pos: position just after the suspected template argument.
-    Returns:
-      True if (linenum, pos) is inside template arguments.
-    """
-    while linenum < clean_lines.NumLines():
-      # Find the earliest character that might indicate a template argument
-      line = clean_lines.elided[linenum]
-      match = Match(r'^[^{};=\[\]\.<>]*(.)', line[pos:])
-      if not match:
-        linenum += 1
-        pos = 0
-        continue
-      token = match.group(1)
-      pos += len(match.group(0))
-
-      # These things do not look like template argument list:
-      #   class Suspect {
-      #   class Suspect x; }
-      if token in ('{', '}', ';'): return False
-
-      # These things look like template argument list:
-      #   template <class Suspect>
-      #   template <class Suspect = default_value>
-      #   template <class Suspect[]>
-      #   template <class Suspect...>
-      if token in ('>', '=', '[', ']', '.'): return True
-
-      # Check if token is an unmatched '<'.
-      # If not, move on to the next character.
-      if token != '<':
-        pos += 1
-        if pos >= len(line):
-          linenum += 1
-          pos = 0
-        continue
-
-      # We can't be sure if we just find a single '<', and need to
-      # find the matching '>'.
-      (_, end_line, end_pos) = CloseExpression(clean_lines, linenum, pos - 1)
-      if end_pos < 0:
-        # Not sure if template argument list or syntax error in file
-        return False
-      linenum = end_line
-      pos = end_pos
-    return False
-
-  def UpdatePreprocessor(self, line):
-    """Update preprocessor stack.
-
-    We need to handle preprocessors due to classes like this:
-      #ifdef SWIG
-      struct ResultDetailsPageElementExtensionPoint {
-      #else
-      struct ResultDetailsPageElementExtensionPoint : public Extension {
-      #endif
-
-    We make the following assumptions (good enough for most files):
-    - Preprocessor condition evaluates to true from #if up to first
-      #else/#elif/#endif.
-
-    - Preprocessor condition evaluates to false from #else/#elif up
-      to #endif.  We still perform lint checks on these lines, but
-      these do not affect nesting stack.
-
-    Args:
-      line: current line to check.
-    """
-    if Match(r'^\s*#\s*(if|ifdef|ifndef)\b', line):
-      # Beginning of #if block, save the nesting stack here.  The saved
-      # stack will allow us to restore the parsing state in the #else case.
-      self.pp_stack.append(_PreprocessorInfo(copy.deepcopy(self.stack)))
-    elif Match(r'^\s*#\s*(else|elif)\b', line):
-      # Beginning of #else block
-      if self.pp_stack:
-        if not self.pp_stack[-1].seen_else:
-          # This is the first #else or #elif block.  Remember the
-          # whole nesting stack up to this point.  This is what we
-          # keep after the #endif.
-          self.pp_stack[-1].seen_else = True
-          self.pp_stack[-1].stack_before_else = copy.deepcopy(self.stack)
-
-        # Restore the stack to how it was before the #if
-        self.stack = copy.deepcopy(self.pp_stack[-1].stack_before_if)
-      else:
-        # TODO(unknown): unexpected #else, issue warning?
-        pass
-    elif Match(r'^\s*#\s*endif\b', line):
-      # End of #if or #else blocks.
-      if self.pp_stack:
-        # If we saw an #else, we will need to restore the nesting
-        # stack to its former state before the #else, otherwise we
-        # will just continue from where we left off.
-        if self.pp_stack[-1].seen_else:
-          # Here we can just use a shallow copy since we are the last
-          # reference to it.
-          self.stack = self.pp_stack[-1].stack_before_else
-        # Drop the corresponding #if
-        self.pp_stack.pop()
-      else:
-        # TODO(unknown): unexpected #endif, issue warning?
-        pass
-
-  # TODO(unknown): Update() is too long, but we will refactor later.
-  def Update(self, filename, clean_lines, linenum, error):
-    """Update nesting state with current line.
-
-    Args:
-      filename: The name of the current file.
-      clean_lines: A CleansedLines instance containing the file.
-      linenum: The number of the line to check.
-      error: The function to call with any errors found.
-    """
-    line = clean_lines.elided[linenum]
-
-    # Remember top of the previous nesting stack.
-    #
-    # The stack is always pushed/popped and not modified in place, so
-    # we can just do a shallow copy instead of copy.deepcopy.  Using
-    # deepcopy would slow down cpplint by ~28%.
-    if self.stack:
-      self.previous_stack_top = self.stack[-1]
-    else:
-      self.previous_stack_top = None
-
-    # Update pp_stack
-    self.UpdatePreprocessor(line)
-
-    # Count parentheses.  This is to avoid adding struct arguments to
-    # the nesting stack.
-    if self.stack:
-      inner_block = self.stack[-1]
-      depth_change = line.count('(') - line.count(')')
-      inner_block.open_parentheses += depth_change
-
-      # Also check if we are starting or ending an inline assembly block.
-      if inner_block.inline_asm in (_NO_ASM, _END_ASM):
-        if (depth_change != 0 and
-            inner_block.open_parentheses == 1 and
-            _MATCH_ASM.match(line)):
-          # Enter assembly block
-          inner_block.inline_asm = _INSIDE_ASM
-        else:
-          # Not entering assembly block.  If previous line was _END_ASM,
-          # we will now shift to _NO_ASM state.
-          inner_block.inline_asm = _NO_ASM
-      elif (inner_block.inline_asm == _INSIDE_ASM and
-            inner_block.open_parentheses == 0):
-        # Exit assembly block
-        inner_block.inline_asm = _END_ASM
-
-    # Consume namespace declaration at the beginning of the line.  Do
-    # this in a loop so that we catch same line declarations like this:
-    #   namespace proto2 { namespace bridge { class MessageSet; } }
-    while True:
-      # Match start of namespace.  The "\b\s*" below catches namespace
-      # declarations even if it weren't followed by a whitespace, this
-      # is so that we don't confuse our namespace checker.  The
-      # missing spaces will be flagged by CheckSpacing.
-      namespace_decl_match = Match(r'^\s*namespace\b\s*([:\w]+)?(.*)$', line)
-      if not namespace_decl_match:
-        break
-
-      new_namespace = _NamespaceInfo(namespace_decl_match.group(1), linenum)
-      self.stack.append(new_namespace)
-
-      line = namespace_decl_match.group(2)
-      if line.find('{') != -1:
-        new_namespace.seen_open_brace = True
-        line = line[line.find('{') + 1:]
-
-    # Look for a class declaration in whatever is left of the line
-    # after parsing namespaces.  The regexp accounts for decorated classes
-    # such as in:
-    #   class LOCKABLE API Object {
-    #   };
-    class_decl_match = Match(
-        r'^(\s*(?:template\s*<[\w\s<>,:=]*>\s*)?'
-        r'(class|struct)\s+(?:[a-zA-Z0-9_]+\s+)*(\w+(?:::\w+)*))'
-        r'(.*)$', line)
-    if (class_decl_match and
-        (not self.stack or self.stack[-1].open_parentheses == 0)):
-      # We do not want to accept classes that are actually template arguments:
-      #   template <class Ignore1,
-      #             class Ignore2 = Default<Args>,
-      #             template <Args> class Ignore3>
-      #   void Function() {};
-      #
-      # To avoid template argument cases, we scan forward and look for
-      # an unmatched '>'.  If we see one, assume we are inside a
-      # template argument list.
-      end_declaration = len(class_decl_match.group(1))
-      if not self.InTemplateArgumentList(clean_lines, linenum, end_declaration):
-        self.stack.append(_ClassInfo(
-            class_decl_match.group(3), class_decl_match.group(2),
-            clean_lines, linenum))
-        line = class_decl_match.group(4)
-
-    # If we have not yet seen the opening brace for the innermost block,
-    # run checks here.
-    if not self.SeenOpenBrace():
-      self.stack[-1].CheckBegin(filename, clean_lines, linenum, error)
-
-    # Update access control if we are inside a class/struct
-    if self.stack and isinstance(self.stack[-1], _ClassInfo):
-      classinfo = self.stack[-1]
-      access_match = Match(
-          r'^(.*)\b(public|private|protected|signals)(\s+(?:slots\s*)?)?'
-          r':(?:[^:]|$)',
-          line)
-      if access_match:
-        classinfo.access = access_match.group(2)
-
-        # Check that access keywords are indented +1 space.  Skip this
-        # check if the keywords are not preceded by whitespaces.
-        indent = access_match.group(1)
-        if (len(indent) != classinfo.class_indent + 1 and
-            Match(r'^\s*$', indent)):
-          if classinfo.is_struct:
-            parent = 'struct ' + classinfo.name
-          else:
-            parent = 'class ' + classinfo.name
-          slots = ''
-          if access_match.group(3):
-            slots = access_match.group(3)
-          error(filename, linenum, 'whitespace/indent', 3,
-                '%s%s: should be indented +1 space inside %s' % (
-                    access_match.group(2), slots, parent))
-
-    # Consume braces or semicolons from what's left of the line
-    while True:
-      # Match first brace, semicolon, or closed parenthesis.
-      matched = Match(r'^[^{;)}]*([{;)}])(.*)$', line)
-      if not matched:
-        break
-
-      token = matched.group(1)
-      if token == '{':
-        # If namespace or class hasn't seen a opening brace yet, mark
-        # namespace/class head as complete.  Push a new block onto the
-        # stack otherwise.
-        if not self.SeenOpenBrace():
-          self.stack[-1].seen_open_brace = True
-        elif Match(r'^extern\s*"[^"]*"\s*\{', line):
-          self.stack.append(_ExternCInfo(linenum))
-        else:
-          self.stack.append(_BlockInfo(linenum, True))
-          if _MATCH_ASM.match(line):
-            self.stack[-1].inline_asm = _BLOCK_ASM
-
-      elif token == ';' or token == ')':
-        # If we haven't seen an opening brace yet, but we already saw
-        # a semicolon, this is probably a forward declaration.  Pop
-        # the stack for these.
-        #
-        # Similarly, if we haven't seen an opening brace yet, but we
-        # already saw a closing parenthesis, then these are probably
-        # function arguments with extra "class" or "struct" keywords.
-        # Also pop these stack for these.
-        if not self.SeenOpenBrace():
-          self.stack.pop()
-      else:  # token == '}'
-        # Perform end of block checks and pop the stack.
-        if self.stack:
-          self.stack[-1].CheckEnd(filename, clean_lines, linenum, error)
-          self.stack.pop()
-      line = matched.group(2)
-
-  def InnermostClass(self):
-    """Get class info on the top of the stack.
-
-    Returns:
-      A _ClassInfo object if we are inside a class, or None otherwise.
-    """
-    for i in range(len(self.stack), 0, -1):
-      classinfo = self.stack[i - 1]
-      if isinstance(classinfo, _ClassInfo):
-        return classinfo
-    return None
-
-  def CheckCompletedBlocks(self, filename, error):
-    """Checks that all classes and namespaces have been completely parsed.
-
-    Call this when all lines in a file have been processed.
-    Args:
-      filename: The name of the current file.
-      error: The function to call with any errors found.
-    """
-    # Note: This test can result in false positives if #ifdef constructs
-    # get in the way of brace matching. See the testBuildClass test in
-    # cpplint_unittest.py for an example of this.
-    for obj in self.stack:
-      if isinstance(obj, _ClassInfo):
-        error(filename, obj.starting_linenum, 'build/class', 5,
-              'Failed to find complete declaration of class %s' %
-              obj.name)
-      elif isinstance(obj, _NamespaceInfo):
-        error(filename, obj.starting_linenum, 'build/namespaces', 5,
-              'Failed to find complete declaration of namespace %s' %
-              obj.name)
-
-
-def CheckForNonStandardConstructs(filename, clean_lines, linenum,
-                                  nesting_state, error):
-  r"""Logs an error if we see certain non-ANSI constructs ignored by gcc-2.
-
-  Complain about several constructs which gcc-2 accepts, but which are
-  not standard C++.  Warning about these in lint is one way to ease the
-  transition to new compilers.
-  - put storage class first (e.g. "static const" instead of "const static").
-  - "%lld" instead of %qd" in printf-type functions.
-  - "%1$d" is non-standard in printf-type functions.
-  - "\%" is an undefined character escape sequence.
-  - text after #endif is not allowed.
-  - invalid inner-style forward declaration.
-  - >? and <? operators, and their >?= and <?= cousins.
-
-  Additionally, check for constructor/destructor style violations and reference
-  members, as it is very convenient to do so while checking for
-  gcc-2 compliance.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    error: A callable to which errors are reported, which takes 4 arguments:
-           filename, line number, error level, and message
-  """
-
-  # Remove comments from the line, but leave in strings for now.
-  line = clean_lines.lines[linenum]
-
-  if Search(r'printf\s*\(.*".*%[-+ ]?\d*q', line):
-    error(filename, linenum, 'runtime/printf_format', 3,
-          '%q in format strings is deprecated.  Use %ll instead.')
-
-  if Search(r'printf\s*\(.*".*%\d+\$', line):
-    error(filename, linenum, 'runtime/printf_format', 2,
-          '%N$ formats are unconventional.  Try rewriting to avoid them.')
-
-  # Remove escaped backslashes before looking for undefined escapes.
-  line = line.replace('\\\\', '')
-
-  if Search(r'("|\').*\\(%|\[|\(|{)', line):
-    error(filename, linenum, 'build/printf_format', 3,
-          '%, [, (, and { are undefined character escapes.  Unescape them.')
-
-  # For the rest, work with both comments and strings removed.
-  line = clean_lines.elided[linenum]
-
-  if Search(r'\b(const|volatile|void|char|short|int|long'
-            r'|float|double|signed|unsigned'
-            r'|schar|u?int8|u?int16|u?int32|u?int64)'
-            r'\s+(register|static|extern|typedef)\b',
-            line):
-    error(filename, linenum, 'build/storage_class', 5,
-          'Storage-class specifier (static, extern, typedef, etc) should be '
-          'at the beginning of the declaration.')
-
-  if Match(r'\s*#\s*endif\s*[^/\s]+', line):
-    error(filename, linenum, 'build/endif_comment', 5,
-          'Uncommented text after #endif is non-standard.  Use a comment.')
-
-  if Match(r'\s*class\s+(\w+\s*::\s*)+\w+\s*;', line):
-    error(filename, linenum, 'build/forward_decl', 5,
-          'Inner-style forward declarations are invalid.  Remove this line.')
-
-  if Search(r'(\w+|[+-]?\d+(\.\d*)?)\s*(<|>)\?=?\s*(\w+|[+-]?\d+)(\.\d*)?',
-            line):
-    error(filename, linenum, 'build/deprecated', 3,
-          '>? and <? (max and min) operators are non-standard and deprecated.')
-
-  if Search(r'^\s*const\s*string\s*&\s*\w+\s*;', line):
-    # TODO(unknown): Could it be expanded safely to arbitrary references,
-    # without triggering too many false positives? The first
-    # attempt triggered 5 warnings for mostly benign code in the regtest, hence
-    # the restriction.
-    # Here's the original regexp, for the reference:
-    # type_name = r'\w+((\s*::\s*\w+)|(\s*<\s*\w+?\s*>))?'
-    # r'\s*const\s*' + type_name + '\s*&\s*\w+\s*;'
-    error(filename, linenum, 'runtime/member_string_references', 2,
-          'const string& members are dangerous. It is much better to use '
-          'alternatives, such as pointers or simple constants.')
-
-  # Everything else in this function operates on class declarations.
-  # Return early if the top of the nesting stack is not a class, or if
-  # the class head is not completed yet.
-  classinfo = nesting_state.InnermostClass()
-  if not classinfo or not classinfo.seen_open_brace:
-    return
-
-  # The class may have been declared with namespace or classname qualifiers.
-  # The constructor and destructor will not have those qualifiers.
-  base_classname = classinfo.name.split('::')[-1]
-
-  # Look for single-argument constructors that aren't marked explicit.
-  # Technically a valid construct, but against style.
-  explicit_constructor_match = Match(
-      r'\s+(?:(?:inline|constexpr)\s+)*(explicit\s+)?'
-      r'(?:(?:inline|constexpr)\s+)*%s\s*'
-      r'\(((?:[^()]|\([^()]*\))*)\)'
-      % re.escape(base_classname),
-      line)
-
-  if explicit_constructor_match:
-    is_marked_explicit = explicit_constructor_match.group(1)
-
-    if not explicit_constructor_match.group(2):
-      constructor_args = []
-    else:
-      constructor_args = explicit_constructor_match.group(2).split(',')
-
-    # collapse arguments so that commas in template parameter lists and function
-    # argument parameter lists don't split arguments in two
-    i = 0
-    while i < len(constructor_args):
-      constructor_arg = constructor_args[i]
-      while (constructor_arg.count('<') > constructor_arg.count('>') or
-             constructor_arg.count('(') > constructor_arg.count(')')):
-        constructor_arg += ',' + constructor_args[i + 1]
-        del constructor_args[i + 1]
-      constructor_args[i] = constructor_arg
-      i += 1
-
-    variadic_args = [arg for arg in constructor_args if '&&...' in arg]
-    defaulted_args = [arg for arg in constructor_args if '=' in arg]
-    noarg_constructor = (not constructor_args or  # empty arg list
-                         # 'void' arg specifier
-                         (len(constructor_args) == 1 and
-                          constructor_args[0].strip() == 'void'))
-    onearg_constructor = ((len(constructor_args) == 1 and  # exactly one arg
-                           not noarg_constructor) or
-                          # all but at most one arg defaulted
-                          (len(constructor_args) >= 1 and
-                           not noarg_constructor and
-                           len(defaulted_args) >= len(constructor_args) - 1) or
-                          # variadic arguments with zero or one argument
-                          (len(constructor_args) <= 2 and
-                           len(variadic_args) >= 1))
-    initializer_list_constructor = bool(
-        onearg_constructor and
-        Search(r'\bstd\s*::\s*initializer_list\b', constructor_args[0]))
-    copy_constructor = bool(
-        onearg_constructor and
-        Match(r'((const\s+(volatile\s+)?)?|(volatile\s+(const\s+)?))?'
-              r'%s(\s*<[^>]*>)?(\s+const)?\s*(?:<\w+>\s*)?&'
-              % re.escape(base_classname), constructor_args[0].strip()))
-
-    if (not is_marked_explicit and
-        onearg_constructor and
-        not initializer_list_constructor and
-        not copy_constructor):
-      if defaulted_args or variadic_args:
-        error(filename, linenum, 'runtime/explicit', 5,
-              'Constructors callable with one argument '
-              'should be marked explicit.')
-      else:
-        error(filename, linenum, 'runtime/explicit', 5,
-              'Single-parameter constructors should be marked explicit.')
-    elif is_marked_explicit and not onearg_constructor:
-      if noarg_constructor:
-        error(filename, linenum, 'runtime/explicit', 5,
-              'Zero-parameter constructors should not be marked explicit.')
-
-
-def CheckSpacingForFunctionCall(filename, clean_lines, linenum, error):
-  """Checks for the correctness of various spacing around function calls.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # Since function calls often occur inside if/for/while/switch
-  # expressions - which have their own, more liberal conventions - we
-  # first see if we should be looking inside such an expression for a
-  # function call, to which we can apply more strict standards.
-  fncall = line    # if there's no control flow construct, look at whole line
-  for pattern in (r'\bif\s*\((.*)\)\s*{',
-                  r'\bfor\s*\((.*)\)\s*{',
-                  r'\bwhile\s*\((.*)\)\s*[{;]',
-                  r'\bswitch\s*\((.*)\)\s*{'):
-    match = Search(pattern, line)
-    if match:
-      fncall = match.group(1)    # look inside the parens for function calls
-      break
-
-  # Except in if/for/while/switch, there should never be space
-  # immediately inside parens (eg "f( 3, 4 )").  We make an exception
-  # for nested parens ( (a+b) + c ).  Likewise, there should never be
-  # a space before a ( when it's a function argument.  I assume it's a
-  # function argument when the char before the whitespace is legal in
-  # a function name (alnum + _) and we're not starting a macro. Also ignore
-  # pointers and references to arrays and functions coz they're too tricky:
-  # we use a very simple way to recognize these:
-  # " (something)(maybe-something)" or
-  # " (something)(maybe-something," or
-  # " (something)[something]"
-  # Note that we assume the contents of [] to be short enough that
-  # they'll never need to wrap.
-  if (  # Ignore control structures.
-      not Search(r'\b(if|for|while|switch|return|new|delete|catch|sizeof)\b',
-                 fncall) and
-      # Ignore pointers/references to functions.
-      not Search(r' \([^)]+\)\([^)]*(\)|,$)', fncall) and
-      # Ignore pointers/references to arrays.
-      not Search(r' \([^)]+\)\[[^\]]+\]', fncall)):
-    if Search(r'\w\s*\(\s(?!\s*\\$)', fncall):      # a ( used for a fn call
-      error(filename, linenum, 'whitespace/parens', 4,
-            'Extra space after ( in function call')
-    elif Search(r'\(\s+(?!(\s*\\)|\()', fncall):
-      error(filename, linenum, 'whitespace/parens', 2,
-            'Extra space after (')
-    if (Search(r'\w\s+\(', fncall) and
-        not Search(r'_{0,2}asm_{0,2}\s+_{0,2}volatile_{0,2}\s+\(', fncall) and
-        not Search(r'#\s*define|typedef|using\s+\w+\s*=', fncall) and
-        not Search(r'\w\s+\((\w+::)*\*\w+\)\(', fncall) and
-        not Search(r'\bcase\s+\(', fncall)):
-      # TODO(unknown): Space after an operator function seem to be a common
-      # error, silence those for now by restricting them to highest verbosity.
-      if Search(r'\boperator_*\b', line):
-        error(filename, linenum, 'whitespace/parens', 0,
-              'Extra space before ( in function call')
-      else:
-        error(filename, linenum, 'whitespace/parens', 4,
-              'Extra space before ( in function call')
-    # If the ) is followed only by a newline or a { + newline, assume it's
-    # part of a control statement (if/while/etc), and don't complain
-    if Search(r'[^)]\s+\)\s*[^{\s]', fncall):
-      # If the closing parenthesis is preceded by only whitespaces,
-      # try to give a more descriptive error message.
-      if Search(r'^\s+\)', fncall):
-        error(filename, linenum, 'whitespace/parens', 2,
-              'Closing ) should be moved to the previous line')
-      else:
-        error(filename, linenum, 'whitespace/parens', 2,
-              'Extra space before )')
-
-
-def IsBlankLine(line):
-  """Returns true if the given line is blank.
-
-  We consider a line to be blank if the line is empty or consists of
-  only white spaces.
-
-  Args:
-    line: A line of a string.
-
-  Returns:
-    True, if the given line is blank.
-  """
-  return not line or line.isspace()
-
-
-def CheckForNamespaceIndentation(filename, nesting_state, clean_lines, line,
-                                 error):
-  is_namespace_indent_item = (
-      len(nesting_state.stack) > 1 and
-      nesting_state.stack[-1].check_namespace_indentation and
-      isinstance(nesting_state.previous_stack_top, _NamespaceInfo) and
-      nesting_state.previous_stack_top == nesting_state.stack[-2])
-
-  if ShouldCheckNamespaceIndentation(nesting_state, is_namespace_indent_item,
-                                     clean_lines.elided, line):
-    CheckItemIndentationInNamespace(filename, clean_lines.elided,
-                                    line, error)
-
-
-def CheckForFunctionLengths(filename, clean_lines, linenum,
-                            function_state, error):
-  """Reports for long function bodies.
-
-  For an overview why this is done, see:
-  https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Write_Short_Functions
-
-  Uses a simplistic algorithm assuming other style guidelines
-  (especially spacing) are followed.
-  Only checks unindented functions, so class members are unchecked.
-  Trivial bodies are unchecked, so constructors with huge initializer lists
-  may be missed.
-  Blank/comment lines are not counted so as to avoid encouraging the removal
-  of vertical space and comments just to get through a lint check.
-  NOLINT *on the last line of a function* disables this check.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    function_state: Current function name and lines in body so far.
-    error: The function to call with any errors found.
-  """
-  lines = clean_lines.lines
-  line = lines[linenum]
-  joined_line = ''
-
-  starting_func = False
-  regexp = r'(\w(\w|::|\*|\&|\s)*)\('  # decls * & space::name( ...
-  match_result = Match(regexp, line)
-  if match_result:
-    # If the name is all caps and underscores, figure it's a macro and
-    # ignore it, unless it's TEST or TEST_F.
-    function_name = match_result.group(1).split()[-1]
-    if function_name == 'TEST' or function_name == 'TEST_F' or (
-        not Match(r'[A-Z_]+$', function_name)):
-      starting_func = True
-
-  if starting_func:
-    body_found = False
-    for start_linenum in xrange(linenum, clean_lines.NumLines()):
-      start_line = lines[start_linenum]
-      joined_line += ' ' + start_line.lstrip()
-      if Search(r'(;|})', start_line):  # Declarations and trivial functions
-        body_found = True
-        break                              # ... ignore
-      if Search(r'{', start_line):
-        body_found = True
-        function = Search(r'((\w|:)*)\(', line).group(1)
-        if Match(r'TEST', function):    # Handle TEST... macros
-          parameter_regexp = Search(r'(\(.*\))', joined_line)
-          if parameter_regexp:             # Ignore bad syntax
-            function += parameter_regexp.group(1)
-        else:
-          function += '()'
-        function_state.Begin(function)
-        break
-    if not body_found:
-      # No body for the function (or evidence of a non-function) was found.
-      error(filename, linenum, 'readability/fn_size', 5,
-            'Lint failed to find start of function body.')
-  elif Match(r'^\}\s*$', line):  # function end
-    function_state.Check(error, filename, linenum)
-    function_state.End()
-  elif not Match(r'^\s*$', line):
-    function_state.Count()  # Count non-blank/non-comment lines.
-
-
-_RE_PATTERN_TODO = re.compile(r'^//(\s*)TODO(\(.+?\))?:?(\s|$)?')
-
-
-def CheckComment(line, filename, linenum, next_line_start, error):
-  """Checks for common mistakes in comments.
-
-  Args:
-    line: The line in question.
-    filename: The name of the current file.
-    linenum: The number of the line to check.
-    next_line_start: The first non-whitespace column of the next line.
-    error: The function to call with any errors found.
-  """
-  commentpos = line.find('//')
-  if commentpos != -1:
-    # Check if the // may be in quotes.  If so, ignore it
-    if re.sub(r'\\.', '', line[0:commentpos]).count('"') % 2 == 0:
-      # Allow one space for new scopes, two spaces otherwise:
-      if (not (Match(r'^.*{ *//', line) and next_line_start == commentpos) and
-          ((commentpos >= 1 and
-            line[commentpos-1] not in string.whitespace) or
-           (commentpos >= 2 and
-            line[commentpos-2] not in string.whitespace))):
-        error(filename, linenum, 'whitespace/comments', 2,
-              'At least two spaces is best between code and comments')
-
-      # Checks for common mistakes in TODO comments.
-      comment = line[commentpos:]
-      match = _RE_PATTERN_TODO.match(comment)
-      if match:
-        # One whitespace is correct; zero whitespace is handled elsewhere.
-        leading_whitespace = match.group(1)
-        if len(leading_whitespace) > 1:
-          error(filename, linenum, 'whitespace/todo', 2,
-                'Too many spaces before TODO')
-
-        username = match.group(2)
-        if not username:
-          error(filename, linenum, 'readability/todo', 2,
-                'Missing username in TODO; it should look like '
-                '"// TODO(my_username): Stuff."')
-
-        middle_whitespace = match.group(3)
-        # Comparisons made explicit for correctness -- pylint: disable=g-explicit-bool-comparison
-        if middle_whitespace != ' ' and middle_whitespace != '':
-          error(filename, linenum, 'whitespace/todo', 2,
-                'TODO(my_username) should be followed by a space')
-
-      # If the comment contains an alphanumeric character, there
-      # should be a space somewhere between it and the // unless
-      # it's a /// or //! Doxygen comment.
-      if (Match(r'//[^ ]*\w', comment) and
-          not Match(r'(///|//\!)(\s+|$)', comment)):
-        error(filename, linenum, 'whitespace/comments', 4,
-              'Should have a space between // and comment')
-
-
-def CheckSpacing(filename, clean_lines, linenum, nesting_state, error):
-  """Checks for the correctness of various spacing issues in the code.
-
-  Things we check for: spaces around operators, spaces after
-  if/for/while/switch, no spaces around parens in function calls, two
-  spaces between code and comment, don't start a block with a blank
-  line, don't end a function with a blank line, don't add a blank line
-  after public/protected/private, don't have too many blank lines in a row.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    error: The function to call with any errors found.
-  """
-
-  # Don't use "elided" lines here, otherwise we can't check commented lines.
-  # Don't want to use "raw" either, because we don't want to check inside C++11
-  # raw strings,
-  raw = clean_lines.lines_without_raw_strings
-  line = raw[linenum]
-
-  # Before nixing comments, check if the line is blank for no good
-  # reason.  This includes the first line after a block is opened, and
-  # blank lines at the end of a function (ie, right before a line like '}'
-  #
-  # Skip all the blank line checks if we are immediately inside a
-  # namespace body.  In other words, don't issue blank line warnings
-  # for this block:
-  #   namespace {
-  #
-  #   }
-  #
-  # A warning about missing end of namespace comments will be issued instead.
-  #
-  # Also skip blank line checks for 'extern "C"' blocks, which are formatted
-  # like namespaces.
-  if (IsBlankLine(line) and
-      not nesting_state.InNamespaceBody() and
-      not nesting_state.InExternC()):
-    elided = clean_lines.elided
-    prev_line = elided[linenum - 1]
-    prevbrace = prev_line.rfind('{')
-    # TODO(unknown): Don't complain if line before blank line, and line after,
-    #                both start with alnums and are indented the same amount.
-    #                This ignores whitespace at the start of a namespace block
-    #                because those are not usually indented.
-    if prevbrace != -1 and prev_line[prevbrace:].find('}') == -1:
-      # OK, we have a blank line at the start of a code block.  Before we
-      # complain, we check if it is an exception to the rule: The previous
-      # non-empty line has the parameters of a function header that are indented
-      # 4 spaces (because they did not fit in a 80 column line when placed on
-      # the same line as the function name).  We also check for the case where
-      # the previous line is indented 6 spaces, which may happen when the
-      # initializers of a constructor do not fit into a 80 column line.
-      exception = False
-      if Match(r' {6}\w', prev_line):  # Initializer list?
-        # We are looking for the opening column of initializer list, which
-        # should be indented 4 spaces to cause 6 space indentation afterwards.
-        search_position = linenum-2
-        while (search_position >= 0
-               and Match(r' {6}\w', elided[search_position])):
-          search_position -= 1
-        exception = (search_position >= 0
-                     and elided[search_position][:5] == '    :')
-      else:
-        # Search for the function arguments or an initializer list.  We use a
-        # simple heuristic here: If the line is indented 4 spaces; and we have a
-        # closing paren, without the opening paren, followed by an opening brace
-        # or colon (for initializer lists) we assume that it is the last line of
-        # a function header.  If we have a colon indented 4 spaces, it is an
-        # initializer list.
-        exception = (Match(r' {4}\w[^\(]*\)\s*(const\s*)?(\{\s*$|:)',
-                           prev_line)
-                     or Match(r' {4}:', prev_line))
-
-      if not exception:
-        error(filename, linenum, 'whitespace/blank_line', 2,
-              'Redundant blank line at the start of a code block '
-              'should be deleted.')
-    # Ignore blank lines at the end of a block in a long if-else
-    # chain, like this:
-    #   if (condition1) {
-    #     // Something followed by a blank line
-    #
-    #   } else if (condition2) {
-    #     // Something else
-    #   }
-    if linenum + 1 < clean_lines.NumLines():
-      next_line = raw[linenum + 1]
-      if (next_line
-          and Match(r'\s*}', next_line)
-          and next_line.find('} else ') == -1):
-        error(filename, linenum, 'whitespace/blank_line', 3,
-              'Redundant blank line at the end of a code block '
-              'should be deleted.')
-
-    matched = Match(r'\s*(public|protected|private):', prev_line)
-    if matched:
-      error(filename, linenum, 'whitespace/blank_line', 3,
-            'Do not leave a blank line after "%s:"' % matched.group(1))
-
-  # Next, check comments
-  next_line_start = 0
-  if linenum + 1 < clean_lines.NumLines():
-    next_line = raw[linenum + 1]
-    next_line_start = len(next_line) - len(next_line.lstrip())
-  CheckComment(line, filename, linenum, next_line_start, error)
-
-  # get rid of comments and strings
-  line = clean_lines.elided[linenum]
-
-  # You shouldn't have spaces before your brackets, except for C++11 attributes
-  # or maybe after 'delete []', 'return []() {};', or 'auto [abc, ...] = ...;'.
-  if (Search(r'\w\s+\[(?!\[)', line) and
-      not Search(r'(?:auto&?|delete|return)\s+\[', line)):
-    error(filename, linenum, 'whitespace/braces', 5,
-          'Extra space before [')
-
-  # In range-based for, we wanted spaces before and after the colon, but
-  # not around "::" tokens that might appear.
-  if (Search(r'for *\(.*[^:]:[^: ]', line) or
-      Search(r'for *\(.*[^: ]:[^:]', line)):
-    error(filename, linenum, 'whitespace/forcolon', 2,
-          'Missing space around colon in range-based for loop')
-
-
-def CheckOperatorSpacing(filename, clean_lines, linenum, error):
-  """Checks for horizontal spacing around operators.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # Don't try to do spacing checks for operator methods.  Do this by
-  # replacing the troublesome characters with something else,
-  # preserving column position for all other characters.
-  #
-  # The replacement is done repeatedly to avoid false positives from
-  # operators that call operators.
-  while True:
-    match = Match(r'^(.*\boperator\b)(\S+)(\s*\(.*)$', line)
-    if match:
-      line = match.group(1) + ('_' * len(match.group(2))) + match.group(3)
-    else:
-      break
-
-  # We allow no-spaces around = within an if: "if ( (a=Foo()) == 0 )".
-  # Otherwise not.  Note we only check for non-spaces on *both* sides;
-  # sometimes people put non-spaces on one side when aligning ='s among
-  # many lines (not that this is behavior that I approve of...)
-  if ((Search(r'[\w.]=', line) or
-       Search(r'=[\w.]', line))
-      and not Search(r'\b(if|while|for) ', line)
-      # Operators taken from [lex.operators] in C++11 standard.
-      and not Search(r'(>=|<=|==|!=|&=|\^=|\|=|\+=|\*=|\/=|\%=)', line)
-      and not Search(r'operator=', line)):
-    error(filename, linenum, 'whitespace/operators', 4,
-          'Missing spaces around =')
-
-  # It's ok not to have spaces around binary operators like + - * /, but if
-  # there's too little whitespace, we get concerned.  It's hard to tell,
-  # though, so we punt on this one for now.  TODO.
-
-  # You should always have whitespace around binary operators.
-  #
-  # Check <= and >= first to avoid false positives with < and >, then
-  # check non-include lines for spacing around < and >.
-  #
-  # If the operator is followed by a comma, assume it's be used in a
-  # macro context and don't do any checks.  This avoids false
-  # positives.
-  #
-  # Note that && is not included here.  This is because there are too
-  # many false positives due to RValue references.
-  match = Search(r'[^<>=!\s](==|!=|<=|>=|\|\|)[^<>=!\s,;\)]', line)
-  if match:
-    error(filename, linenum, 'whitespace/operators', 3,
-          'Missing spaces around %s' % match.group(1))
-  elif not Match(r'#.*include', line):
-    # Look for < that is not surrounded by spaces.  This is only
-    # triggered if both sides are missing spaces, even though
-    # technically should should flag if at least one side is missing a
-    # space.  This is done to avoid some false positives with shifts.
-    match = Match(r'^(.*[^\s<])<[^\s=<,]', line)
-    if match:
-      (_, _, end_pos) = CloseExpression(
-          clean_lines, linenum, len(match.group(1)))
-      if end_pos <= -1:
-        error(filename, linenum, 'whitespace/operators', 3,
-              'Missing spaces around <')
-
-    # Look for > that is not surrounded by spaces.  Similar to the
-    # above, we only trigger if both sides are missing spaces to avoid
-    # false positives with shifts.
-    match = Match(r'^(.*[^-\s>])>[^\s=>,]', line)
-    if match:
-      (_, _, start_pos) = ReverseCloseExpression(
-          clean_lines, linenum, len(match.group(1)))
-      if start_pos <= -1:
-        error(filename, linenum, 'whitespace/operators', 3,
-              'Missing spaces around >')
-
-  # We allow no-spaces around << when used like this: 10<<20, but
-  # not otherwise (particularly, not when used as streams)
-  #
-  # We also allow operators following an opening parenthesis, since
-  # those tend to be macros that deal with operators.
-  match = Search(r'(operator|[^\s(<])(?:L|UL|LL|ULL|l|ul|ll|ull)?<<([^\s,=<])', line)
-  if (match and not (match.group(1).isdigit() and match.group(2).isdigit()) and
-      not (match.group(1) == 'operator' and match.group(2) == ';')):
-    error(filename, linenum, 'whitespace/operators', 3,
-          'Missing spaces around <<')
-
-  # We allow no-spaces around >> for almost anything.  This is because
-  # C++11 allows ">>" to close nested templates, which accounts for
-  # most cases when ">>" is not followed by a space.
-  #
-  # We still warn on ">>" followed by alpha character, because that is
-  # likely due to ">>" being used for right shifts, e.g.:
-  #   value >> alpha
-  #
-  # When ">>" is used to close templates, the alphanumeric letter that
-  # follows would be part of an identifier, and there should still be
-  # a space separating the template type and the identifier.
-  #   type<type<type>> alpha
-  match = Search(r'>>[a-zA-Z_]', line)
-  if match:
-    error(filename, linenum, 'whitespace/operators', 3,
-          'Missing spaces around >>')
-
-  # There shouldn't be space around unary operators
-  match = Search(r'(!\s|~\s|[\s]--[\s;]|[\s]\+\+[\s;])', line)
-  if match:
-    error(filename, linenum, 'whitespace/operators', 4,
-          'Extra space for operator %s' % match.group(1))
-
-
-def CheckParenthesisSpacing(filename, clean_lines, linenum, error):
-  """Checks for horizontal spacing around parentheses.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # No spaces after an if, while, switch, or for
-  match = Search(r' (if\(|for\(|while\(|switch\()', line)
-  if match:
-    error(filename, linenum, 'whitespace/parens', 5,
-          'Missing space before ( in %s' % match.group(1))
-
-  # For if/for/while/switch, the left and right parens should be
-  # consistent about how many spaces are inside the parens, and
-  # there should either be zero or one spaces inside the parens.
-  # We don't want: "if ( foo)" or "if ( foo   )".
-  # Exception: "for ( ; foo; bar)" and "for (foo; bar; )" are allowed.
-  match = Search(r'\b(if|for|while|switch)\s*'
-                 r'\(([ ]*)(.).*[^ ]+([ ]*)\)\s*{\s*$',
-                 line)
-  if match:
-    if len(match.group(2)) != len(match.group(4)):
-      if not (match.group(3) == ';' and
-              len(match.group(2)) == 1 + len(match.group(4)) or
-              not match.group(2) and Search(r'\bfor\s*\(.*; \)', line)):
-        error(filename, linenum, 'whitespace/parens', 5,
-              'Mismatching spaces inside () in %s' % match.group(1))
-    if len(match.group(2)) not in [0, 1]:
-      error(filename, linenum, 'whitespace/parens', 5,
-            'Should have zero or one spaces inside ( and ) in %s' %
-            match.group(1))
-
-
-def CheckCommaSpacing(filename, clean_lines, linenum, error):
-  """Checks for horizontal spacing near commas and semicolons.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  raw = clean_lines.lines_without_raw_strings
-  line = clean_lines.elided[linenum]
-
-  # You should always have a space after a comma (either as fn arg or operator)
-  #
-  # This does not apply when the non-space character following the
-  # comma is another comma, since the only time when that happens is
-  # for empty macro arguments.
-  #
-  # We run this check in two passes: first pass on elided lines to
-  # verify that lines contain missing whitespaces, second pass on raw
-  # lines to confirm that those missing whitespaces are not due to
-  # elided comments.
-  if (Search(r',[^,\s]', ReplaceAll(r'\boperator\s*,\s*\(', 'F(', line)) and
-      Search(r',[^,\s]', raw[linenum])):
-    error(filename, linenum, 'whitespace/comma', 3,
-          'Missing space after ,')
-
-  # You should always have a space after a semicolon
-  # except for few corner cases
-  # TODO(unknown): clarify if 'if (1) { return 1;}' is requires one more
-  # space after ;
-  if Search(r';[^\s};\\)/]', line):
-    error(filename, linenum, 'whitespace/semicolon', 3,
-          'Missing space after ;')
-
-
-def _IsType(clean_lines, nesting_state, expr):
-  """Check if expression looks like a type name, returns true if so.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    expr: The expression to check.
-  Returns:
-    True, if token looks like a type.
-  """
-  # Keep only the last token in the expression
-  last_word = Match(r'^.*(\b\S+)$', expr)
-  if last_word:
-    token = last_word.group(1)
-  else:
-    token = expr
-
-  # Match native types and stdint types
-  if _TYPES.match(token):
-    return True
-
-  # Try a bit harder to match templated types.  Walk up the nesting
-  # stack until we find something that resembles a typename
-  # declaration for what we are looking for.
-  typename_pattern = (r'\b(?:typename|class|struct)\s+' + re.escape(token) +
-                      r'\b')
-  block_index = len(nesting_state.stack) - 1
-  while block_index >= 0:
-    if isinstance(nesting_state.stack[block_index], _NamespaceInfo):
-      return False
-
-    # Found where the opening brace is.  We want to scan from this
-    # line up to the beginning of the function, minus a few lines.
-    #   template <typename Type1,  // stop scanning here
-    #             ...>
-    #   class C
-    #     : public ... {  // start scanning here
-    last_line = nesting_state.stack[block_index].starting_linenum
-
-    next_block_start = 0
-    if block_index > 0:
-      next_block_start = nesting_state.stack[block_index - 1].starting_linenum
-    first_line = last_line
-    while first_line >= next_block_start:
-      if clean_lines.elided[first_line].find('template') >= 0:
-        break
-      first_line -= 1
-    if first_line < next_block_start:
-      # Didn't find any "template" keyword before reaching the next block,
-      # there are probably no template things to check for this block
-      block_index -= 1
-      continue
-
-    # Look for typename in the specified range
-    for i in xrange(first_line, last_line + 1, 1):
-      if Search(typename_pattern, clean_lines.elided[i]):
-        return True
-    block_index -= 1
-
-  return False
-
-
-def CheckBracesSpacing(filename, clean_lines, linenum, nesting_state, error):
-  """Checks for horizontal spacing near commas.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # Except after an opening paren, or after another opening brace (in case of
-  # an initializer list, for instance), you should have spaces before your
-  # braces when they are delimiting blocks, classes, namespaces etc.
-  # And since you should never have braces at the beginning of a line,
-  # this is an easy test.  Except that braces used for initialization don't
-  # follow the same rule; we often don't want spaces before those.
-  match = Match(r'^(.*[^ ({>]){', line)
-
-  if match:
-    # Try a bit harder to check for brace initialization.  This
-    # happens in one of the following forms:
-    #   Constructor() : initializer_list_{} { ... }
-    #   Constructor{}.MemberFunction()
-    #   Type variable{};
-    #   FunctionCall(type{}, ...);
-    #   LastArgument(..., type{});
-    #   LOG(INFO) << type{} << " ...";
-    #   map_of_type[{...}] = ...;
-    #   ternary = expr ? new type{} : nullptr;
-    #   OuterTemplate<InnerTemplateConstructor<Type>{}>
-    #
-    # We check for the character following the closing brace, and
-    # silence the warning if it's one of those listed above, i.e.
-    # "{.;,)<>]:".
-    #
-    # To account for nested initializer list, we allow any number of
-    # closing braces up to "{;,)<".  We can't simply silence the
-    # warning on first sight of closing brace, because that would
-    # cause false negatives for things that are not initializer lists.
-    #   Silence this:         But not this:
-    #     Outer{                if (...) {
-    #       Inner{...}            if (...){  // Missing space before {
-    #     };                    }
-    #
-    # There is a false negative with this approach if people inserted
-    # spurious semicolons, e.g. "if (cond){};", but we will catch the
-    # spurious semicolon with a separate check.
-    leading_text = match.group(1)
-    (endline, endlinenum, endpos) = CloseExpression(
-        clean_lines, linenum, len(match.group(1)))
-    trailing_text = ''
-    if endpos > -1:
-      trailing_text = endline[endpos:]
-    for offset in xrange(endlinenum + 1,
-                         min(endlinenum + 3, clean_lines.NumLines() - 1)):
-      trailing_text += clean_lines.elided[offset]
-    # We also suppress warnings for `uint64_t{expression}` etc., as the style
-    # guide recommends brace initialization for integral types to avoid
-    # overflow/truncation.
-    if (not Match(r'^[\s}]*[{.;,)<>\]:]', trailing_text)
-        and not _IsType(clean_lines, nesting_state, leading_text)):
-      error(filename, linenum, 'whitespace/braces', 5,
-            'Missing space before {')
-
-  # Make sure '} else {' has spaces.
-  if Search(r'}else', line):
-    error(filename, linenum, 'whitespace/braces', 5,
-          'Missing space before else')
-
-  # You shouldn't have a space before a semicolon at the end of the line.
-  # There's a special case for "for" since the style guide allows space before
-  # the semicolon there.
-  if Search(r':\s*;\s*$', line):
-    error(filename, linenum, 'whitespace/semicolon', 5,
-          'Semicolon defining empty statement. Use {} instead.')
-  elif Search(r'^\s*;\s*$', line):
-    error(filename, linenum, 'whitespace/semicolon', 5,
-          'Line contains only semicolon. If this should be an empty statement, '
-          'use {} instead.')
-  elif (Search(r'\s+;\s*$', line) and
-        not Search(r'\bfor\b', line)):
-    error(filename, linenum, 'whitespace/semicolon', 5,
-          'Extra space before last semicolon. If this should be an empty '
-          'statement, use {} instead.')
-
-
-def IsDecltype(clean_lines, linenum, column):
-  """Check if the token ending on (linenum, column) is decltype().
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: the number of the line to check.
-    column: end column of the token to check.
-  Returns:
-    True if this token is decltype() expression, False otherwise.
-  """
-  (text, _, start_col) = ReverseCloseExpression(clean_lines, linenum, column)
-  if start_col < 0:
-    return False
-  if Search(r'\bdecltype\s*$', text[0:start_col]):
-    return True
-  return False
-
-def CheckSectionSpacing(filename, clean_lines, class_info, linenum, error):
-  """Checks for additional blank line issues related to sections.
-
-  Currently the only thing checked here is blank line before protected/private.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    class_info: A _ClassInfo objects.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  # Skip checks if the class is small, where small means 25 lines or less.
-  # 25 lines seems like a good cutoff since that's the usual height of
-  # terminals, and any class that can't fit in one screen can't really
-  # be considered "small".
-  #
-  # Also skip checks if we are on the first line.  This accounts for
-  # classes that look like
-  #   class Foo { public: ... };
-  #
-  # If we didn't find the end of the class, last_line would be zero,
-  # and the check will be skipped by the first condition.
-  if (class_info.last_line - class_info.starting_linenum <= 24 or
-      linenum <= class_info.starting_linenum):
-    return
-
-  matched = Match(r'\s*(public|protected|private):', clean_lines.lines[linenum])
-  if matched:
-    # Issue warning if the line before public/protected/private was
-    # not a blank line, but don't do this if the previous line contains
-    # "class" or "struct".  This can happen two ways:
-    #  - We are at the beginning of the class.
-    #  - We are forward-declaring an inner class that is semantically
-    #    private, but needed to be public for implementation reasons.
-    # Also ignores cases where the previous line ends with a backslash as can be
-    # common when defining classes in C macros.
-    prev_line = clean_lines.lines[linenum - 1]
-    if (not IsBlankLine(prev_line) and
-        not Search(r'\b(class|struct)\b', prev_line) and
-        not Search(r'\\$', prev_line)):
-      # Try a bit harder to find the beginning of the class.  This is to
-      # account for multi-line base-specifier lists, e.g.:
-      #   class Derived
-      #       : public Base {
-      end_class_head = class_info.starting_linenum
-      for i in range(class_info.starting_linenum, linenum):
-        if Search(r'\{\s*$', clean_lines.lines[i]):
-          end_class_head = i
-          break
-      if end_class_head < linenum - 1:
-        error(filename, linenum, 'whitespace/blank_line', 3,
-              '"%s:" should be preceded by a blank line' % matched.group(1))
-
-
-def GetPreviousNonBlankLine(clean_lines, linenum):
-  """Return the most recent non-blank line and its line number.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file contents.
-    linenum: The number of the line to check.
-
-  Returns:
-    A tuple with two elements.  The first element is the contents of the last
-    non-blank line before the current line, or the empty string if this is the
-    first non-blank line.  The second is the line number of that line, or -1
-    if this is the first non-blank line.
-  """
-
-  prevlinenum = linenum - 1
-  while prevlinenum >= 0:
-    prevline = clean_lines.elided[prevlinenum]
-    if not IsBlankLine(prevline):     # if not a blank line...
-      return (prevline, prevlinenum)
-    prevlinenum -= 1
-  return ('', -1)
-
-
-def CheckBraces(filename, clean_lines, linenum, error):
-  """Looks for misplaced braces (e.g. at the end of line).
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-
-  line = clean_lines.elided[linenum]        # get rid of comments and strings
-
-  if Match(r'\s*{\s*$', line):
-    # We allow an open brace to start a line in the case where someone is using
-    # braces in a block to explicitly create a new scope, which is commonly used
-    # to control the lifetime of stack-allocated variables.  Braces are also
-    # used for brace initializers inside function calls.  We don't detect this
-    # perfectly: we just don't complain if the last non-whitespace character on
-    # the previous non-blank line is ',', ';', ':', '(', '{', or '}', or if the
-    # previous line starts a preprocessor block. We also allow a brace on the
-    # following line if it is part of an array initialization and would not fit
-    # within the 80 character limit of the preceding line.
-    prevline = GetPreviousNonBlankLine(clean_lines, linenum)[0]
-    if (not Search(r'[,;:}{(]\s*$', prevline) and
-        not Match(r'\s*#', prevline) and
-        not (GetLineWidth(prevline) > _line_length - 2 and '[]' in prevline)):
-      error(filename, linenum, 'whitespace/braces', 4,
-            '{ should almost always be at the end of the previous line')
-
-  # An else clause should be on the same line as the preceding closing brace.
-  if Match(r'\s*else\b\s*(?:if\b|\{|$)', line):
-    prevline = GetPreviousNonBlankLine(clean_lines, linenum)[0]
-    if Match(r'\s*}\s*$', prevline):
-      error(filename, linenum, 'whitespace/newline', 4,
-            'An else should appear on the same line as the preceding }')
-
-  # If braces come on one side of an else, they should be on both.
-  # However, we have to worry about "else if" that spans multiple lines!
-  if Search(r'else if\s*\(', line):       # could be multi-line if
-    brace_on_left = bool(Search(r'}\s*else if\s*\(', line))
-    # find the ( after the if
-    pos = line.find('else if')
-    pos = line.find('(', pos)
-    if pos > 0:
-      (endline, _, endpos) = CloseExpression(clean_lines, linenum, pos)
-      brace_on_right = endline[endpos:].find('{') != -1
-      if brace_on_left != brace_on_right:    # must be brace after if
-        error(filename, linenum, 'readability/braces', 5,
-              'If an else has a brace on one side, it should have it on both')
-  elif Search(r'}\s*else[^{]*$', line) or Match(r'[^}]*else\s*{', line):
-    error(filename, linenum, 'readability/braces', 5,
-          'If an else has a brace on one side, it should have it on both')
-
-  # Likewise, an else should never have the else clause on the same line
-  if Search(r'\belse [^\s{]', line) and not Search(r'\belse if\b', line):
-    error(filename, linenum, 'whitespace/newline', 4,
-          'Else clause should never be on same line as else (use 2 lines)')
-
-  # In the same way, a do/while should never be on one line
-  if Match(r'\s*do [^\s{]', line):
-    error(filename, linenum, 'whitespace/newline', 4,
-          'do/while clauses should not be on a single line')
-
-  # Check single-line if/else bodies. The style guide says 'curly braces are not
-  # required for single-line statements'. We additionally allow multi-line,
-  # single statements, but we reject anything with more than one semicolon in
-  # it. This means that the first semicolon after the if should be at the end of
-  # its line, and the line after that should have an indent level equal to or
-  # lower than the if. We also check for ambiguous if/else nesting without
-  # braces.
-  if_else_match = Search(r'\b(if\s*(|constexpr)\s*\(|else\b)', line)
-  if if_else_match and not Match(r'\s*#', line):
-    if_indent = GetIndentLevel(line)
-    endline, endlinenum, endpos = line, linenum, if_else_match.end()
-    if_match = Search(r'\bif\s*(|constexpr)\s*\(', line)
-    if if_match:
-      # This could be a multiline if condition, so find the end first.
-      pos = if_match.end() - 1
-      (endline, endlinenum, endpos) = CloseExpression(clean_lines, linenum, pos)
-    # Check for an opening brace, either directly after the if or on the next
-    # line. If found, this isn't a single-statement conditional.
-    if (not Match(r'\s*{', endline[endpos:])
-        and not (Match(r'\s*$', endline[endpos:])
-                 and endlinenum < (len(clean_lines.elided) - 1)
-                 and Match(r'\s*{', clean_lines.elided[endlinenum + 1]))):
-      while (endlinenum < len(clean_lines.elided)
-             and ';' not in clean_lines.elided[endlinenum][endpos:]):
-        endlinenum += 1
-        endpos = 0
-      if endlinenum < len(clean_lines.elided):
-        endline = clean_lines.elided[endlinenum]
-        # We allow a mix of whitespace and closing braces (e.g. for one-liner
-        # methods) and a single \ after the semicolon (for macros)
-        endpos = endline.find(';')
-        if not Match(r';[\s}]*(\\?)$', endline[endpos:]):
-          # Semicolon isn't the last character, there's something trailing.
-          # Output a warning if the semicolon is not contained inside
-          # a lambda expression.
-          if not Match(r'^[^{};]*\[[^\[\]]*\][^{}]*\{[^{}]*\}\s*\)*[;,]\s*$',
-                       endline):
-            error(filename, linenum, 'readability/braces', 4,
-                  'If/else bodies with multiple statements require braces')
-        elif endlinenum < len(clean_lines.elided) - 1:
-          # Make sure the next line is dedented
-          next_line = clean_lines.elided[endlinenum + 1]
-          next_indent = GetIndentLevel(next_line)
-          # With ambiguous nested if statements, this will error out on the
-          # if that *doesn't* match the else, regardless of whether it's the
-          # inner one or outer one.
-          if (if_match and Match(r'\s*else\b', next_line)
-              and next_indent != if_indent):
-            error(filename, linenum, 'readability/braces', 4,
-                  'Else clause should be indented at the same level as if. '
-                  'Ambiguous nested if/else chains require braces.')
-          elif next_indent > if_indent:
-            error(filename, linenum, 'readability/braces', 4,
-                  'If/else bodies with multiple statements require braces')
-
-
-def CheckTrailingSemicolon(filename, clean_lines, linenum, error):
-  """Looks for redundant trailing semicolon.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-
-  line = clean_lines.elided[linenum]
-
-  # Block bodies should not be followed by a semicolon.  Due to C++11
-  # brace initialization, there are more places where semicolons are
-  # required than not, so we explicitly list the allowed rules rather
-  # than listing the disallowed ones.  These are the places where "};"
-  # should be replaced by just "}":
-  # 1. Some flavor of block following closing parenthesis:
-  #    for (;;) {};
-  #    while (...) {};
-  #    switch (...) {};
-  #    Function(...) {};
-  #    if (...) {};
-  #    if (...) else if (...) {};
-  #
-  # 2. else block:
-  #    if (...) else {};
-  #
-  # 3. const member function:
-  #    Function(...) const {};
-  #
-  # 4. Block following some statement:
-  #    x = 42;
-  #    {};
-  #
-  # 5. Block at the beginning of a function:
-  #    Function(...) {
-  #      {};
-  #    }
-  #
-  #    Note that naively checking for the preceding "{" will also match
-  #    braces inside multi-dimensional arrays, but this is fine since
-  #    that expression will not contain semicolons.
-  #
-  # 6. Block following another block:
-  #    while (true) {}
-  #    {};
-  #
-  # 7. End of namespaces:
-  #    namespace {};
-  #
-  #    These semicolons seems far more common than other kinds of
-  #    redundant semicolons, possibly due to people converting classes
-  #    to namespaces.  For now we do not warn for this case.
-  #
-  # Try matching case 1 first.
-  match = Match(r'^(.*\)\s*)\{', line)
-  if match:
-    # Matched closing parenthesis (case 1).  Check the token before the
-    # matching opening parenthesis, and don't warn if it looks like a
-    # macro.  This avoids these false positives:
-    #  - macro that defines a base class
-    #  - multi-line macro that defines a base class
-    #  - macro that defines the whole class-head
-    #
-    # But we still issue warnings for macros that we know are safe to
-    # warn, specifically:
-    #  - TEST, TEST_F, TEST_P, MATCHER, MATCHER_P
-    #  - TYPED_TEST
-    #  - INTERFACE_DEF
-    #  - EXCLUSIVE_LOCKS_REQUIRED, SHARED_LOCKS_REQUIRED, LOCKS_EXCLUDED:
-    #
-    # We implement a list of safe macros instead of a list of
-    # unsafe macros, even though the latter appears less frequently in
-    # google code and would have been easier to implement.  This is because
-    # the downside for getting the allowed checks wrong means some extra
-    # semicolons, while the downside for getting disallowed checks wrong
-    # would result in compile errors.
-    #
-    # In addition to macros, we also don't want to warn on
-    #  - Compound literals
-    #  - Lambdas
-    #  - alignas specifier with anonymous structs
-    #  - decltype
-    closing_brace_pos = match.group(1).rfind(')')
-    opening_parenthesis = ReverseCloseExpression(
-        clean_lines, linenum, closing_brace_pos)
-    if opening_parenthesis[2] > -1:
-      line_prefix = opening_parenthesis[0][0:opening_parenthesis[2]]
-      macro = Search(r'\b([A-Z_][A-Z0-9_]*)\s*$', line_prefix)
-      func = Match(r'^(.*\])\s*$', line_prefix)
-      if ((macro and
-           macro.group(1) not in (
-               'TEST', 'TEST_F', 'MATCHER', 'MATCHER_P', 'TYPED_TEST',
-               'EXCLUSIVE_LOCKS_REQUIRED', 'SHARED_LOCKS_REQUIRED',
-               'LOCKS_EXCLUDED', 'INTERFACE_DEF')) or
-          (func and not Search(r'\boperator\s*\[\s*\]', func.group(1))) or
-          Search(r'\b(?:struct|union)\s+alignas\s*$', line_prefix) or
-          Search(r'\bdecltype$', line_prefix) or
-          Search(r'\s+=\s*$', line_prefix)):
-        match = None
-    if (match and
-        opening_parenthesis[1] > 1 and
-        Search(r'\]\s*$', clean_lines.elided[opening_parenthesis[1] - 1])):
-      # Multi-line lambda-expression
-      match = None
-
-  else:
-    # Try matching cases 2-3.
-    match = Match(r'^(.*(?:else|\)\s*const)\s*)\{', line)
-    if not match:
-      # Try matching cases 4-6.  These are always matched on separate lines.
-      #
-      # Note that we can't simply concatenate the previous line to the
-      # current line and do a single match, otherwise we may output
-      # duplicate warnings for the blank line case:
-      #   if (cond) {
-      #     // blank line
-      #   }
-      prevline = GetPreviousNonBlankLine(clean_lines, linenum)[0]
-      if prevline and Search(r'[;{}]\s*$', prevline):
-        match = Match(r'^(\s*)\{', line)
-
-  # Check matching closing brace
-  if match:
-    (endline, endlinenum, endpos) = CloseExpression(
-        clean_lines, linenum, len(match.group(1)))
-    if endpos > -1 and Match(r'^\s*;', endline[endpos:]):
-      # Current {} pair is eligible for semicolon check, and we have found
-      # the redundant semicolon, output warning here.
-      #
-      # Note: because we are scanning forward for opening braces, and
-      # outputting warnings for the matching closing brace, if there are
-      # nested blocks with trailing semicolons, we will get the error
-      # messages in reversed order.
-
-      # We need to check the line forward for NOLINT
-      raw_lines = clean_lines.raw_lines
-      ParseNolintSuppressions(filename, raw_lines[endlinenum-1], endlinenum-1,
-                              error)
-      ParseNolintSuppressions(filename, raw_lines[endlinenum], endlinenum,
-                              error)
-
-      error(filename, endlinenum, 'readability/braces', 4,
-            "You don't need a ; after a }")
-
-
-def CheckEmptyBlockBody(filename, clean_lines, linenum, error):
-  """Look for empty loop/conditional body with only a single semicolon.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-
-  # Search for loop keywords at the beginning of the line.  Because only
-  # whitespaces are allowed before the keywords, this will also ignore most
-  # do-while-loops, since those lines should start with closing brace.
-  #
-  # We also check "if" blocks here, since an empty conditional block
-  # is likely an error.
-  line = clean_lines.elided[linenum]
-  matched = Match(r'\s*(for|while|if)\s*\(', line)
-  if matched:
-    # Find the end of the conditional expression.
-    (end_line, end_linenum, end_pos) = CloseExpression(
-        clean_lines, linenum, line.find('('))
-
-    # Output warning if what follows the condition expression is a semicolon.
-    # No warning for all other cases, including whitespace or newline, since we
-    # have a separate check for semicolons preceded by whitespace.
-    if end_pos >= 0 and Match(r';', end_line[end_pos:]):
-      if matched.group(1) == 'if':
-        error(filename, end_linenum, 'whitespace/empty_conditional_body', 5,
-              'Empty conditional bodies should use {}')
-      else:
-        error(filename, end_linenum, 'whitespace/empty_loop_body', 5,
-              'Empty loop bodies should use {} or continue')
-
-    # Check for if statements that have completely empty bodies (no comments)
-    # and no else clauses.
-    if end_pos >= 0 and matched.group(1) == 'if':
-      # Find the position of the opening { for the if statement.
-      # Return without logging an error if it has no brackets.
-      opening_linenum = end_linenum
-      opening_line_fragment = end_line[end_pos:]
-      # Loop until EOF or find anything that's not whitespace or opening {.
-      while not Search(r'^\s*\{', opening_line_fragment):
-        if Search(r'^(?!\s*$)', opening_line_fragment):
-          # Conditional has no brackets.
-          return
-        opening_linenum += 1
-        if opening_linenum == len(clean_lines.elided):
-          # Couldn't find conditional's opening { or any code before EOF.
-          return
-        opening_line_fragment = clean_lines.elided[opening_linenum]
-      # Set opening_line (opening_line_fragment may not be entire opening line).
-      opening_line = clean_lines.elided[opening_linenum]
-
-      # Find the position of the closing }.
-      opening_pos = opening_line_fragment.find('{')
-      if opening_linenum == end_linenum:
-        # We need to make opening_pos relative to the start of the entire line.
-        opening_pos += end_pos
-      (closing_line, closing_linenum, closing_pos) = CloseExpression(
-          clean_lines, opening_linenum, opening_pos)
-      if closing_pos < 0:
-        return
-
-      # Now construct the body of the conditional. This consists of the portion
-      # of the opening line after the {, all lines until the closing line,
-      # and the portion of the closing line before the }.
-      if (clean_lines.raw_lines[opening_linenum] !=
-          CleanseComments(clean_lines.raw_lines[opening_linenum])):
-        # Opening line ends with a comment, so conditional isn't empty.
-        return
-      if closing_linenum > opening_linenum:
-        # Opening line after the {. Ignore comments here since we checked above.
-        bodylist = list(opening_line[opening_pos+1:])
-        # All lines until closing line, excluding closing line, with comments.
-        bodylist.extend(clean_lines.raw_lines[opening_linenum+1:closing_linenum])
-        # Closing line before the }. Won't (and can't) have comments.
-        bodylist.append(clean_lines.elided[closing_linenum][:closing_pos-1])
-        body = '\n'.join(bodylist)
-      else:
-        # If statement has brackets and fits on a single line.
-        body = opening_line[opening_pos+1:closing_pos-1]
-
-      # Check if the body is empty
-      if not _EMPTY_CONDITIONAL_BODY_PATTERN.search(body):
-        return
-      # The body is empty. Now make sure there's not an else clause.
-      current_linenum = closing_linenum
-      current_line_fragment = closing_line[closing_pos:]
-      # Loop until EOF or find anything that's not whitespace or else clause.
-      while Search(r'^\s*$|^(?=\s*else)', current_line_fragment):
-        if Search(r'^(?=\s*else)', current_line_fragment):
-          # Found an else clause, so don't log an error.
-          return
-        current_linenum += 1
-        if current_linenum == len(clean_lines.elided):
-          break
-        current_line_fragment = clean_lines.elided[current_linenum]
-
-      # The body is empty and there's no else clause until EOF or other code.
-      error(filename, end_linenum, 'whitespace/empty_if_body', 4,
-            ('If statement had no body and no else clause'))
-
-
-def FindCheckMacro(line):
-  """Find a replaceable CHECK-like macro.
-
-  Args:
-    line: line to search on.
-  Returns:
-    (macro name, start position), or (None, -1) if no replaceable
-    macro is found.
-  """
-  for macro in _CHECK_MACROS:
-    i = line.find(macro)
-    if i >= 0:
-      # Find opening parenthesis.  Do a regular expression match here
-      # to make sure that we are matching the expected CHECK macro, as
-      # opposed to some other macro that happens to contain the CHECK
-      # substring.
-      matched = Match(r'^(.*\b' + macro + r'\s*)\(', line)
-      if not matched:
-        continue
-      return (macro, len(matched.group(1)))
-  return (None, -1)
-
-
-def CheckCheck(filename, clean_lines, linenum, error):
-  """Checks the use of CHECK and EXPECT macros.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-
-  # Decide the set of replacement macros that should be suggested
-  lines = clean_lines.elided
-  (check_macro, start_pos) = FindCheckMacro(lines[linenum])
-  if not check_macro:
-    return
-
-  # Find end of the boolean expression by matching parentheses
-  (last_line, end_line, end_pos) = CloseExpression(
-      clean_lines, linenum, start_pos)
-  if end_pos < 0:
-    return
-
-  # If the check macro is followed by something other than a
-  # semicolon, assume users will log their own custom error messages
-  # and don't suggest any replacements.
-  if not Match(r'\s*;', last_line[end_pos:]):
-    return
-
-  if linenum == end_line:
-    expression = lines[linenum][start_pos + 1:end_pos - 1]
-  else:
-    expression = lines[linenum][start_pos + 1:]
-    for i in xrange(linenum + 1, end_line):
-      expression += lines[i]
-    expression += last_line[0:end_pos - 1]
-
-  # Parse expression so that we can take parentheses into account.
-  # This avoids false positives for inputs like "CHECK((a < 4) == b)",
-  # which is not replaceable by CHECK_LE.
-  lhs = ''
-  rhs = ''
-  operator = None
-  while expression:
-    matched = Match(r'^\s*(<<|<<=|>>|>>=|->\*|->|&&|\|\||'
-                    r'==|!=|>=|>|<=|<|\()(.*)$', expression)
-    if matched:
-      token = matched.group(1)
-      if token == '(':
-        # Parenthesized operand
-        expression = matched.group(2)
-        (end, _) = FindEndOfExpressionInLine(expression, 0, ['('])
-        if end < 0:
-          return  # Unmatched parenthesis
-        lhs += '(' + expression[0:end]
-        expression = expression[end:]
-      elif token in ('&&', '||'):
-        # Logical and/or operators.  This means the expression
-        # contains more than one term, for example:
-        #   CHECK(42 < a && a < b);
-        #
-        # These are not replaceable with CHECK_LE, so bail out early.
-        return
-      elif token in ('<<', '<<=', '>>', '>>=', '->*', '->'):
-        # Non-relational operator
-        lhs += token
-        expression = matched.group(2)
-      else:
-        # Relational operator
-        operator = token
-        rhs = matched.group(2)
-        break
-    else:
-      # Unparenthesized operand.  Instead of appending to lhs one character
-      # at a time, we do another regular expression match to consume several
-      # characters at once if possible.  Trivial benchmark shows that this
-      # is more efficient when the operands are longer than a single
-      # character, which is generally the case.
-      matched = Match(r'^([^-=!<>()&|]+)(.*)$', expression)
-      if not matched:
-        matched = Match(r'^(\s*\S)(.*)$', expression)
-        if not matched:
-          break
-      lhs += matched.group(1)
-      expression = matched.group(2)
-
-  # Only apply checks if we got all parts of the boolean expression
-  if not (lhs and operator and rhs):
-    return
-
-  # Check that rhs do not contain logical operators.  We already know
-  # that lhs is fine since the loop above parses out && and ||.
-  if rhs.find('&&') > -1 or rhs.find('||') > -1:
-    return
-
-  # At least one of the operands must be a constant literal.  This is
-  # to avoid suggesting replacements for unprintable things like
-  # CHECK(variable != iterator)
-  #
-  # The following pattern matches decimal, hex integers, strings, and
-  # characters (in that order).
-  lhs = lhs.strip()
-  rhs = rhs.strip()
-  match_constant = r'^([-+]?(\d+|0[xX][0-9a-fA-F]+)[lLuU]{0,3}|".*"|\'.*\')$'
-  if Match(match_constant, lhs) or Match(match_constant, rhs):
-    # Note: since we know both lhs and rhs, we can provide a more
-    # descriptive error message like:
-    #   Consider using CHECK_EQ(x, 42) instead of CHECK(x == 42)
-    # Instead of:
-    #   Consider using CHECK_EQ instead of CHECK(a == b)
-    #
-    # We are still keeping the less descriptive message because if lhs
-    # or rhs gets long, the error message might become unreadable.
-    error(filename, linenum, 'readability/check', 2,
-          'Consider using %s instead of %s(a %s b)' % (
-              _CHECK_REPLACEMENT[check_macro][operator],
-              check_macro, operator))
-
-
-def CheckAltTokens(filename, clean_lines, linenum, error):
-  """Check alternative keywords being used in boolean expressions.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # Avoid preprocessor lines
-  if Match(r'^\s*#', line):
-    return
-
-  # Last ditch effort to avoid multi-line comments.  This will not help
-  # if the comment started before the current line or ended after the
-  # current line, but it catches most of the false positives.  At least,
-  # it provides a way to workaround this warning for people who use
-  # multi-line comments in preprocessor macros.
-  #
-  # TODO(unknown): remove this once cpplint has better support for
-  # multi-line comments.
-  if line.find('/*') >= 0 or line.find('*/') >= 0:
-    return
-
-  for match in _ALT_TOKEN_REPLACEMENT_PATTERN.finditer(line):
-    error(filename, linenum, 'readability/alt_tokens', 2,
-          'Use operator %s instead of %s' % (
-              _ALT_TOKEN_REPLACEMENT[match.group(1)], match.group(1)))
-
-
-def GetLineWidth(line):
-  """Determines the width of the line in column positions.
-
-  Args:
-    line: A string, which may be a Unicode string.
-
-  Returns:
-    The width of the line in column positions, accounting for Unicode
-    combining characters and wide characters.
-  """
-  if isinstance(line, unicode):
-    width = 0
-    for uc in unicodedata.normalize('NFC', line):
-      if unicodedata.east_asian_width(uc) in ('W', 'F'):
-        width += 2
-      elif not unicodedata.combining(uc):
-        # Issue 337
-        # https://mail.python.org/pipermail/python-list/2012-August/628809.html
-        if (sys.version_info.major, sys.version_info.minor) <= (3, 2):
-          # https://github.com/python/cpython/blob/2.7/Include/unicodeobject.h#L81
-          is_wide_build = sysconfig.get_config_var("Py_UNICODE_SIZE") >= 4
-          # https://github.com/python/cpython/blob/2.7/Objects/unicodeobject.c#L564
-          is_low_surrogate = 0xDC00 <= ord(uc) <= 0xDFFF
-          if not is_wide_build and is_low_surrogate:
-            width -= 1
-
-        width += 1
-    return width
-  else:
-    return len(line)
-
-
-def CheckStyle(filename, clean_lines, linenum, file_extension, nesting_state,
-               error):
-  """Checks rules from the 'C++ style rules' section of cppguide.html.
-
-  Most of these rules are hard to test (naming, comment style), but we
-  do what we can.  In particular we check for 2-space indents, line lengths,
-  tab usage, spaces inside code, etc.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    file_extension: The extension (without the dot) of the filename.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    error: The function to call with any errors found.
-  """
-
-  # Don't use "elided" lines here, otherwise we can't check commented lines.
-  # Don't want to use "raw" either, because we don't want to check inside C++11
-  # raw strings,
-  raw_lines = clean_lines.lines_without_raw_strings
-  line = raw_lines[linenum]
-  prev = raw_lines[linenum - 1] if linenum > 0 else ''
-
-  if line.find('\t') != -1:
-    error(filename, linenum, 'whitespace/tab', 1,
-          'Tab found; better to use spaces')
-
-  # One or three blank spaces at the beginning of the line is weird; it's
-  # hard to reconcile that with 2-space indents.
-  # NOTE: here are the conditions rob pike used for his tests.  Mine aren't
-  # as sophisticated, but it may be worth becoming so:  RLENGTH==initial_spaces
-  # if(RLENGTH > 20) complain = 0;
-  # if(match($0, " +(error|private|public|protected):")) complain = 0;
-  # if(match(prev, "&& *$")) complain = 0;
-  # if(match(prev, "\\|\\| *$")) complain = 0;
-  # if(match(prev, "[\",=><] *$")) complain = 0;
-  # if(match($0, " <<")) complain = 0;
-  # if(match(prev, " +for \\(")) complain = 0;
-  # if(prevodd && match(prevprev, " +for \\(")) complain = 0;
-  scope_or_label_pattern = r'\s*(?:public|private|protected|signals)(?:\s+(?:slots\s*)?)?:\s*\\?$'
-  classinfo = nesting_state.InnermostClass()
-  initial_spaces = 0
-  cleansed_line = clean_lines.elided[linenum]
-  while initial_spaces < len(line) and line[initial_spaces] == ' ':
-    initial_spaces += 1
-  # There are certain situations we allow one space, notably for
-  # section labels, and also lines containing multi-line raw strings.
-  # We also don't check for lines that look like continuation lines
-  # (of lines ending in double quotes, commas, equals, or angle brackets)
-  # because the rules for how to indent those are non-trivial.
-  if (not Search(r'[",=><] *$', prev) and
-      (initial_spaces == 1 or initial_spaces == 3) and
-      not Match(scope_or_label_pattern, cleansed_line) and
-      not (clean_lines.raw_lines[linenum] != line and
-           Match(r'^\s*""', line))):
-    error(filename, linenum, 'whitespace/indent', 3,
-          'Weird number of spaces at line-start.  '
-          'Are you using a 2-space indent?')
-
-  if line and line[-1].isspace():
-    error(filename, linenum, 'whitespace/end_of_line', 4,
-          'Line ends in whitespace.  Consider deleting these extra spaces.')
-
-  # Check if the line is a header guard.
-  is_header_guard = False
-  if IsHeaderExtension(file_extension):
-    cppvar = GetHeaderGuardCPPVariable(filename)
-    if (line.startswith('#ifndef %s' % cppvar) or
-        line.startswith('#define %s' % cppvar) or
-        line.startswith('#endif  // %s' % cppvar)):
-      is_header_guard = True
-  # #include lines and header guards can be long, since there's no clean way to
-  # split them.
-  #
-  # URLs can be long too.  It's possible to split these, but it makes them
-  # harder to cut&paste.
-  #
-  # The "$Id:...$" comment may also get very long without it being the
-  # developers fault.
-  #
-  # Doxygen documentation copying can get pretty long when using an overloaded
-  # function declaration
-  if (not line.startswith('#include') and not is_header_guard and
-      not Match(r'^\s*//.*http(s?)://\S*$', line) and
-      not Match(r'^\s*//\s*[^\s]*$', line) and
-      not Match(r'^// \$Id:.*#[0-9]+ \$$', line) and
-      not Match(r'^\s*/// [@\\](copydoc|copydetails|copybrief) .*$', line)):
-    line_width = GetLineWidth(line)
-    if line_width > _line_length:
-      error(filename, linenum, 'whitespace/line_length', 2,
-            'Lines should be <= %i characters long' % _line_length)
-
-  if (cleansed_line.count(';') > 1 and
-      # allow simple single line lambdas
-      not Match(r'^[^{};]*\[[^\[\]]*\][^{}]*\{[^{}\n\r]*\}',
-                line) and
-      # for loops are allowed two ;'s (and may run over two lines).
-      cleansed_line.find('for') == -1 and
-      (GetPreviousNonBlankLine(clean_lines, linenum)[0].find('for') == -1 or
-       GetPreviousNonBlankLine(clean_lines, linenum)[0].find(';') != -1) and
-      # It's ok to have many commands in a switch case that fits in 1 line
-      not ((cleansed_line.find('case ') != -1 or
-            cleansed_line.find('default:') != -1) and
-           cleansed_line.find('break;') != -1)):
-    error(filename, linenum, 'whitespace/newline', 0,
-          'More than one command on the same line')
-
-  # Some more style checks
-  CheckBraces(filename, clean_lines, linenum, error)
-  CheckTrailingSemicolon(filename, clean_lines, linenum, error)
-  CheckEmptyBlockBody(filename, clean_lines, linenum, error)
-  CheckSpacing(filename, clean_lines, linenum, nesting_state, error)
-  CheckOperatorSpacing(filename, clean_lines, linenum, error)
-  CheckParenthesisSpacing(filename, clean_lines, linenum, error)
-  CheckCommaSpacing(filename, clean_lines, linenum, error)
-  CheckBracesSpacing(filename, clean_lines, linenum, nesting_state, error)
-  CheckSpacingForFunctionCall(filename, clean_lines, linenum, error)
-  CheckCheck(filename, clean_lines, linenum, error)
-  CheckAltTokens(filename, clean_lines, linenum, error)
-  classinfo = nesting_state.InnermostClass()
-  if classinfo:
-    CheckSectionSpacing(filename, clean_lines, classinfo, linenum, error)
-
-
-_RE_PATTERN_INCLUDE = re.compile(r'^\s*#\s*include\s*([<"])([^>"]*)[>"].*$')
-# Matches the first component of a filename delimited by -s and _s. That is:
-#  _RE_FIRST_COMPONENT.match('foo').group(0) == 'foo'
-#  _RE_FIRST_COMPONENT.match('foo.cc').group(0) == 'foo'
-#  _RE_FIRST_COMPONENT.match('foo-bar_baz.cc').group(0) == 'foo'
-#  _RE_FIRST_COMPONENT.match('foo_bar-baz.cc').group(0) == 'foo'
-_RE_FIRST_COMPONENT = re.compile(r'^[^-_.]+')
-
-
-def _DropCommonSuffixes(filename):
-  """Drops common suffixes like _test.cc or -inl.h from filename.
-
-  For example:
-    >>> _DropCommonSuffixes('foo/foo-inl.h')
-    'foo/foo'
-    >>> _DropCommonSuffixes('foo/bar/foo.cc')
-    'foo/bar/foo'
-    >>> _DropCommonSuffixes('foo/foo_internal.h')
-    'foo/foo'
-    >>> _DropCommonSuffixes('foo/foo_unusualinternal.h')
-    'foo/foo_unusualinternal'
-
-  Args:
-    filename: The input filename.
-
-  Returns:
-    The filename with the common suffix removed.
-  """
-  for suffix in itertools.chain(
-      ('%s.%s' % (test_suffix.lstrip('_'), ext)
-       for test_suffix, ext in itertools.product(_test_suffixes, GetNonHeaderExtensions())),
-      ('%s.%s' % (suffix, ext)
-       for suffix, ext in itertools.product(['inl', 'imp', 'internal'], GetHeaderExtensions()))):
-    if (filename.endswith(suffix) and len(filename) > len(suffix) and
-        filename[-len(suffix) - 1] in ('-', '_')):
-      return filename[:-len(suffix) - 1]
-  return os.path.splitext(filename)[0]
-
-
-def _ClassifyInclude(fileinfo, include, used_angle_brackets, include_order="default"):
-  """Figures out what kind of header 'include' is.
-
-  Args:
-    fileinfo: The current file cpplint is running over. A FileInfo instance.
-    include: The path to a #included file.
-    used_angle_brackets: True if the #include used <> rather than "".
-    include_order: "default" or other value allowed in program arguments
-
-  Returns:
-    One of the _XXX_HEADER constants.
-
-  For example:
-    >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'stdio.h', True)
-    _C_SYS_HEADER
-    >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'string', True)
-    _CPP_SYS_HEADER
-    >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'foo/foo.h', True, "standardcfirst")
-    _OTHER_SYS_HEADER
-    >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'foo/foo.h', False)
-    _LIKELY_MY_HEADER
-    >>> _ClassifyInclude(FileInfo('foo/foo_unknown_extension.cc'),
-    ...                  'bar/foo_other_ext.h', False)
-    _POSSIBLE_MY_HEADER
-    >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'foo/bar.h', False)
-    _OTHER_HEADER
-  """
-  # This is a list of all standard c++ header files, except
-  # those already checked for above.
-  is_cpp_header = include in _CPP_HEADERS
-
-  # Mark include as C header if in list or in a known folder for standard-ish C headers.
-  is_std_c_header = (include_order == "default") or (include in _C_HEADERS
-            # additional linux glibc header folders
-            or Search(r'(?:%s)\/.*\.h' % "|".join(C_STANDARD_HEADER_FOLDERS), include))
-
-  # Headers with C++ extensions shouldn't be considered C system headers
-  is_system = used_angle_brackets and not os.path.splitext(include)[1] in ['.hpp', '.hxx', '.h++']
-
-  if is_system:
-    if is_cpp_header:
-      return _CPP_SYS_HEADER
-    if is_std_c_header:
-      return _C_SYS_HEADER
-    else:
-      return _OTHER_SYS_HEADER
-
-  # If the target file and the include we're checking share a
-  # basename when we drop common extensions, and the include
-  # lives in . , then it's likely to be owned by the target file.
-  target_dir, target_base = (
-      os.path.split(_DropCommonSuffixes(fileinfo.RepositoryName())))
-  include_dir, include_base = os.path.split(_DropCommonSuffixes(include))
-  target_dir_pub = os.path.normpath(target_dir + '/../public')
-  target_dir_pub = target_dir_pub.replace('\\', '/')
-  if target_base == include_base and (
-      include_dir == target_dir or
-      include_dir == target_dir_pub):
-    return _LIKELY_MY_HEADER
-
-  # If the target and include share some initial basename
-  # component, it's possible the target is implementing the
-  # include, so it's allowed to be first, but we'll never
-  # complain if it's not there.
-  target_first_component = _RE_FIRST_COMPONENT.match(target_base)
-  include_first_component = _RE_FIRST_COMPONENT.match(include_base)
-  if (target_first_component and include_first_component and
-      target_first_component.group(0) ==
-      include_first_component.group(0)):
-    return _POSSIBLE_MY_HEADER
-
-  return _OTHER_HEADER
-
-
-
-def CheckIncludeLine(filename, clean_lines, linenum, include_state, error):
-  """Check rules that are applicable to #include lines.
-
-  Strings on #include lines are NOT removed from elided line, to make
-  certain tasks easier. However, to prevent false positives, checks
-  applicable to #include lines in CheckLanguage must be put here.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    include_state: An _IncludeState instance in which the headers are inserted.
-    error: The function to call with any errors found.
-  """
-  fileinfo = FileInfo(filename)
-  line = clean_lines.lines[linenum]
-
-  # "include" should use the new style "foo/bar.h" instead of just "bar.h"
-  # Only do this check if the included header follows google naming
-  # conventions.  If not, assume that it's a 3rd party API that
-  # requires special include conventions.
-  #
-  # We also make an exception for Lua headers, which follow google
-  # naming convention but not the include convention.
-  match = Match(r'#include\s*"([^/]+\.h)"', line)
-  if match and not _THIRD_PARTY_HEADERS_PATTERN.match(match.group(1)):
-    error(filename, linenum, 'build/include_subdir', 4,
-          'Include the directory when naming .h files')
-
-  # we shouldn't include a file more than once. actually, there are a
-  # handful of instances where doing so is okay, but in general it's
-  # not.
-  match = _RE_PATTERN_INCLUDE.search(line)
-  if match:
-    include = match.group(2)
-    used_angle_brackets = (match.group(1) == '<')
-    duplicate_line = include_state.FindHeader(include)
-    if duplicate_line >= 0:
-      error(filename, linenum, 'build/include', 4,
-            '"%s" already included at %s:%s' %
-            (include, filename, duplicate_line))
-      return
-
-    for extension in GetNonHeaderExtensions():
-      if (include.endswith('.' + extension) and
-          os.path.dirname(fileinfo.RepositoryName()) != os.path.dirname(include)):
-        error(filename, linenum, 'build/include', 4,
-              'Do not include .' + extension + ' files from other packages')
-        return
-
-    # We DO want to include a 3rd party looking header if it matches the
-    # filename. Otherwise we get an erroneous error "...should include its
-    # header" error later.
-    third_src_header = False
-    for ext in GetHeaderExtensions():
-      basefilename = filename[0:len(filename) - len(fileinfo.Extension())]
-      headerfile = basefilename + '.' + ext
-      headername = FileInfo(headerfile).RepositoryName()
-      if headername in include or include in headername:
-        third_src_header = True
-        break
-
-    if third_src_header or not _THIRD_PARTY_HEADERS_PATTERN.match(include):
-      include_state.include_list[-1].append((include, linenum))
-
-      # We want to ensure that headers appear in the right order:
-      # 1) for foo.cc, foo.h  (preferred location)
-      # 2) c system files
-      # 3) cpp system files
-      # 4) for foo.cc, foo.h  (deprecated location)
-      # 5) other google headers
-      #
-      # We classify each include statement as one of those 5 types
-      # using a number of techniques. The include_state object keeps
-      # track of the highest type seen, and complains if we see a
-      # lower type after that.
-      error_message = include_state.CheckNextIncludeOrder(
-          _ClassifyInclude(fileinfo, include, used_angle_brackets, _include_order))
-      if error_message:
-        error(filename, linenum, 'build/include_order', 4,
-              '%s. Should be: %s.h, c system, c++ system, other.' %
-              (error_message, fileinfo.BaseName()))
-      canonical_include = include_state.CanonicalizeAlphabeticalOrder(include)
-      if not include_state.IsInAlphabeticalOrder(
-          clean_lines, linenum, canonical_include):
-        error(filename, linenum, 'build/include_alpha', 4,
-              'Include "%s" not in alphabetical order' % include)
-      include_state.SetLastHeader(canonical_include)
-
-
-
-def _GetTextInside(text, start_pattern):
-  r"""Retrieves all the text between matching open and close parentheses.
-
-  Given a string of lines and a regular expression string, retrieve all the text
-  following the expression and between opening punctuation symbols like
-  (, [, or {, and the matching close-punctuation symbol. This properly nested
-  occurrences of the punctuations, so for the text like
-    printf(a(), b(c()));
-  a call to _GetTextInside(text, r'printf\(') will return 'a(), b(c())'.
-  start_pattern must match string having an open punctuation symbol at the end.
-
-  Args:
-    text: The lines to extract text. Its comments and strings must be elided.
-           It can be single line and can span multiple lines.
-    start_pattern: The regexp string indicating where to start extracting
-                   the text.
-  Returns:
-    The extracted text.
-    None if either the opening string or ending punctuation could not be found.
-  """
-  # TODO(unknown): Audit cpplint.py to see what places could be profitably
-  # rewritten to use _GetTextInside (and use inferior regexp matching today).
-
-  # Give opening punctuations to get the matching close-punctuations.
-  matching_punctuation = {'(': ')', '{': '}', '[': ']'}
-  closing_punctuation = set(itervalues(matching_punctuation))
-
-  # Find the position to start extracting text.
-  match = re.search(start_pattern, text, re.M)
-  if not match:  # start_pattern not found in text.
-    return None
-  start_position = match.end(0)
-
-  assert start_position > 0, (
-      'start_pattern must ends with an opening punctuation.')
-  assert text[start_position - 1] in matching_punctuation, (
-      'start_pattern must ends with an opening punctuation.')
-  # Stack of closing punctuations we expect to have in text after position.
-  punctuation_stack = [matching_punctuation[text[start_position - 1]]]
-  position = start_position
-  while punctuation_stack and position < len(text):
-    if text[position] == punctuation_stack[-1]:
-      punctuation_stack.pop()
-    elif text[position] in closing_punctuation:
-      # A closing punctuation without matching opening punctuations.
-      return None
-    elif text[position] in matching_punctuation:
-      punctuation_stack.append(matching_punctuation[text[position]])
-    position += 1
-  if punctuation_stack:
-    # Opening punctuations left without matching close-punctuations.
-    return None
-  # punctuations match.
-  return text[start_position:position - 1]
-
-
-# Patterns for matching call-by-reference parameters.
-#
-# Supports nested templates up to 2 levels deep using this messy pattern:
-#   < (?: < (?: < [^<>]*
-#               >
-#           |   [^<>] )*
-#         >
-#     |   [^<>] )*
-#   >
-_RE_PATTERN_IDENT = r'[_a-zA-Z]\w*'  # =~ [[:alpha:]][[:alnum:]]*
-_RE_PATTERN_TYPE = (
-    r'(?:const\s+)?(?:typename\s+|class\s+|struct\s+|union\s+|enum\s+)?'
-    r'(?:\w|'
-    r'\s*<(?:<(?:<[^<>]*>|[^<>])*>|[^<>])*>|'
-    r'::)+')
-# A call-by-reference parameter ends with '& identifier'.
-_RE_PATTERN_REF_PARAM = re.compile(
-    r'(' + _RE_PATTERN_TYPE + r'(?:\s*(?:\bconst\b|[*]))*\s*'
-    r'&\s*' + _RE_PATTERN_IDENT + r')\s*(?:=[^,()]+)?[,)]')
-# A call-by-const-reference parameter either ends with 'const& identifier'
-# or looks like 'const type& identifier' when 'type' is atomic.
-_RE_PATTERN_CONST_REF_PARAM = (
-    r'(?:.*\s*\bconst\s*&\s*' + _RE_PATTERN_IDENT +
-    r'|const\s+' + _RE_PATTERN_TYPE + r'\s*&\s*' + _RE_PATTERN_IDENT + r')')
-# Stream types.
-_RE_PATTERN_REF_STREAM_PARAM = (
-    r'(?:.*stream\s*&\s*' + _RE_PATTERN_IDENT + r')')
-
-
-def CheckLanguage(filename, clean_lines, linenum, file_extension,
-                  include_state, nesting_state, error):
-  """Checks rules from the 'C++ language rules' section of cppguide.html.
-
-  Some of these rules are hard to test (function overloading, using
-  uint32 inappropriately), but we do the best we can.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    file_extension: The extension (without the dot) of the filename.
-    include_state: An _IncludeState instance in which the headers are inserted.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    error: The function to call with any errors found.
-  """
-  # If the line is empty or consists of entirely a comment, no need to
-  # check it.
-  line = clean_lines.elided[linenum]
-  if not line:
-    return
-
-  match = _RE_PATTERN_INCLUDE.search(line)
-  if match:
-    CheckIncludeLine(filename, clean_lines, linenum, include_state, error)
-    return
-
-  # Reset include state across preprocessor directives.  This is meant
-  # to silence warnings for conditional includes.
-  match = Match(r'^\s*#\s*(if|ifdef|ifndef|elif|else|endif)\b', line)
-  if match:
-    include_state.ResetSection(match.group(1))
-
-
-  # Perform other checks now that we are sure that this is not an include line
-  CheckCasts(filename, clean_lines, linenum, error)
-  CheckGlobalStatic(filename, clean_lines, linenum, error)
-  CheckPrintf(filename, clean_lines, linenum, error)
-
-  if IsHeaderExtension(file_extension):
-    # TODO(unknown): check that 1-arg constructors are explicit.
-    #                How to tell it's a constructor?
-    #                (handled in CheckForNonStandardConstructs for now)
-    # TODO(unknown): check that classes declare or disable copy/assign
-    #                (level 1 error)
-    pass
-
-  # Check if people are using the verboten C basic types.  The only exception
-  # we regularly allow is "unsigned short port" for port.
-  if Search(r'\bshort port\b', line):
-    if not Search(r'\bunsigned short port\b', line):
-      error(filename, linenum, 'runtime/int', 4,
-            'Use "unsigned short" for ports, not "short"')
-  else:
-    match = Search(r'\b(short|long(?! +double)|long long)\b', line)
-    if match:
-      error(filename, linenum, 'runtime/int', 4,
-            'Use int16/int64/etc, rather than the C type %s' % match.group(1))
-
-  # Check if some verboten operator overloading is going on
-  # TODO(unknown): catch out-of-line unary operator&:
-  #   class X {};
-  #   int operator&(const X& x) { return 42; }  // unary operator&
-  # The trick is it's hard to tell apart from binary operator&:
-  #   class Y { int operator&(const Y& x) { return 23; } }; // binary operator&
-  if Search(r'\boperator\s*&\s*\(\s*\)', line):
-    error(filename, linenum, 'runtime/operator', 4,
-          'Unary operator& is dangerous.  Do not use it.')
-
-  # Check for suspicious usage of "if" like
-  # } if (a == b) {
-  if Search(r'\}\s*if\s*\(', line):
-    error(filename, linenum, 'readability/braces', 4,
-          'Did you mean "else if"? If not, start a new line for "if".')
-
-  # Check for potential format string bugs like printf(foo).
-  # We constrain the pattern not to pick things like DocidForPrintf(foo).
-  # Not perfect but it can catch printf(foo.c_str()) and printf(foo->c_str())
-  # TODO(unknown): Catch the following case. Need to change the calling
-  # convention of the whole function to process multiple line to handle it.
-  #   printf(
-  #       boy_this_is_a_really_long_variable_that_cannot_fit_on_the_prev_line);
-  printf_args = _GetTextInside(line, r'(?i)\b(string)?printf\s*\(')
-  if printf_args:
-    match = Match(r'([\w.\->()]+)$', printf_args)
-    if match and match.group(1) != '__VA_ARGS__':
-      function_name = re.search(r'\b((?:string)?printf)\s*\(',
-                                line, re.I).group(1)
-      error(filename, linenum, 'runtime/printf', 4,
-            'Potential format string bug. Do %s("%%s", %s) instead.'
-            % (function_name, match.group(1)))
-
-  # Check for potential memset bugs like memset(buf, sizeof(buf), 0).
-  match = Search(r'memset\s*\(([^,]*),\s*([^,]*),\s*0\s*\)', line)
-  if match and not Match(r"^''|-?[0-9]+|0x[0-9A-Fa-f]$", match.group(2)):
-    error(filename, linenum, 'runtime/memset', 4,
-          'Did you mean "memset(%s, 0, %s)"?'
-          % (match.group(1), match.group(2)))
-
-  if Search(r'\busing namespace\b', line):
-    if Search(r'\bliterals\b', line):
-      error(filename, linenum, 'build/namespaces_literals', 5,
-            'Do not use namespace using-directives.  '
-            'Use using-declarations instead.')
-    else:
-      error(filename, linenum, 'build/namespaces', 5,
-            'Do not use namespace using-directives.  '
-            'Use using-declarations instead.')
-
-  # Detect variable-length arrays.
-  match = Match(r'\s*(.+::)?(\w+) [a-z]\w*\[(.+)];', line)
-  if (match and match.group(2) != 'return' and match.group(2) != 'delete' and
-      match.group(3).find(']') == -1):
-    # Split the size using space and arithmetic operators as delimiters.
-    # If any of the resulting tokens are not compile time constants then
-    # report the error.
-    tokens = re.split(r'\s|\+|\-|\*|\/|<<|>>]', match.group(3))
-    is_const = True
-    skip_next = False
-    for tok in tokens:
-      if skip_next:
-        skip_next = False
-        continue
-
-      if Search(r'sizeof\(.+\)', tok): continue
-      if Search(r'arraysize\(\w+\)', tok): continue
-
-      tok = tok.lstrip('(')
-      tok = tok.rstrip(')')
-      if not tok: continue
-      if Match(r'\d+', tok): continue
-      if Match(r'0[xX][0-9a-fA-F]+', tok): continue
-      if Match(r'k[A-Z0-9]\w*', tok): continue
-      if Match(r'(.+::)?k[A-Z0-9]\w*', tok): continue
-      if Match(r'(.+::)?[A-Z][A-Z0-9_]*', tok): continue
-      # A catch all for tricky sizeof cases, including 'sizeof expression',
-      # 'sizeof(*type)', 'sizeof(const type)', 'sizeof(struct StructName)'
-      # requires skipping the next token because we split on ' ' and '*'.
-      if tok.startswith('sizeof'):
-        skip_next = True
-        continue
-      is_const = False
-      break
-    if not is_const:
-      error(filename, linenum, 'runtime/arrays', 1,
-            'Do not use variable-length arrays.  Use an appropriately named '
-            "('k' followed by CamelCase) compile-time constant for the size.")
-
-  # Check for use of unnamed namespaces in header files.  Registration
-  # macros are typically OK, so we allow use of "namespace {" on lines
-  # that end with backslashes.
-  if (IsHeaderExtension(file_extension)
-      and Search(r'\bnamespace\s*{', line)
-      and line[-1] != '\\'):
-    error(filename, linenum, 'build/namespaces_headers', 4,
-          'Do not use unnamed namespaces in header files.  See '
-          'https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces'
-          ' for more information.')
-
-
-def CheckGlobalStatic(filename, clean_lines, linenum, error):
-  """Check for unsafe global or static objects.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # Match two lines at a time to support multiline declarations
-  if linenum + 1 < clean_lines.NumLines() and not Search(r'[;({]', line):
-    line += clean_lines.elided[linenum + 1].strip()
-
-  # Check for people declaring static/global STL strings at the top level.
-  # This is dangerous because the C++ language does not guarantee that
-  # globals with constructors are initialized before the first access, and
-  # also because globals can be destroyed when some threads are still running.
-  # TODO(unknown): Generalize this to also find static unique_ptr instances.
-  # TODO(unknown): File bugs for clang-tidy to find these.
-  match = Match(
-      r'((?:|static +)(?:|const +))(?::*std::)?string( +const)? +'
-      r'([a-zA-Z0-9_:]+)\b(.*)',
-      line)
-
-  # Remove false positives:
-  # - String pointers (as opposed to values).
-  #    string *pointer
-  #    const string *pointer
-  #    string const *pointer
-  #    string *const pointer
-  #
-  # - Functions and template specializations.
-  #    string Function<Type>(...
-  #    string Class<Type>::Method(...
-  #
-  # - Operators.  These are matched separately because operator names
-  #   cross non-word boundaries, and trying to match both operators
-  #   and functions at the same time would decrease accuracy of
-  #   matching identifiers.
-  #    string Class::operator*()
-  if (match and
-      not Search(r'\bstring\b(\s+const)?\s*[\*\&]\s*(const\s+)?\w', line) and
-      not Search(r'\boperator\W', line) and
-      not Match(r'\s*(<.*>)?(::[a-zA-Z0-9_]+)*\s*\(([^"]|$)', match.group(4))):
-    if Search(r'\bconst\b', line):
-      error(filename, linenum, 'runtime/string', 4,
-            'For a static/global string constant, use a C style string '
-            'instead: "%schar%s %s[]".' %
-            (match.group(1), match.group(2) or '', match.group(3)))
-    else:
-      error(filename, linenum, 'runtime/string', 4,
-            'Static/global string variables are not permitted.')
-
-  if (Search(r'\b([A-Za-z0-9_]*_)\(\1\)', line) or
-      Search(r'\b([A-Za-z0-9_]*_)\(CHECK_NOTNULL\(\1\)\)', line)):
-    error(filename, linenum, 'runtime/init', 4,
-          'You seem to be initializing a member variable with itself.')
-
-
-def CheckPrintf(filename, clean_lines, linenum, error):
-  """Check for printf related issues.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # When snprintf is used, the second argument shouldn't be a literal.
-  match = Search(r'snprintf\s*\(([^,]*),\s*([0-9]*)\s*,', line)
-  if match and match.group(2) != '0':
-    # If 2nd arg is zero, snprintf is used to calculate size.
-    error(filename, linenum, 'runtime/printf', 3,
-          'If you can, use sizeof(%s) instead of %s as the 2nd arg '
-          'to snprintf.' % (match.group(1), match.group(2)))
-
-  # Check if some verboten C functions are being used.
-  if Search(r'\bsprintf\s*\(', line):
-    error(filename, linenum, 'runtime/printf', 5,
-          'Never use sprintf. Use snprintf instead.')
-  match = Search(r'\b(strcpy|strcat)\s*\(', line)
-  if match:
-    error(filename, linenum, 'runtime/printf', 4,
-          'Almost always, snprintf is better than %s' % match.group(1))
-
-
-def IsDerivedFunction(clean_lines, linenum):
-  """Check if current line contains an inherited function.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-  Returns:
-    True if current line contains a function with "override"
-    virt-specifier.
-  """
-  # Scan back a few lines for start of current function
-  for i in xrange(linenum, max(-1, linenum - 10), -1):
-    match = Match(r'^([^()]*\w+)\(', clean_lines.elided[i])
-    if match:
-      # Look for "override" after the matching closing parenthesis
-      line, _, closing_paren = CloseExpression(
-          clean_lines, i, len(match.group(1)))
-      return (closing_paren >= 0 and
-              Search(r'\boverride\b', line[closing_paren:]))
-  return False
-
-
-def IsOutOfLineMethodDefinition(clean_lines, linenum):
-  """Check if current line contains an out-of-line method definition.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-  Returns:
-    True if current line contains an out-of-line method definition.
-  """
-  # Scan back a few lines for start of current function
-  for i in xrange(linenum, max(-1, linenum - 10), -1):
-    if Match(r'^([^()]*\w+)\(', clean_lines.elided[i]):
-      return Match(r'^[^()]*\w+::\w+\(', clean_lines.elided[i]) is not None
-  return False
-
-
-def IsInitializerList(clean_lines, linenum):
-  """Check if current line is inside constructor initializer list.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-  Returns:
-    True if current line appears to be inside constructor initializer
-    list, False otherwise.
-  """
-  for i in xrange(linenum, 1, -1):
-    line = clean_lines.elided[i]
-    if i == linenum:
-      remove_function_body = Match(r'^(.*)\{\s*$', line)
-      if remove_function_body:
-        line = remove_function_body.group(1)
-
-    if Search(r'\s:\s*\w+[({]', line):
-      # A lone colon tend to indicate the start of a constructor
-      # initializer list.  It could also be a ternary operator, which
-      # also tend to appear in constructor initializer lists as
-      # opposed to parameter lists.
-      return True
-    if Search(r'\}\s*,\s*$', line):
-      # A closing brace followed by a comma is probably the end of a
-      # brace-initialized member in constructor initializer list.
-      return True
-    if Search(r'[{};]\s*$', line):
-      # Found one of the following:
-      # - A closing brace or semicolon, probably the end of the previous
-      #   function.
-      # - An opening brace, probably the start of current class or namespace.
-      #
-      # Current line is probably not inside an initializer list since
-      # we saw one of those things without seeing the starting colon.
-      return False
-
-  # Got to the beginning of the file without seeing the start of
-  # constructor initializer list.
-  return False
-
-
-def CheckForNonConstReference(filename, clean_lines, linenum,
-                              nesting_state, error):
-  """Check for non-const references.
-
-  Separate from CheckLanguage since it scans backwards from current
-  line, instead of scanning forward.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    error: The function to call with any errors found.
-  """
-  # Do nothing if there is no '&' on current line.
-  line = clean_lines.elided[linenum]
-  if '&' not in line:
-    return
-
-  # If a function is inherited, current function doesn't have much of
-  # a choice, so any non-const references should not be blamed on
-  # derived function.
-  if IsDerivedFunction(clean_lines, linenum):
-    return
-
-  # Don't warn on out-of-line method definitions, as we would warn on the
-  # in-line declaration, if it isn't marked with 'override'.
-  if IsOutOfLineMethodDefinition(clean_lines, linenum):
-    return
-
-  # Long type names may be broken across multiple lines, usually in one
-  # of these forms:
-  #   LongType
-  #       ::LongTypeContinued &identifier
-  #   LongType::
-  #       LongTypeContinued &identifier
-  #   LongType<
-  #       ...>::LongTypeContinued &identifier
-  #
-  # If we detected a type split across two lines, join the previous
-  # line to current line so that we can match const references
-  # accordingly.
-  #
-  # Note that this only scans back one line, since scanning back
-  # arbitrary number of lines would be expensive.  If you have a type
-  # that spans more than 2 lines, please use a typedef.
-  if linenum > 1:
-    previous = None
-    if Match(r'\s*::(?:[\w<>]|::)+\s*&\s*\S', line):
-      # previous_line\n + ::current_line
-      previous = Search(r'\b((?:const\s*)?(?:[\w<>]|::)+[\w<>])\s*$',
-                        clean_lines.elided[linenum - 1])
-    elif Match(r'\s*[a-zA-Z_]([\w<>]|::)+\s*&\s*\S', line):
-      # previous_line::\n + current_line
-      previous = Search(r'\b((?:const\s*)?(?:[\w<>]|::)+::)\s*$',
-                        clean_lines.elided[linenum - 1])
-    if previous:
-      line = previous.group(1) + line.lstrip()
-    else:
-      # Check for templated parameter that is split across multiple lines
-      endpos = line.rfind('>')
-      if endpos > -1:
-        (_, startline, startpos) = ReverseCloseExpression(
-            clean_lines, linenum, endpos)
-        if startpos > -1 and startline < linenum:
-          # Found the matching < on an earlier line, collect all
-          # pieces up to current line.
-          line = ''
-          for i in xrange(startline, linenum + 1):
-            line += clean_lines.elided[i].strip()
-
-  # Check for non-const references in function parameters.  A single '&' may
-  # found in the following places:
-  #   inside expression: binary & for bitwise AND
-  #   inside expression: unary & for taking the address of something
-  #   inside declarators: reference parameter
-  # We will exclude the first two cases by checking that we are not inside a
-  # function body, including one that was just introduced by a trailing '{'.
-  # TODO(unknown): Doesn't account for 'catch(Exception& e)' [rare].
-  if (nesting_state.previous_stack_top and
-      not (isinstance(nesting_state.previous_stack_top, _ClassInfo) or
-           isinstance(nesting_state.previous_stack_top, _NamespaceInfo))):
-    # Not at toplevel, not within a class, and not within a namespace
-    return
-
-  # Avoid initializer lists.  We only need to scan back from the
-  # current line for something that starts with ':'.
-  #
-  # We don't need to check the current line, since the '&' would
-  # appear inside the second set of parentheses on the current line as
-  # opposed to the first set.
-  if linenum > 0:
-    for i in xrange(linenum - 1, max(0, linenum - 10), -1):
-      previous_line = clean_lines.elided[i]
-      if not Search(r'[),]\s*$', previous_line):
-        break
-      if Match(r'^\s*:\s+\S', previous_line):
-        return
-
-  # Avoid preprocessors
-  if Search(r'\\\s*$', line):
-    return
-
-  # Avoid constructor initializer lists
-  if IsInitializerList(clean_lines, linenum):
-    return
-
-  # We allow non-const references in a few standard places, like functions
-  # called "swap()" or iostream operators like "<<" or ">>".  Do not check
-  # those function parameters.
-  #
-  # We also accept & in static_assert, which looks like a function but
-  # it's actually a declaration expression.
-  allowed_functions = (r'(?:[sS]wap(?:<\w:+>)?|'
-                           r'operator\s*[<>][<>]|'
-                           r'static_assert|COMPILE_ASSERT'
-                           r')\s*\(')
-  if Search(allowed_functions, line):
-    return
-  elif not Search(r'\S+\([^)]*$', line):
-    # Don't see an allowed function on this line.  Actually we
-    # didn't see any function name on this line, so this is likely a
-    # multi-line parameter list.  Try a bit harder to catch this case.
-    for i in xrange(2):
-      if (linenum > i and
-          Search(allowed_functions, clean_lines.elided[linenum - i - 1])):
-        return
-
-  decls = ReplaceAll(r'{[^}]*}', ' ', line)  # exclude function body
-  for parameter in re.findall(_RE_PATTERN_REF_PARAM, decls):
-    if (not Match(_RE_PATTERN_CONST_REF_PARAM, parameter) and
-        not Match(_RE_PATTERN_REF_STREAM_PARAM, parameter)):
-      error(filename, linenum, 'runtime/references', 2,
-            'Is this a non-const reference? '
-            'If so, make const or use a pointer: ' +
-            ReplaceAll(' *<', '<', parameter))
-
-
-def CheckCasts(filename, clean_lines, linenum, error):
-  """Various cast related checks.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # Check to see if they're using an conversion function cast.
-  # I just try to capture the most common basic types, though there are more.
-  # Parameterless conversion functions, such as bool(), are allowed as they are
-  # probably a member operator declaration or default constructor.
-  match = Search(
-      r'(\bnew\s+(?:const\s+)?|\S<\s*(?:const\s+)?)?\b'
-      r'(int|float|double|bool|char|int32|uint32|int64|uint64)'
-      r'(\([^)].*)', line)
-  expecting_function = ExpectingFunctionArgs(clean_lines, linenum)
-  if match and not expecting_function:
-    matched_type = match.group(2)
-
-    # matched_new_or_template is used to silence two false positives:
-    # - New operators
-    # - Template arguments with function types
-    #
-    # For template arguments, we match on types immediately following
-    # an opening bracket without any spaces.  This is a fast way to
-    # silence the common case where the function type is the first
-    # template argument.  False negative with less-than comparison is
-    # avoided because those operators are usually followed by a space.
-    #
-    #   function<double(double)>   // bracket + no space = false positive
-    #   value < double(42)         // bracket + space = true positive
-    matched_new_or_template = match.group(1)
-
-    # Avoid arrays by looking for brackets that come after the closing
-    # parenthesis.
-    if Match(r'\([^()]+\)\s*\[', match.group(3)):
-      return
-
-    # Other things to ignore:
-    # - Function pointers
-    # - Casts to pointer types
-    # - Placement new
-    # - Alias declarations
-    matched_funcptr = match.group(3)
-    if (matched_new_or_template is None and
-        not (matched_funcptr and
-             (Match(r'\((?:[^() ]+::\s*\*\s*)?[^() ]+\)\s*\(',
-                    matched_funcptr) or
-              matched_funcptr.startswith('(*)'))) and
-        not Match(r'\s*using\s+\S+\s*=\s*' + matched_type, line) and
-        not Search(r'new\(\S+\)\s*' + matched_type, line)):
-      error(filename, linenum, 'readability/casting', 4,
-            'Using deprecated casting style.  '
-            'Use static_cast<%s>(...) instead' %
-            matched_type)
-
-  if not expecting_function:
-    CheckCStyleCast(filename, clean_lines, linenum, 'static_cast',
-                    r'\((int|float|double|bool|char|u?int(16|32|64))\)', error)
-
-  # This doesn't catch all cases. Consider (const char * const)"hello".
-  #
-  # (char *) "foo" should always be a const_cast (reinterpret_cast won't
-  # compile).
-  if CheckCStyleCast(filename, clean_lines, linenum, 'const_cast',
-                     r'\((char\s?\*+\s?)\)\s*"', error):
-    pass
-  else:
-    # Check pointer casts for other than string constants
-    CheckCStyleCast(filename, clean_lines, linenum, 'reinterpret_cast',
-                    r'\((\w+\s?\*+\s?)\)', error)
-
-  # In addition, we look for people taking the address of a cast.  This
-  # is dangerous -- casts can assign to temporaries, so the pointer doesn't
-  # point where you think.
-  #
-  # Some non-identifier character is required before the '&' for the
-  # expression to be recognized as a cast.  These are casts:
-  #   expression = &static_cast<int*>(temporary());
-  #   function(&(int*)(temporary()));
-  #
-  # This is not a cast:
-  #   reference_type&(int* function_param);
-  match = Search(
-      r'(?:[^\w]&\(([^)*][^)]*)\)[\w(])|'
-      r'(?:[^\w]&(static|dynamic|down|reinterpret)_cast\b)', line)
-  if match:
-    # Try a better error message when the & is bound to something
-    # dereferenced by the casted pointer, as opposed to the casted
-    # pointer itself.
-    parenthesis_error = False
-    match = Match(r'^(.*&(?:static|dynamic|down|reinterpret)_cast\b)<', line)
-    if match:
-      _, y1, x1 = CloseExpression(clean_lines, linenum, len(match.group(1)))
-      if x1 >= 0 and clean_lines.elided[y1][x1] == '(':
-        _, y2, x2 = CloseExpression(clean_lines, y1, x1)
-        if x2 >= 0:
-          extended_line = clean_lines.elided[y2][x2:]
-          if y2 < clean_lines.NumLines() - 1:
-            extended_line += clean_lines.elided[y2 + 1]
-          if Match(r'\s*(?:->|\[)', extended_line):
-            parenthesis_error = True
-
-    if parenthesis_error:
-      error(filename, linenum, 'readability/casting', 4,
-            ('Are you taking an address of something dereferenced '
-             'from a cast?  Wrapping the dereferenced expression in '
-             'parentheses will make the binding more obvious'))
-    else:
-      error(filename, linenum, 'runtime/casting', 4,
-            ('Are you taking an address of a cast?  '
-             'This is dangerous: could be a temp var.  '
-             'Take the address before doing the cast, rather than after'))
-
-
-def CheckCStyleCast(filename, clean_lines, linenum, cast_type, pattern, error):
-  """Checks for a C-style cast by looking for the pattern.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    cast_type: The string for the C++ cast to recommend.  This is either
-      reinterpret_cast, static_cast, or const_cast, depending.
-    pattern: The regular expression used to find C-style casts.
-    error: The function to call with any errors found.
-
-  Returns:
-    True if an error was emitted.
-    False otherwise.
-  """
-  line = clean_lines.elided[linenum]
-  match = Search(pattern, line)
-  if not match:
-    return False
-
-  # Exclude lines with keywords that tend to look like casts
-  context = line[0:match.start(1) - 1]
-  if Match(r'.*\b(?:sizeof|alignof|alignas|[_A-Z][_A-Z0-9]*)\s*$', context):
-    return False
-
-  # Try expanding current context to see if we one level of
-  # parentheses inside a macro.
-  if linenum > 0:
-    for i in xrange(linenum - 1, max(0, linenum - 5), -1):
-      context = clean_lines.elided[i] + context
-  if Match(r'.*\b[_A-Z][_A-Z0-9]*\s*\((?:\([^()]*\)|[^()])*$', context):
-    return False
-
-  # operator++(int) and operator--(int)
-  if context.endswith(' operator++') or context.endswith(' operator--'):
-    return False
-
-  # A single unnamed argument for a function tends to look like old style cast.
-  # If we see those, don't issue warnings for deprecated casts.
-  remainder = line[match.end(0):]
-  if Match(r'^\s*(?:;|const\b|throw\b|final\b|override\b|[=>{),]|->)',
-           remainder):
-    return False
-
-  # At this point, all that should be left is actual casts.
-  error(filename, linenum, 'readability/casting', 4,
-        'Using C-style cast.  Use %s<%s>(...) instead' %
-        (cast_type, match.group(1)))
-
-  return True
-
-
-def ExpectingFunctionArgs(clean_lines, linenum):
-  """Checks whether where function type arguments are expected.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-
-  Returns:
-    True if the line at 'linenum' is inside something that expects arguments
-    of function types.
-  """
-  line = clean_lines.elided[linenum]
-  return (Match(r'^\s*MOCK_(CONST_)?METHOD\d+(_T)?\(', line) or
-          (linenum >= 2 and
-           (Match(r'^\s*MOCK_(?:CONST_)?METHOD\d+(?:_T)?\((?:\S+,)?\s*$',
-                  clean_lines.elided[linenum - 1]) or
-            Match(r'^\s*MOCK_(?:CONST_)?METHOD\d+(?:_T)?\(\s*$',
-                  clean_lines.elided[linenum - 2]) or
-            Search(r'\bstd::m?function\s*\<\s*$',
-                   clean_lines.elided[linenum - 1]))))
-
-
-_HEADERS_CONTAINING_TEMPLATES = (
-    ('<deque>', ('deque',)),
-    ('<functional>', ('unary_function', 'binary_function',
-                      'plus', 'minus', 'multiplies', 'divides', 'modulus',
-                      'negate',
-                      'equal_to', 'not_equal_to', 'greater', 'less',
-                      'greater_equal', 'less_equal',
-                      'logical_and', 'logical_or', 'logical_not',
-                      'unary_negate', 'not1', 'binary_negate', 'not2',
-                      'bind1st', 'bind2nd',
-                      'pointer_to_unary_function',
-                      'pointer_to_binary_function',
-                      'ptr_fun',
-                      'mem_fun_t', 'mem_fun', 'mem_fun1_t', 'mem_fun1_ref_t',
-                      'mem_fun_ref_t',
-                      'const_mem_fun_t', 'const_mem_fun1_t',
-                      'const_mem_fun_ref_t', 'const_mem_fun1_ref_t',
-                      'mem_fun_ref',
-                     )),
-    ('<limits>', ('numeric_limits',)),
-    ('<list>', ('list',)),
-    ('<map>', ('multimap',)),
-    ('<memory>', ('allocator', 'make_shared', 'make_unique', 'shared_ptr',
-                  'unique_ptr', 'weak_ptr')),
-    ('<queue>', ('queue', 'priority_queue',)),
-    ('<set>', ('multiset',)),
-    ('<stack>', ('stack',)),
-    ('<string>', ('char_traits', 'basic_string',)),
-    ('<tuple>', ('tuple',)),
-    ('<unordered_map>', ('unordered_map', 'unordered_multimap')),
-    ('<unordered_set>', ('unordered_set', 'unordered_multiset')),
-    ('<utility>', ('pair',)),
-    ('<vector>', ('vector',)),
-
-    # gcc extensions.
-    # Note: std::hash is their hash, ::hash is our hash
-    ('<hash_map>', ('hash_map', 'hash_multimap',)),
-    ('<hash_set>', ('hash_set', 'hash_multiset',)),
-    ('<slist>', ('slist',)),
-    )
-
-_HEADERS_MAYBE_TEMPLATES = (
-    ('<algorithm>', ('copy', 'max', 'min', 'min_element', 'sort',
-                     'transform',
-                    )),
-    ('<utility>', ('forward', 'make_pair', 'move', 'swap')),
-    )
-
-_RE_PATTERN_STRING = re.compile(r'\bstring\b')
-
-_re_pattern_headers_maybe_templates = []
-for _header, _templates in _HEADERS_MAYBE_TEMPLATES:
-  for _template in _templates:
-    # Match max<type>(..., ...), max(..., ...), but not foo->max, foo.max or
-    # 'type::max()'.
-    _re_pattern_headers_maybe_templates.append(
-        (re.compile(r'[^>.]\b' + _template + r'(<.*?>)?\([^\)]'),
-            _template,
-            _header))
-# Match set<type>, but not foo->set<type>, foo.set<type>
-_re_pattern_headers_maybe_templates.append(
-    (re.compile(r'[^>.]\bset\s*\<'),
-        'set<>',
-        '<set>'))
-# Match 'map<type> var' and 'std::map<type>(...)', but not 'map<type>(...)''
-_re_pattern_headers_maybe_templates.append(
-    (re.compile(r'(std\b::\bmap\s*\<)|(^(std\b::\b)map\b\(\s*\<)'),
-        'map<>',
-        '<map>'))
-
-# Other scripts may reach in and modify this pattern.
-_re_pattern_templates = []
-for _header, _templates in _HEADERS_CONTAINING_TEMPLATES:
-  for _template in _templates:
-    _re_pattern_templates.append(
-        (re.compile(r'(\<|\b)' + _template + r'\s*\<'),
-         _template + '<>',
-         _header))
-
-
-def FilesBelongToSameModule(filename_cc, filename_h):
-  """Check if these two filenames belong to the same module.
-
-  The concept of a 'module' here is a as follows:
-  foo.h, foo-inl.h, foo.cc, foo_test.cc and foo_unittest.cc belong to the
-  same 'module' if they are in the same directory.
-  some/path/public/xyzzy and some/path/internal/xyzzy are also considered
-  to belong to the same module here.
-
-  If the filename_cc contains a longer path than the filename_h, for example,
-  '/absolute/path/to/base/sysinfo.cc', and this file would include
-  'base/sysinfo.h', this function also produces the prefix needed to open the
-  header. This is used by the caller of this function to more robustly open the
-  header file. We don't have access to the real include paths in this context,
-  so we need this guesswork here.
-
-  Known bugs: tools/base/bar.cc and base/bar.h belong to the same module
-  according to this implementation. Because of this, this function gives
-  some false positives. This should be sufficiently rare in practice.
-
-  Args:
-    filename_cc: is the path for the source (e.g. .cc) file
-    filename_h: is the path for the header path
-
-  Returns:
-    Tuple with a bool and a string:
-    bool: True if filename_cc and filename_h belong to the same module.
-    string: the additional prefix needed to open the header file.
-  """
-  fileinfo_cc = FileInfo(filename_cc)
-  if not fileinfo_cc.Extension().lstrip('.') in GetNonHeaderExtensions():
-    return (False, '')
-
-  fileinfo_h = FileInfo(filename_h)
-  if not IsHeaderExtension(fileinfo_h.Extension().lstrip('.')):
-    return (False, '')
-
-  filename_cc = filename_cc[:-(len(fileinfo_cc.Extension()))]
-  matched_test_suffix = Search(_TEST_FILE_SUFFIX, fileinfo_cc.BaseName())
-  if matched_test_suffix:
-    filename_cc = filename_cc[:-len(matched_test_suffix.group(1))]
-
-  filename_cc = filename_cc.replace('/public/', '/')
-  filename_cc = filename_cc.replace('/internal/', '/')
-
-  filename_h = filename_h[:-(len(fileinfo_h.Extension()))]
-  if filename_h.endswith('-inl'):
-    filename_h = filename_h[:-len('-inl')]
-  filename_h = filename_h.replace('/public/', '/')
-  filename_h = filename_h.replace('/internal/', '/')
-
-  files_belong_to_same_module = filename_cc.endswith(filename_h)
-  common_path = ''
-  if files_belong_to_same_module:
-    common_path = filename_cc[:-len(filename_h)]
-  return files_belong_to_same_module, common_path
-
-
-def UpdateIncludeState(filename, include_dict, io=codecs):
-  """Fill up the include_dict with new includes found from the file.
-
-  Args:
-    filename: the name of the header to read.
-    include_dict: a dictionary in which the headers are inserted.
-    io: The io factory to use to read the file. Provided for testability.
-
-  Returns:
-    True if a header was successfully added. False otherwise.
-  """
-  headerfile = None
-  try:
-    with io.open(filename, 'r', 'utf8', 'replace') as headerfile:
-      linenum = 0
-      for line in headerfile:
-        linenum += 1
-        clean_line = CleanseComments(line)
-        match = _RE_PATTERN_INCLUDE.search(clean_line)
-        if match:
-          include = match.group(2)
-          include_dict.setdefault(include, linenum)
-    return True
-  except IOError:
-    return False
-
-
-
-def CheckForIncludeWhatYouUse(filename, clean_lines, include_state, error,
-                              io=codecs):
-  """Reports for missing stl includes.
-
-  This function will output warnings to make sure you are including the headers
-  necessary for the stl containers and functions that you use. We only give one
-  reason to include a header. For example, if you use both equal_to<> and
-  less<> in a .h file, only one (the latter in the file) of these will be
-  reported as a reason to include the <functional>.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    include_state: An _IncludeState instance.
-    error: The function to call with any errors found.
-    io: The IO factory to use to read the header file. Provided for unittest
-        injection.
-  """
-  required = {}  # A map of header name to linenumber and the template entity.
-                 # Example of required: { '<functional>': (1219, 'less<>') }
-
-  for linenum in xrange(clean_lines.NumLines()):
-    line = clean_lines.elided[linenum]
-    if not line or line[0] == '#':
-      continue
-
-    # String is special -- it is a non-templatized type in STL.
-    matched = _RE_PATTERN_STRING.search(line)
-    if matched:
-      # Don't warn about strings in non-STL namespaces:
-      # (We check only the first match per line; good enough.)
-      prefix = line[:matched.start()]
-      if prefix.endswith('std::') or not prefix.endswith('::'):
-        required['<string>'] = (linenum, 'string')
-
-    for pattern, template, header in _re_pattern_headers_maybe_templates:
-      if pattern.search(line):
-        required[header] = (linenum, template)
-
-    # The following function is just a speed up, no semantics are changed.
-    if not '<' in line:  # Reduces the cpu time usage by skipping lines.
-      continue
-
-    for pattern, template, header in _re_pattern_templates:
-      matched = pattern.search(line)
-      if matched:
-        # Don't warn about IWYU in non-STL namespaces:
-        # (We check only the first match per line; good enough.)
-        prefix = line[:matched.start()]
-        if prefix.endswith('std::') or not prefix.endswith('::'):
-          required[header] = (linenum, template)
-
-  # The policy is that if you #include something in foo.h you don't need to
-  # include it again in foo.cc. Here, we will look at possible includes.
-  # Let's flatten the include_state include_list and copy it into a dictionary.
-  include_dict = dict([item for sublist in include_state.include_list
-                       for item in sublist])
-
-  # Did we find the header for this file (if any) and successfully load it?
-  header_found = False
-
-  # Use the absolute path so that matching works properly.
-  abs_filename = FileInfo(filename).FullName()
-
-  # For Emacs's flymake.
-  # If cpplint is invoked from Emacs's flymake, a temporary file is generated
-  # by flymake and that file name might end with '_flymake.cc'. In that case,
-  # restore original file name here so that the corresponding header file can be
-  # found.
-  # e.g. If the file name is 'foo_flymake.cc', we should search for 'foo.h'
-  # instead of 'foo_flymake.h'
-  abs_filename = re.sub(r'_flymake\.cc$', '.cc', abs_filename)
-
-  # include_dict is modified during iteration, so we iterate over a copy of
-  # the keys.
-  header_keys = list(include_dict.keys())
-  for header in header_keys:
-    (same_module, common_path) = FilesBelongToSameModule(abs_filename, header)
-    fullpath = common_path + header
-    if same_module and UpdateIncludeState(fullpath, include_dict, io):
-      header_found = True
-
-  # If we can't find the header file for a .cc, assume it's because we don't
-  # know where to look. In that case we'll give up as we're not sure they
-  # didn't include it in the .h file.
-  # TODO(unknown): Do a better job of finding .h files so we are confident that
-  # not having the .h file means there isn't one.
-  if not header_found:
-    for extension in GetNonHeaderExtensions():
-      if filename.endswith('.' + extension):
-        return
-
-  # All the lines have been processed, report the errors found.
-  for required_header_unstripped in sorted(required, key=required.__getitem__):
-    template = required[required_header_unstripped][1]
-    if required_header_unstripped.strip('<>"') not in include_dict:
-      error(filename, required[required_header_unstripped][0],
-            'build/include_what_you_use', 4,
-            'Add #include ' + required_header_unstripped + ' for ' + template)
-
-
-_RE_PATTERN_EXPLICIT_MAKEPAIR = re.compile(r'\bmake_pair\s*<')
-
-
-def CheckMakePairUsesDeduction(filename, clean_lines, linenum, error):
-  """Check that make_pair's template arguments are deduced.
-
-  G++ 4.6 in C++11 mode fails badly if make_pair's template arguments are
-  specified explicitly, and such use isn't intended in any case.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-  match = _RE_PATTERN_EXPLICIT_MAKEPAIR.search(line)
-  if match:
-    error(filename, linenum, 'build/explicit_make_pair',
-          4,  # 4 = high confidence
-          'For C++11-compatibility, omit template arguments from make_pair'
-          ' OR use pair directly OR if appropriate, construct a pair directly')
-
-
-def CheckRedundantVirtual(filename, clean_lines, linenum, error):
-  """Check if line contains a redundant "virtual" function-specifier.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  # Look for "virtual" on current line.
-  line = clean_lines.elided[linenum]
-  virtual = Match(r'^(.*)(\bvirtual\b)(.*)$', line)
-  if not virtual: return
-
-  # Ignore "virtual" keywords that are near access-specifiers.  These
-  # are only used in class base-specifier and do not apply to member
-  # functions.
-  if (Search(r'\b(public|protected|private)\s+$', virtual.group(1)) or
-      Match(r'^\s+(public|protected|private)\b', virtual.group(3))):
-    return
-
-  # Ignore the "virtual" keyword from virtual base classes.  Usually
-  # there is a column on the same line in these cases (virtual base
-  # classes are rare in google3 because multiple inheritance is rare).
-  if Match(r'^.*[^:]:[^:].*$', line): return
-
-  # Look for the next opening parenthesis.  This is the start of the
-  # parameter list (possibly on the next line shortly after virtual).
-  # TODO(unknown): doesn't work if there are virtual functions with
-  # decltype() or other things that use parentheses, but csearch suggests
-  # that this is rare.
-  end_col = -1
-  end_line = -1
-  start_col = len(virtual.group(2))
-  for start_line in xrange(linenum, min(linenum + 3, clean_lines.NumLines())):
-    line = clean_lines.elided[start_line][start_col:]
-    parameter_list = Match(r'^([^(]*)\(', line)
-    if parameter_list:
-      # Match parentheses to find the end of the parameter list
-      (_, end_line, end_col) = CloseExpression(
-          clean_lines, start_line, start_col + len(parameter_list.group(1)))
-      break
-    start_col = 0
-
-  if end_col < 0:
-    return  # Couldn't find end of parameter list, give up
-
-  # Look for "override" or "final" after the parameter list
-  # (possibly on the next few lines).
-  for i in xrange(end_line, min(end_line + 3, clean_lines.NumLines())):
-    line = clean_lines.elided[i][end_col:]
-    match = Search(r'\b(override|final)\b', line)
-    if match:
-      error(filename, linenum, 'readability/inheritance', 4,
-            ('"virtual" is redundant since function is '
-             'already declared as "%s"' % match.group(1)))
-
-    # Set end_col to check whole lines after we are done with the
-    # first line.
-    end_col = 0
-    if Search(r'[^\w]\s*$', line):
-      break
-
-
-def CheckRedundantOverrideOrFinal(filename, clean_lines, linenum, error):
-  """Check if line contains a redundant "override" or "final" virt-specifier.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  # Look for closing parenthesis nearby.  We need one to confirm where
-  # the declarator ends and where the virt-specifier starts to avoid
-  # false positives.
-  line = clean_lines.elided[linenum]
-  declarator_end = line.rfind(')')
-  if declarator_end >= 0:
-    fragment = line[declarator_end:]
-  else:
-    if linenum > 1 and clean_lines.elided[linenum - 1].rfind(')') >= 0:
-      fragment = line
-    else:
-      return
-
-  # Check that at most one of "override" or "final" is present, not both
-  if Search(r'\boverride\b', fragment) and Search(r'\bfinal\b', fragment):
-    error(filename, linenum, 'readability/inheritance', 4,
-          ('"override" is redundant since function is '
-           'already declared as "final"'))
-
-
-
-
-# Returns true if we are at a new block, and it is directly
-# inside of a namespace.
-def IsBlockInNameSpace(nesting_state, is_forward_declaration):
-  """Checks that the new block is directly in a namespace.
-
-  Args:
-    nesting_state: The _NestingState object that contains info about our state.
-    is_forward_declaration: If the class is a forward declared class.
-  Returns:
-    Whether or not the new block is directly in a namespace.
-  """
-  if is_forward_declaration:
-    return len(nesting_state.stack) >= 1 and (
-      isinstance(nesting_state.stack[-1], _NamespaceInfo))
-
-
-  return (len(nesting_state.stack) > 1 and
-          nesting_state.stack[-1].check_namespace_indentation and
-          isinstance(nesting_state.stack[-2], _NamespaceInfo))
-
-
-def ShouldCheckNamespaceIndentation(nesting_state, is_namespace_indent_item,
-                                    raw_lines_no_comments, linenum):
-  """This method determines if we should apply our namespace indentation check.
-
-  Args:
-    nesting_state: The current nesting state.
-    is_namespace_indent_item: If we just put a new class on the stack, True.
-      If the top of the stack is not a class, or we did not recently
-      add the class, False.
-    raw_lines_no_comments: The lines without the comments.
-    linenum: The current line number we are processing.
-
-  Returns:
-    True if we should apply our namespace indentation check. Currently, it
-    only works for classes and namespaces inside of a namespace.
-  """
-
-  is_forward_declaration = IsForwardClassDeclaration(raw_lines_no_comments,
-                                                     linenum)
-
-  if not (is_namespace_indent_item or is_forward_declaration):
-    return False
-
-  # If we are in a macro, we do not want to check the namespace indentation.
-  if IsMacroDefinition(raw_lines_no_comments, linenum):
-    return False
-
-  return IsBlockInNameSpace(nesting_state, is_forward_declaration)
-
-
-# Call this method if the line is directly inside of a namespace.
-# If the line above is blank (excluding comments) or the start of
-# an inner namespace, it cannot be indented.
-def CheckItemIndentationInNamespace(filename, raw_lines_no_comments, linenum,
-                                    error):
-  line = raw_lines_no_comments[linenum]
-  if Match(r'^\s+', line):
-    error(filename, linenum, 'runtime/indentation_namespace', 4,
-          'Do not indent within a namespace')
-
-
-def ProcessLine(filename, file_extension, clean_lines, line,
-                include_state, function_state, nesting_state, error,
-                extra_check_functions=None):
-  """Processes a single line in the file.
-
-  Args:
-    filename: Filename of the file that is being processed.
-    file_extension: The extension (dot not included) of the file.
-    clean_lines: An array of strings, each representing a line of the file,
-                 with comments stripped.
-    line: Number of line being processed.
-    include_state: An _IncludeState instance in which the headers are inserted.
-    function_state: A _FunctionState instance which counts function lines, etc.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    error: A callable to which errors are reported, which takes 4 arguments:
-           filename, line number, error level, and message
-    extra_check_functions: An array of additional check functions that will be
-                           run on each source line. Each function takes 4
-                           arguments: filename, clean_lines, line, error
-  """
-  raw_lines = clean_lines.raw_lines
-  ParseNolintSuppressions(filename, raw_lines[line], line, error)
-  nesting_state.Update(filename, clean_lines, line, error)
-  CheckForNamespaceIndentation(filename, nesting_state, clean_lines, line,
-                               error)
-  if nesting_state.InAsmBlock(): return
-  CheckForFunctionLengths(filename, clean_lines, line, function_state, error)
-  CheckForMultilineCommentsAndStrings(filename, clean_lines, line, error)
-  CheckStyle(filename, clean_lines, line, file_extension, nesting_state, error)
-  CheckLanguage(filename, clean_lines, line, file_extension, include_state,
-                nesting_state, error)
-  CheckForNonConstReference(filename, clean_lines, line, nesting_state, error)
-  CheckForNonStandardConstructs(filename, clean_lines, line,
-                                nesting_state, error)
-  CheckVlogArguments(filename, clean_lines, line, error)
-  CheckPosixThreading(filename, clean_lines, line, error)
-  CheckInvalidIncrement(filename, clean_lines, line, error)
-  CheckMakePairUsesDeduction(filename, clean_lines, line, error)
-  CheckRedundantVirtual(filename, clean_lines, line, error)
-  CheckRedundantOverrideOrFinal(filename, clean_lines, line, error)
-  if extra_check_functions:
-    for check_fn in extra_check_functions:
-      check_fn(filename, clean_lines, line, error)
-
-def FlagCxx11Features(filename, clean_lines, linenum, error):
-  """Flag those c++11 features that we only allow in certain places.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  include = Match(r'\s*#\s*include\s+[<"]([^<"]+)[">]', line)
-
-  # Flag unapproved C++ TR1 headers.
-  if include and include.group(1).startswith('tr1/'):
-    error(filename, linenum, 'build/c++tr1', 5,
-          ('C++ TR1 headers such as <%s> are unapproved.') % include.group(1))
-
-  # Flag unapproved C++11 headers.
-  if include and include.group(1) in ('cfenv',
-                                      'condition_variable',
-                                      'fenv.h',
-                                      'future',
-                                      'mutex',
-                                      'thread',
-                                      'chrono',
-                                      'ratio',
-                                      'regex',
-                                      'system_error',
-                                     ):
-    error(filename, linenum, 'build/c++11', 5,
-          ('<%s> is an unapproved C++11 header.') % include.group(1))
-
-  # The only place where we need to worry about C++11 keywords and library
-  # features in preprocessor directives is in macro definitions.
-  if Match(r'\s*#', line) and not Match(r'\s*#\s*define\b', line): return
-
-  # These are classes and free functions.  The classes are always
-  # mentioned as std::*, but we only catch the free functions if
-  # they're not found by ADL.  They're alphabetical by header.
-  for top_name in (
-      # type_traits
-      'alignment_of',
-      'aligned_union',
-      ):
-    if Search(r'\bstd::%s\b' % top_name, line):
-      error(filename, linenum, 'build/c++11', 5,
-            ('std::%s is an unapproved C++11 class or function.  Send c-style '
-             'an example of where it would make your code more readable, and '
-             'they may let you use it.') % top_name)
-
-
-def FlagCxx14Features(filename, clean_lines, linenum, error):
-  """Flag those C++14 features that we restrict.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  include = Match(r'\s*#\s*include\s+[<"]([^<"]+)[">]', line)
-
-  # Flag unapproved C++14 headers.
-  if include and include.group(1) in ('scoped_allocator', 'shared_mutex'):
-    error(filename, linenum, 'build/c++14', 5,
-          ('<%s> is an unapproved C++14 header.') % include.group(1))
-
-
-def ProcessFileData(filename, file_extension, lines, error,
-                    extra_check_functions=None):
-  """Performs lint checks and reports any errors to the given error function.
-
-  Args:
-    filename: Filename of the file that is being processed.
-    file_extension: The extension (dot not included) of the file.
-    lines: An array of strings, each representing a line of the file, with the
-           last element being empty if the file is terminated with a newline.
-    error: A callable to which errors are reported, which takes 4 arguments:
-           filename, line number, error level, and message
-    extra_check_functions: An array of additional check functions that will be
-                           run on each source line. Each function takes 4
-                           arguments: filename, clean_lines, line, error
-  """
-  lines = (['// marker so line numbers and indices both start at 1'] + lines +
-           ['// marker so line numbers end in a known way'])
-
-  include_state = _IncludeState()
-  function_state = _FunctionState()
-  nesting_state = NestingState()
-
-  ResetNolintSuppressions()
-
-  CheckForCopyright(filename, lines, error)
-  ProcessGlobalSuppresions(lines)
-  RemoveMultiLineComments(filename, lines, error)
-  clean_lines = CleansedLines(lines)
-
-  if IsHeaderExtension(file_extension):
-    CheckForHeaderGuard(filename, clean_lines, error)
-
-  for line in xrange(clean_lines.NumLines()):
-    ProcessLine(filename, file_extension, clean_lines, line,
-                include_state, function_state, nesting_state, error,
-                extra_check_functions)
-    FlagCxx11Features(filename, clean_lines, line, error)
-  nesting_state.CheckCompletedBlocks(filename, error)
-
-  CheckForIncludeWhatYouUse(filename, clean_lines, include_state, error)
-
-  # Check that the .cc file has included its header if it exists.
-  if _IsSourceExtension(file_extension):
-    CheckHeaderFileIncluded(filename, include_state, error)
-
-  # We check here rather than inside ProcessLine so that we see raw
-  # lines rather than "cleaned" lines.
-  CheckForBadCharacters(filename, lines, error)
-
-  CheckForNewlineAtEOF(filename, lines, error)
-
-def ProcessConfigOverrides(filename):
-  """ Loads the configuration files and processes the config overrides.
-
-  Args:
-    filename: The name of the file being processed by the linter.
-
-  Returns:
-    False if the current |filename| should not be processed further.
-  """
-
-  abs_filename = os.path.abspath(filename)
-  cfg_filters = []
-  keep_looking = True
-  while keep_looking:
-    abs_path, base_name = os.path.split(abs_filename)
-    if not base_name:
-      break  # Reached the root directory.
-
-    cfg_file = os.path.join(abs_path, "CPPLINT.cfg")
-    abs_filename = abs_path
-    if not os.path.isfile(cfg_file):
-      continue
-
-    try:
-      with open(cfg_file) as file_handle:
-        for line in file_handle:
-          line, _, _ = line.partition('#')  # Remove comments.
-          if not line.strip():
-            continue
-
-          name, _, val = line.partition('=')
-          name = name.strip()
-          val = val.strip()
-          if name == 'set noparent':
-            keep_looking = False
-          elif name == 'filter':
-            cfg_filters.append(val)
-          elif name == 'exclude_files':
-            # When matching exclude_files pattern, use the base_name of
-            # the current file name or the directory name we are processing.
-            # For example, if we are checking for lint errors in /foo/bar/baz.cc
-            # and we found the .cfg file at /foo/CPPLINT.cfg, then the config
-            # file's "exclude_files" filter is meant to be checked against "bar"
-            # and not "baz" nor "bar/baz.cc".
-            if base_name:
-              pattern = re.compile(val)
-              if pattern.match(base_name):
-                if _cpplint_state.quiet:
-                  # Suppress "Ignoring file" warning when using --quiet.
-                  return False
-                _cpplint_state.PrintInfo('Ignoring "%s": file excluded by "%s". '
-                                 'File path component "%s" matches '
-                                 'pattern "%s"\n' %
-                                 (filename, cfg_file, base_name, val))
-                return False
-          elif name == 'linelength':
-            global _line_length
-            try:
-              _line_length = int(val)
-            except ValueError:
-              _cpplint_state.PrintError('Line length must be numeric.')
-          elif name == 'extensions':
-            ProcessExtensionsOption(val)
-          elif name == 'root':
-            global _root
-            # root directories are specified relative to CPPLINT.cfg dir.
-            _root = os.path.join(os.path.dirname(cfg_file), val)
-          elif name == 'headers':
-            ProcessHppHeadersOption(val)
-          elif name == 'includeorder':
-            ProcessIncludeOrderOption(val)
-          else:
-            _cpplint_state.PrintError(
-                'Invalid configuration option (%s) in file %s\n' %
-                (name, cfg_file))
-
-    except IOError:
-      _cpplint_state.PrintError(
-          "Skipping config file '%s': Can't open for reading\n" % cfg_file)
-      keep_looking = False
-
-  # Apply all the accumulated filters in reverse order (top-level directory
-  # config options having the least priority).
-  for cfg_filter in reversed(cfg_filters):
-    _AddFilters(cfg_filter)
-
-  return True
-
-
-def ProcessFile(filename, vlevel, extra_check_functions=None):
-  """Does google-lint on a single file.
-
-  Args:
-    filename: The name of the file to parse.
-
-    vlevel: The level of errors to report.  Every error of confidence
-    >= verbose_level will be reported.  0 is a good default.
-
-    extra_check_functions: An array of additional check functions that will be
-                           run on each source line. Each function takes 4
-                           arguments: filename, clean_lines, line, error
-  """
-
-  _SetVerboseLevel(vlevel)
-  _BackupFilters()
-  old_errors = _cpplint_state.error_count
-
-  if not ProcessConfigOverrides(filename):
-    _RestoreFilters()
-    return
-
-  lf_lines = []
-  crlf_lines = []
-  try:
-    # Support the UNIX convention of using "-" for stdin.  Note that
-    # we are not opening the file with universal newline support
-    # (which codecs doesn't support anyway), so the resulting lines do
-    # contain trailing '\r' characters if we are reading a file that
-    # has CRLF endings.
-    # If after the split a trailing '\r' is present, it is removed
-    # below.
-    if filename == '-':
-      lines = codecs.StreamReaderWriter(sys.stdin,
-                                        codecs.getreader('utf8'),
-                                        codecs.getwriter('utf8'),
-                                        'replace').read().split('\n')
-    else:
-      with codecs.open(filename, 'r', 'utf8', 'replace') as target_file:
-        lines = target_file.read().split('\n')
-
-    # Remove trailing '\r'.
-    # The -1 accounts for the extra trailing blank line we get from split()
-    for linenum in range(len(lines) - 1):
-      if lines[linenum].endswith('\r'):
-        lines[linenum] = lines[linenum].rstrip('\r')
-        crlf_lines.append(linenum + 1)
-      else:
-        lf_lines.append(linenum + 1)
-
-  except IOError:
-    _cpplint_state.PrintError(
-        "Skipping input '%s': Can't open for reading\n" % filename)
-    _RestoreFilters()
-    return
-
-  # Note, if no dot is found, this will give the entire filename as the ext.
-  file_extension = filename[filename.rfind('.') + 1:]
-
-  # When reading from stdin, the extension is unknown, so no cpplint tests
-  # should rely on the extension.
-  if filename != '-' and file_extension not in GetAllExtensions():
-    pass
-    # Ignition: never print this
-    # _cpplint_state.PrintError('Ignoring %s; not a valid file name '
-    #                 '(%s)\n' % (filename, ', '.join(GetAllExtensions())))
-  else:
-    ProcessFileData(filename, file_extension, lines, Error,
-                    extra_check_functions)
-
-    # If end-of-line sequences are a mix of LF and CR-LF, issue
-    # warnings on the lines with CR.
-    #
-    # Don't issue any warnings if all lines are uniformly LF or CR-LF,
-    # since critique can handle these just fine, and the style guide
-    # doesn't dictate a particular end of line sequence.
-    #
-    # We can't depend on os.linesep to determine what the desired
-    # end-of-line sequence should be, since that will return the
-    # server-side end-of-line sequence.
-    if lf_lines and crlf_lines:
-      # Warn on every line with CR.  An alternative approach might be to
-      # check whether the file is mostly CRLF or just LF, and warn on the
-      # minority, we bias toward LF here since most tools prefer LF.
-      for linenum in crlf_lines:
-        Error(filename, linenum, 'whitespace/newline', 1,
-              'Unexpected \\r (^M) found; better to use only \\n')
-
-  # Suppress printing anything if --quiet was passed unless the error
-  # count has increased after processing this file.
-  if not _cpplint_state.quiet or old_errors != _cpplint_state.error_count:
-    pass
-    # Ignition: never print "Done Processing"
-    # _cpplint_state.PrintInfo('Done processing %s\n' % filename)
-  _RestoreFilters()
-
-
-def PrintUsage(message):
-  """Prints a brief usage string and exits, optionally with an error message.
-
-  Args:
-    message: The optional error message.
-  """
-  sys.stderr.write(_USAGE  % (list(GetAllExtensions()),
-       ','.join(list(GetAllExtensions())),
-       GetHeaderExtensions(),
-       ','.join(GetHeaderExtensions())))
-
-  if message:
-    sys.exit('\nFATAL ERROR: ' + message)
-  else:
-    sys.exit(0)
-
-def PrintVersion():
-  sys.stdout.write('Cpplint fork (https://github.com/cpplint/cpplint)\n')
-  sys.stdout.write('cpplint ' + __VERSION__ + '\n')
-  sys.stdout.write('Python ' + sys.version + '\n')
-  sys.exit(0)
-
-def PrintCategories():
-  """Prints a list of all the error-categories used by error messages.
-
-  These are the categories used to filter messages via --filter.
-  """
-  sys.stderr.write(''.join('  %s\n' % cat for cat in _ERROR_CATEGORIES))
-  sys.exit(0)
-
-
-def ParseArguments(args):
-  """Parses the command line arguments.
-
-  This may set the output format and verbosity level as side-effects.
-
-  Args:
-    args: The command line arguments:
-
-  Returns:
-    The list of filenames to lint.
-  """
-  try:
-    (opts, filenames) = getopt.getopt(args, '', ['help', 'output=', 'verbose=',
-                                                 'v=',
-                                                 'version',
-                                                 'counting=',
-                                                 'filter=',
-                                                 'root=',
-                                                 'repository=',
-                                                 'linelength=',
-                                                 'extensions=',
-                                                 'exclude=',
-                                                 'recursive',
-                                                 'headers=',
-                                                 'includeorder=',
-                                                 'quiet'])
-  except getopt.GetoptError:
-    PrintUsage('Invalid arguments.')
-
-  verbosity = _VerboseLevel()
-  output_format = _OutputFormat()
-  filters = ''
-  quiet = _Quiet()
-  counting_style = ''
-  recursive = False
-
-  for (opt, val) in opts:
-    if opt == '--help':
-      PrintUsage(None)
-    if opt == '--version':
-      PrintVersion()
-    elif opt == '--output':
-      if val not in ('emacs', 'vs7', 'eclipse', 'junit', 'sed', 'gsed'):
-        PrintUsage('The only allowed output formats are emacs, vs7, eclipse '
-                   'sed, gsed and junit.')
-      output_format = val
-    elif opt == '--quiet':
-      quiet = True
-    elif opt == '--verbose' or opt == '--v':
-      verbosity = int(val)
-    elif opt == '--filter':
-      filters = val
-      if not filters:
-        PrintCategories()
-    elif opt == '--counting':
-      if val not in ('total', 'toplevel', 'detailed'):
-        PrintUsage('Valid counting options are total, toplevel, and detailed')
-      counting_style = val
-    elif opt == '--root':
-      global _root
-      _root = val
-    elif opt == '--repository':
-      global _repository
-      _repository = val
-    elif opt == '--linelength':
-      global _line_length
-      try:
-        _line_length = int(val)
-      except ValueError:
-        PrintUsage('Line length must be digits.')
-    elif opt == '--exclude':
-      global _excludes
-      if not _excludes:
-        _excludes = set()
-      _excludes.update(glob.glob(val))
-    elif opt == '--extensions':
-      ProcessExtensionsOption(val)
-    elif opt == '--headers':
-      ProcessHppHeadersOption(val)
-    elif opt == '--recursive':
-      recursive = True
-    elif opt == '--includeorder':
-      ProcessIncludeOrderOption(val)
-
-  if not filenames:
-    PrintUsage('No files were specified.')
-
-  if recursive:
-    filenames = _ExpandDirectories(filenames)
-
-  if _excludes:
-    filenames = _FilterExcludedFiles(filenames)
-
-  _SetOutputFormat(output_format)
-  _SetQuiet(quiet)
-  _SetVerboseLevel(verbosity)
-  _SetFilters(filters)
-  _SetCountingStyle(counting_style)
-
-  filenames.sort()
-  return filenames
-
-def _ExpandDirectories(filenames):
-  """Searches a list of filenames and replaces directories in the list with
-  all files descending from those directories. Files with extensions not in
-  the valid extensions list are excluded.
-
-  Args:
-    filenames: A list of files or directories
-
-  Returns:
-    A list of all files that are members of filenames or descended from a
-    directory in filenames
-  """
-  expanded = set()
-  for filename in filenames:
-    if not os.path.isdir(filename):
-      expanded.add(filename)
-      continue
-
-    for root, _, files in os.walk(filename):
-      for loopfile in files:
-        fullname = os.path.join(root, loopfile)
-        if fullname.startswith('.' + os.path.sep):
-          fullname = fullname[len('.' + os.path.sep):]
-        expanded.add(fullname)
-
-  filtered = []
-  for filename in expanded:
-    if os.path.splitext(filename)[1][1:] in GetAllExtensions():
-      filtered.append(filename)
-  return filtered
-
-def _FilterExcludedFiles(fnames):
-  """Filters out files listed in the --exclude command line switch. File paths
-  in the switch are evaluated relative to the current working directory
-  """
-  exclude_paths = [os.path.abspath(f) for f in _excludes]
-  # because globbing does not work recursively, exclude all subpath of all excluded entries
-  return [f for f in fnames
-          if not any(e for e in exclude_paths
-                  if _IsParentOrSame(e, os.path.abspath(f)))]
-
-def _IsParentOrSame(parent, child):
-  """Return true if child is subdirectory of parent.
-  Assumes both paths are absolute and don't contain symlinks.
-  """
-  parent = os.path.normpath(parent)
-  child = os.path.normpath(child)
-  if parent == child:
-    return True
-
-  prefix = os.path.commonprefix([parent, child])
-  if prefix != parent:
-    return False
-  # Note: os.path.commonprefix operates on character basis, so
-  # take extra care of situations like '/foo/ba' and '/foo/bar/baz'
-  child_suffix = child[len(prefix):]
-  child_suffix = child_suffix.lstrip(os.sep)
-  return child == os.path.join(prefix, child_suffix)
-
-def main():
-  filenames = ParseArguments(sys.argv[1:])
-  backup_err = sys.stderr
-  try:
-    # Change stderr to write with replacement characters so we don't die
-    # if we try to print something containing non-ASCII characters.
-    sys.stderr = codecs.StreamReader(sys.stderr, 'replace')
-
-    _cpplint_state.ResetErrorCounts()
-    for filename in filenames:
-      ProcessFile(filename, _cpplint_state.verbose_level)
-    # If --quiet is passed, suppress printing error count unless there are errors.
-    if not _cpplint_state.quiet or _cpplint_state.error_count > 0:
-      _cpplint_state.PrintErrorCounts()
-
-    if _cpplint_state.output_format == 'junit':
-      sys.stderr.write(_cpplint_state.FormatJUnitXML())
-
-  finally:
-    sys.stderr = backup_err
-
-  sys.exit(_cpplint_state.error_count > 0)
-
-
-if __name__ == '__main__':
-  main()
diff --git a/tools/cpplint_to_cppcheckxml.py b/tools/cpplint_to_cppcheckxml.py
deleted file mode 100644
index 2809ad9e8..000000000
--- a/tools/cpplint_to_cppcheckxml.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env python
-
-# Convert output from Google's cpplint.py to the cppcheck XML format for
-# consumption by the Jenkins cppcheck plugin.
-
-# Reads from stdin and writes to stderr (to mimic cppcheck)
-
-
-import sys
-import re
-import xml.sax.saxutils
-
-def cpplint_score_to_cppcheck_severity(score):
-    # I'm making this up
-    if score == 1:
-        return 'style'
-    elif score == 2:
-        return 'style'
-    elif score == 3:
-        return 'warning'
-    elif score == 4:
-        return 'warning'
-    elif score == 5:
-        return 'error'
-
-def parse():
-    # TODO: do this properly, using the xml module.
-    # Write header
-    sys.stderr.write('''<?xml version="1.0" encoding="UTF-8"?>\n''')
-    sys.stderr.write('''<results>\n''')
-
-    # Do line-by-line conversion
-    r = re.compile('([^:]*):([0-9]*):  ([^\[]*)\[([^\]]*)\] \[([0-9]*)\].*')
-
-    for l in sys.stdin.readlines():
-        m = r.match(l.strip())
-        if not m:
-            continue
-        g = m.groups()
-        if len(g) != 5:
-            continue
-        fname, lineno, rawmsg, label, score = g
-        # Protect Jenkins from bad XML, which makes it barf
-        msg = xml.sax.saxutils.escape(rawmsg)
-        severity = cpplint_score_to_cppcheck_severity(int(score))
-        sys.stderr.write('''<error file="%s" line="%s" id="%s" severity="%s" msg="%s"/>\n'''%(fname, lineno, label, severity, msg))
-
-    # Write footer
-    sys.stderr.write('''</results>\n''')
-
-
-if __name__ == '__main__':
-    parse()

From 910dddf161b7396cd20274b09387d75ef7d72670 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Tue, 14 Dec 2021 23:21:03 -0800
Subject: [PATCH 18/28] Remove sdf_build_tests macro

For some reason, the EXTRA_SRC argument isn't needed
with ign_build_tests, so remove sdf_build_tests
and the SDFORMAT_RUN_VALGRIND_TESTS option.
Also remove an unneeded copy of tools/check_test_ran.py

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 CMakeLists.txt          | 10 -----
 cmake/SDFUtils.cmake    | 84 -----------------------------------------
 src/CMakeLists.txt      | 43 ++++++++-------------
 test/CMakeLists.txt     |  2 +-
 tools/check_test_ran.py | 79 --------------------------------------
 5 files changed, 16 insertions(+), 202 deletions(-)
 delete mode 100755 tools/check_test_ran.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8158587c2..f234a0b86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,16 +77,6 @@ if (BUILD_SDF)
     ign_build_warning("Python psutil package not found. Memory leak tests will be skipped")
   endif()
 
-  ################################################
-  # Find Valgrind for checking memory leaks in the
-  # tests
-  find_program(VALGRIND_PROGRAM NAMES valgrind PATH ${VALGRIND_ROOT}/bin)
-  option(SDFORMAT_RUN_VALGRIND_TESTS "Run sdformat tests with Valgrind" FALSE)
-  mark_as_advanced(SDFORMAT_RUN_VALGRIND_TESTS)
-  if (SDFORMAT_RUN_VALGRIND_TESTS AND NOT VALGRIND_PROGRAM)
-    ign_build_warning("valgrind not found. Memory check tests will be skipped.")
-  endif()
-
   ################################################
   # Find ruby executable to produce xml schemas
   find_program(RUBY ruby)
diff --git a/cmake/SDFUtils.cmake b/cmake/SDFUtils.cmake
index e9c97152c..a1895c5cc 100644
--- a/cmake/SDFUtils.cmake
+++ b/cmake/SDFUtils.cmake
@@ -1,87 +1,3 @@
-#################################################
-# VAR: SDF_BUILD_TESTS_EXTRA_EXE_SRCS
-# Hack: extra sources to build binaries can be supplied to gz_build_tests in
-# the variable SDF_BUILD_TESTS_EXTRA_EXE_SRCS. This variable will be clean up
-# at the end of the function
-#
-include_directories(${PROJECT_SOURCE_DIR}/test/gtest/include)
-macro (sdf_build_tests)
-  # Build all the tests
-  foreach(GTEST_SOURCE_file ${ARGN})
-    string(REGEX REPLACE ".cc" "" BINARY_NAME ${GTEST_SOURCE_file})
-    set(BINARY_NAME ${TEST_TYPE}_${BINARY_NAME})
-
-    add_executable(${BINARY_NAME}
-      ${GTEST_SOURCE_file}
-      ${SDF_BUILD_TESTS_EXTRA_EXE_SRCS}
-    )
-
-    add_dependencies(${BINARY_NAME}
-      gtest gtest_main ${PROJECT_LIBRARY_TARGET_NAME}
-      )
-
-    link_directories(${IGNITION-MATH_LIBRARY_DIRS})
-    target_link_libraries(${BINARY_NAME} PRIVATE
-      gtest
-      gtest_main
-      ${IGNITION-MATH_LIBRARIES}
-      ${PROJECT_LIBRARY_TARGET_NAME}
-      ${tinyxml2_LIBRARIES})
-
-    if (UNIX)
-      target_link_libraries(${BINARY_NAME} PRIVATE
-        pthread
-      )
-    elseif(WIN32)
-      # Copy in sdformat library
-      add_custom_command(TARGET ${BINARY_NAME}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        $<TARGET_FILE:sdformat${PROJECT_VERSION_MAJOR}>
-        $<TARGET_FILE_DIR:${BINARY_NAME}> VERBATIM)
-
-    endif()
-
-    add_test(NAME ${BINARY_NAME} COMMAND
-      ${BINARY_NAME} --gtest_output=xml:${CMAKE_BINARY_DIR}/test_results/${BINARY_NAME}.xml)
-
-    set (_env_vars)
-    set (sdf_paths)
-
-    # Get all the sdf protocol directory names
-    file(GLOB dirs RELATIVE "${PROJECT_SOURCE_DIR}/sdf"
-         "${PROJECT_SOURCE_DIR}/sdf/*")
-    list(SORT dirs)
-
-    # Add each sdf protocol to the sdf_path variable
-    foreach(dir ${dirs})
-      if (IS_DIRECTORY ${PROJECT_SOURCE_DIR}/sdf/${dir})
-        set(sdf_paths "${PROJECT_SOURCE_DIR}/sdf/${dir}:${sdf_paths}")
-      endif()
-    endforeach()
-
-    # Set the SDF_PATH environment variable
-    list(APPEND _env_vars "SDF_PATH=${sdf_paths}")
-
-    set_tests_properties(${BINARY_NAME} PROPERTIES
-      TIMEOUT 240
-      ENVIRONMENT "${_env_vars}")
-
-    if(PYTHONINTERP_FOUND)
-      # Check that the test produced a result and create a failure if it didn't.
-      # Guards against crashed and timed out tests.
-      add_test(check_${BINARY_NAME} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/check_test_ran.py
-               ${CMAKE_BINARY_DIR}/test_results/${BINARY_NAME}.xml)
-    endif()
-
-    if(SDFORMAT_RUN_VALGRIND_TESTS AND VALGRIND_PROGRAM)
-      add_test(memcheck_${BINARY_NAME} ${VALGRIND_PROGRAM} --leak-check=full
-               --error-exitcode=1 --show-leak-kinds=all ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_NAME})
-    endif()
-  endforeach()
-
-  set(GZ_BUILD_TESTS_EXTRA_EXE_SRCS "")
-endmacro()
-
 #################################################
 # Copied from catkin/cmake/empy.cmake
 function(find_python_module module)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3f314d790..67d134180 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,3 @@
-include (${sdf_cmake_dir}/SDFUtils.cmake)
-
 link_directories(
   ${PROJECT_BINARY_DIR}/test
 )
@@ -86,6 +84,7 @@ if (BUILD_TESTING)
     Camera_TEST.cc
     Collision_TEST.cc
     Console_TEST.cc
+    Converter_TEST.cc
     Cylinder_TEST.cc
     Element_TEST.cc
     Error_TEST.cc
@@ -93,6 +92,7 @@ if (BUILD_TESTING)
     Frame_TEST.cc
     Filesystem_TEST.cc
     ForceTorque_TEST.cc
+    FrameSemantics_TEST.cc
     Geometry_TEST.cc
     Gui_TEST.cc
     Heightmap_TEST.cc
@@ -109,7 +109,9 @@ if (BUILD_TESTING)
     NavSat_TEST.cc
     Noise_TEST.cc
     Param_TEST.cc
+    ParamPassing_TEST.cc
     parser_TEST.cc
+    parser_urdf_TEST.cc
     ParticleEmitter_TEST.cc
     Pbr_TEST.cc
     Physics_TEST.cc
@@ -123,7 +125,9 @@ if (BUILD_TESTING)
     Sphere_TEST.cc
     Surface_TEST.cc
     Types_TEST.cc
+    Utils_TEST.cc
     Visual_TEST.cc
+    XmlUtils_TEST.cc
     World_TEST.cc
   )
 
@@ -148,48 +152,31 @@ if (BUILD_TESTING)
     )
   endif()
 
-  if (NOT WIN32)
-    set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS Utils.cc)
-    sdf_build_tests(Utils_TEST.cc)
-  endif()
-
-  if (NOT WIN32)
-    set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS XmlUtils.cc)
-    sdf_build_tests(XmlUtils_TEST.cc)
-    target_link_libraries(UNIT_XmlUtils_TEST PRIVATE
+  if (TARGET UNIT_XmlUtils_TEST)
+    target_link_libraries(UNIT_XmlUtils_TEST
       TINYXML2::TINYXML2)
   endif()
 
   if (NOT WIN32)
-    set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS FrameSemantics.cc)
-    sdf_build_tests(FrameSemantics_TEST.cc)
-  endif()
-
-  if (NOT WIN32)
-    set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS Converter.cc EmbeddedSdf.cc XmlUtils.cc)
-    sdf_build_tests(Converter_TEST.cc)
-    target_link_libraries(UNIT_Converter_TEST PRIVATE
+    target_link_libraries(UNIT_Converter_TEST
       TINYXML2::TINYXML2)
   endif()
 
   if (NOT WIN32)
-    set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS SDFExtension.cc parser_urdf.cc XmlUtils.cc)
-    sdf_build_tests(parser_urdf_TEST.cc)
     if (NOT USE_INTERNAL_URDF)
-      target_link_libraries(UNIT_parser_urdf_TEST PRIVATE IgnURDFDOM::IgnURDFDOM)
+      target_link_libraries(UNIT_parser_urdf_TEST
+        IgnURDFDOM::IgnURDFDOM)
     endif()
-    target_link_libraries(UNIT_parser_urdf_TEST PRIVATE
+    target_link_libraries(UNIT_parser_urdf_TEST
       TINYXML2::TINYXML2)
   endif()
 
   if (NOT WIN32)
-    set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS ParamPassing.cc XmlUtils.cc parser.cc
-          parser_urdf.cc FrameSemantics.cc Converter.cc EmbeddedSdf.cc SDFExtension.cc)
-    sdf_build_tests(ParamPassing_TEST.cc)
     if (NOT USE_INTERNAL_URDF)
-      target_link_libraries(UNIT_ParamPassing_TEST PRIVATE IgnURDFDOM::IgnURDFDOM)
+      target_link_libraries(UNIT_ParamPassing_TEST
+        IgnURDFDOM::IgnURDFDOM)
     endif()
-    target_link_libraries(UNIT_ParamPassing_TEST PRIVATE
+    target_link_libraries(UNIT_ParamPassing_TEST
       TINYXML2::TINYXML2)
   endif()
 endif()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c1bffcf4c..90d9e254d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,7 +3,7 @@ configure_file(test_config.h.in ${PROJECT_BINARY_DIR}/include/test_config.h)
 # Build gtest
 add_library(gtest STATIC gtest/src/gtest-all.cc)
 target_include_directories(gtest
-  PRIVATE
+  PUBLIC
     ${PROJECT_SOURCE_DIR}/test/gtest/include
     ${PROJECT_SOURCE_DIR}/test/gtest
 )
diff --git a/tools/check_test_ran.py b/tools/check_test_ran.py
deleted file mode 100755
index 304eb7cab..000000000
--- a/tools/check_test_ran.py
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env python
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2008, Willow Garage, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#  * Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above
-#    copyright notice, this list of conditions and the following
-#    disclaimer in the documentation and/or other materials provided
-#    with the distribution.
-#  * Neither the name of Willow Garage, Inc. nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# Revision $Id: check_test_ran.py 16671 2012-04-27 16:15:28Z dthomas $
-
-"""
-Writes a test failure out to test file if it doesn't exist.
-"""
-
-# Adapted from rosunit/check_test_ran.py
-
-from __future__ import print_function
-NAME="check_test_ran.py"
-
-import os
-import sys
-
-def usage():
-    print("""Usage:
-\t%s test-file.xml
-"""%(NAME), file=sys.stderr)
-    print(sys.argv)
-    sys.exit(getattr(os, 'EX_USAGE', 1))
-
-def check_main():
-    if len(sys.argv) < 2:
-        usage()
-    test_file = sys.argv[1]
-
-    print("Checking for test results in %s"%test_file)
-
-    if not os.path.exists(test_file):
-        if not os.path.exists(os.path.dirname(test_file)):
-            os.makedirs(os.path.dirname(test_file))
-
-        print("Cannot find results, writing failure results to", test_file)
-
-        with open(test_file, 'w') as f:
-            test_name = os.path.basename(test_file)
-            d = {'test': test_name, 'test_file': test_file }
-            f.write("""<?xml version="1.0" encoding="UTF-8"?>
-<testsuite tests="1" failures="1" time="1" errors="0" name="%(test)s">
-  <testcase name="test_ran" status="run" time="1" classname="Results">
-    <failure message="Unable to find test results for %(test)s, test did not run.\nExpected results in %(test_file)s" type=""/>
-  </testcase>
-</testsuite>"""%d)
-
-if __name__ == '__main__':
-    check_main()

From 15ad37e3876edcabdf1043ebb87e29337fb8d5ec Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Wed, 15 Dec 2021 00:07:43 -0800
Subject: [PATCH 19/28] Re-disable tests that don't work on windows

Also use ign_get_libsources_and_unittests helper

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 src/CMakeLists.txt | 143 +++++++--------------------------------------
 1 file changed, 22 insertions(+), 121 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 67d134180..a251d1ed3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,64 +2,13 @@ link_directories(
   ${PROJECT_BINARY_DIR}/test
 )
 
-set (sources
-  Actor.cc
-  AirPressure.cc
-  Altimeter.cc
-  Atmosphere.cc
-  Box.cc
-  Camera.cc
-  Collision.cc
-  Console.cc
-  Converter.cc
-  Cylinder.cc
-  Element.cc
-  EmbeddedSdf.cc
-  Error.cc
-  Exception.cc
-  Frame.cc
-  FrameSemantics.cc
-  Filesystem.cc
-  ForceTorque.cc
-  Geometry.cc
-  Gui.cc
-  Heightmap.cc
-  ign.cc
-  Imu.cc
-  Joint.cc
-  JointAxis.cc
-  Lidar.cc
-  Light.cc
-  Link.cc
-  Magnetometer.cc
-  Material.cc
-  Mesh.cc
-  Model.cc
-  NavSat.cc
-  Noise.cc
-  parser.cc
-  parser_urdf.cc
-  Param.cc
-  ParamPassing.cc
-  ParticleEmitter.cc
-  Pbr.cc
-  Physics.cc
-  Plane.cc
-  Root.cc
-  Scene.cc
-  SDF.cc
-  SDFExtension.cc
-  SemanticPose.cc
-  Sensor.cc
-  Sky.cc
-  Sphere.cc
-  Surface.cc
-  Types.cc
-  Utils.cc
-  Visual.cc
-  World.cc
-  XmlUtils.cc
-)
+# Collect source files into the "sources" variable and unit test files into the
+# "gtest_sources" variable
+ign_get_libsources_and_unittests(sources gtest_sources)
+
+# Add the source file auto-generated into the build folder from sdf/CMakeLists.txt
+list(APPEND sources EmbeddedSdf.cc)
+
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 if (USE_INTERNAL_URDF)
@@ -75,67 +24,19 @@ if (USE_INTERNAL_URDF)
 endif()
 
 if (BUILD_TESTING)
-  set (gtest_sources
-    Actor_TEST.cc
-    AirPressure_TEST.cc
-    Altimeter_TEST.cc
-    Atmosphere_TEST.cc
-    Box_TEST.cc
-    Camera_TEST.cc
-    Collision_TEST.cc
-    Console_TEST.cc
-    Converter_TEST.cc
-    Cylinder_TEST.cc
-    Element_TEST.cc
-    Error_TEST.cc
-    Exception_TEST.cc
-    Frame_TEST.cc
-    Filesystem_TEST.cc
-    ForceTorque_TEST.cc
-    FrameSemantics_TEST.cc
-    Geometry_TEST.cc
-    Gui_TEST.cc
-    Heightmap_TEST.cc
-    Imu_TEST.cc
-    Joint_TEST.cc
-    JointAxis_TEST.cc
-    Lidar_TEST.cc
-    Light_TEST.cc
-    Link_TEST.cc
-    Magnetometer_TEST.cc
-    Material_TEST.cc
-    Mesh_TEST.cc
-    Model_TEST.cc
-    NavSat_TEST.cc
-    Noise_TEST.cc
-    Param_TEST.cc
-    ParamPassing_TEST.cc
-    parser_TEST.cc
-    parser_urdf_TEST.cc
-    ParticleEmitter_TEST.cc
-    Pbr_TEST.cc
-    Physics_TEST.cc
-    Plane_TEST.cc
-    Root_TEST.cc
-    Scene_TEST.cc
-    SemanticPose_TEST.cc
-    SDF_TEST.cc
-    Sensor_TEST.cc
-    Sky_TEST.cc
-    Sphere_TEST.cc
-    Surface_TEST.cc
-    Types_TEST.cc
-    Utils_TEST.cc
-    Visual_TEST.cc
-    XmlUtils_TEST.cc
-    World_TEST.cc
-  )
-
   # Build this test file only if Ignition Tools is installed.
-  if (IGNITION-TOOLS_BINARY_DIRS)
-    set (gtest_sources ${gtest_sources}
-      ign_TEST.cc
-    )
+  if (NOT IGNITION-TOOLS_BINARY_DIRS)
+    list(REMOVE_ITEM gtest_sources ign_TEST.cc)
+  endif()
+
+  # Skip tests that don't work on Windows
+  if (WIN32)
+    list(REMOVE_ITEM gtest_sources Converter_TEST.cc)
+    list(REMOVE_ITEM gtest_sources FrameSemantics_TEST.cc)
+    list(REMOVE_ITEM gtest_sources ParamPassing_TEST.cc)
+    list(REMOVE_ITEM gtest_sources Utils_TEST.cc)
+    list(REMOVE_ITEM gtest_sources XmlUtils_TEST.cc)
+    list(REMOVE_ITEM gtest_sources parser_urdf_TEST.cc)
   endif()
 
   ign_build_tests(
@@ -157,12 +58,12 @@ if (BUILD_TESTING)
       TINYXML2::TINYXML2)
   endif()
 
-  if (NOT WIN32)
+  if (TARGET UNIT_Converter_TEST)
     target_link_libraries(UNIT_Converter_TEST
       TINYXML2::TINYXML2)
   endif()
 
-  if (NOT WIN32)
+  if (TARGET UNIT_parser_urdf_TEST)
     if (NOT USE_INTERNAL_URDF)
       target_link_libraries(UNIT_parser_urdf_TEST
         IgnURDFDOM::IgnURDFDOM)
@@ -171,7 +72,7 @@ if (BUILD_TESTING)
       TINYXML2::TINYXML2)
   endif()
 
-  if (NOT WIN32)
+  if (TARGET UNIT_ParamPassing_TEST)
     if (NOT USE_INTERNAL_URDF)
       target_link_libraries(UNIT_ParamPassing_TEST
         IgnURDFDOM::IgnURDFDOM)

From e66d899c554d7ae2b0c0fb2a68415db6fbd517e7 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 16 Dec 2021 00:02:39 -0800
Subject: [PATCH 20/28] Clean up some cmake code

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 CMakeLists.txt     |  8 +-------
 src/CMakeLists.txt | 18 +++++-------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f234a0b86..27c1a6c0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,16 +11,10 @@ project (sdformat10 VERSION 10.6.0)
 # It represents the current version of SDFormat implemented by the software
 set (SDF_PROTOCOL_VERSION 1.7)
 
-set (project_cmake_dir ${PROJECT_SOURCE_DIR}/cmake
-  CACHE PATH "Location of CMake scripts")
-
 OPTION(SDFORMAT_DISABLE_CONSOLE_LOGFILE "Disable the sdformat console logfile" OFF)
 
 set (BUILD_SDF ON CACHE INTERNAL "Build SDF" FORCE)
 
-set (sdf_cmake_dir ${PROJECT_SOURCE_DIR}/cmake CACHE PATH
-     "Location of CMake scripts")
-
 #################################################
 # Find ign-cmake
 find_package(ignition-cmake2 2.10 REQUIRED)
@@ -71,7 +65,7 @@ if (BUILD_SDF)
 
   ################################################
   # Find psutil python package for memory tests
-  include (${sdf_cmake_dir}/SDFUtils.cmake)
+  include (${PROJECT_SOURCE_DIR}/cmake/SDFUtils.cmake)
   find_python_module(psutil)
   if (NOT PY_PSUTIL)
     ign_build_warning("Python psutil package not found. Memory leak tests will be skipped")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a251d1ed3..b7b3fe81a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,3 @@
-link_directories(
-  ${PROJECT_BINARY_DIR}/test
-)
-
 # Collect source files into the "sources" variable and unit test files into the
 # "gtest_sources" variable
 ign_get_libsources_and_unittests(sources gtest_sources)
@@ -9,8 +5,6 @@ ign_get_libsources_and_unittests(sources gtest_sources)
 # Add the source file auto-generated into the build folder from sdf/CMakeLists.txt
 list(APPEND sources EmbeddedSdf.cc)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
 if (USE_INTERNAL_URDF)
   set(sources ${sources}
   urdf/urdf_parser/model.cpp
@@ -42,10 +36,11 @@ if (BUILD_TESTING)
   ign_build_tests(
     TYPE UNIT
     SOURCES ${gtest_sources}
-    INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/test
+    INCLUDE_DIRS
+      ${CMAKE_CURRENT_SOURCE_DIR}
+      ${PROJECT_SOURCE_DIR}/test
   )
 
-  include_directories(${PROJECT_SOURCE_DIR}/test)
   if (TARGET UNIT_ign_TEST)
     # Link the libraries that we always need.
     target_link_libraries("UNIT_ign_TEST"
@@ -84,11 +79,6 @@ endif()
 
 ign_create_core_library(SOURCES ${sources} CXX_STANDARD 17)
 
-target_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
     ignition-math${IGN_MATH_VER}::ignition-math${IGN_MATH_VER}
@@ -103,6 +93,8 @@ target_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/..>
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 if (USE_INTERNAL_URDF)

From 3a37dc8ad62dcefa3f36a696d97e140d6eaedabe Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 16 Dec 2021 00:31:01 -0800
Subject: [PATCH 21/28] Set USE_DEFAULT_VISIBILITY_HIDDEN to true

Use new ign-cmake option to hide symbols not
explicitly marked as visible. This requires
adding target_sources calls to fix linking
errors in unit tests that use hidden symbols.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 CMakeLists.txt     |  1 +
 src/CMakeLists.txt | 48 +++++++++++++++++++++++++++++++++++-----------
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27c1a6c0c..760051d79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,6 +88,7 @@ if (BUILD_SDF)
 
   message (STATUS "----------------------------------------\n")
 
+  set(USE_DEFAULT_VISIBILITY_HIDDEN TRUE)
   ign_configure_build(QUIT_IF_BUILD_ERRORS)
   ign_create_packages()
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b7b3fe81a..cf574e0df 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,32 +48,58 @@ if (BUILD_TESTING)
     )
   endif()
 
-  if (TARGET UNIT_XmlUtils_TEST)
-    target_link_libraries(UNIT_XmlUtils_TEST
-      TINYXML2::TINYXML2)
-  endif()
-
   if (TARGET UNIT_Converter_TEST)
     target_link_libraries(UNIT_Converter_TEST
       TINYXML2::TINYXML2)
+    target_sources(UNIT_Converter_TEST PRIVATE
+      Converter.cc
+      EmbeddedSdf.cc
+      XmlUtils.cc)
   endif()
 
-  if (TARGET UNIT_parser_urdf_TEST)
+  if (TARGET UNIT_FrameSemantics_TEST)
+    target_sources(UNIT_FrameSemantics_TEST PRIVATE FrameSemantics.cc)
+  endif()
+
+  if (TARGET UNIT_ParamPassing_TEST)
     if (NOT USE_INTERNAL_URDF)
-      target_link_libraries(UNIT_parser_urdf_TEST
+      target_link_libraries(UNIT_ParamPassing_TEST
         IgnURDFDOM::IgnURDFDOM)
     endif()
-    target_link_libraries(UNIT_parser_urdf_TEST
+    target_link_libraries(UNIT_ParamPassing_TEST
       TINYXML2::TINYXML2)
+    target_sources(UNIT_ParamPassing_TEST PRIVATE
+      Converter.cc
+      EmbeddedSdf.cc
+      FrameSemantics.cc
+      ParamPassing.cc
+      SDFExtension.cc
+      XmlUtils.cc
+      parser.cc
+      parser_urdf.cc)
   endif()
 
-  if (TARGET UNIT_ParamPassing_TEST)
+  if (TARGET UNIT_Utils_TEST)
+    target_sources(UNIT_Utils_TEST PRIVATE Utils.cc)
+  endif()
+
+  if (TARGET UNIT_XmlUtils_TEST)
+    target_link_libraries(UNIT_XmlUtils_TEST
+      TINYXML2::TINYXML2)
+    target_sources(UNIT_XmlUtils_TEST PRIVATE XmlUtils.cc)
+  endif()
+
+  if (TARGET UNIT_parser_urdf_TEST)
     if (NOT USE_INTERNAL_URDF)
-      target_link_libraries(UNIT_ParamPassing_TEST
+      target_link_libraries(UNIT_parser_urdf_TEST
         IgnURDFDOM::IgnURDFDOM)
     endif()
-    target_link_libraries(UNIT_ParamPassing_TEST
+    target_link_libraries(UNIT_parser_urdf_TEST
       TINYXML2::TINYXML2)
+    target_sources(UNIT_parser_urdf_TEST PRIVATE
+      SDFExtension.cc
+      XmlUtils.cc
+      parser_urdf.cc)
   endif()
 endif()
 

From e1aa625f2e12ba8e2ea69e854d49a3cf987d2080 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 16 Dec 2021 17:56:14 -0800
Subject: [PATCH 22/28] Use HIDE_SYMBOLS_BY_DEFAULT parameter

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 760051d79..c039009e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,8 +88,7 @@ if (BUILD_SDF)
 
   message (STATUS "----------------------------------------\n")
 
-  set(USE_DEFAULT_VISIBILITY_HIDDEN TRUE)
-  ign_configure_build(QUIT_IF_BUILD_ERRORS)
+  ign_configure_build(HIDE_SYMBOLS_BY_DEFAULT QUIT_IF_BUILD_ERRORS)
   ign_create_packages()
 
   add_subdirectory(sdf)

From e987976dfa28ef532dd6a2860232c5ce5cb2e678 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Sat, 18 Dec 2021 22:01:17 -0800
Subject: [PATCH 23/28] Set LEGACY_PROJECT_PREFIX and revert example cmake

Requires ignitionrobotics/ign-cmake#199

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 examples/CMakeLists.txt | 8 +++++---
 src/CMakeLists.txt      | 5 ++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 664bda830..298f0e6f9 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,12 +1,14 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
 find_package(sdformat10 REQUIRED)
-set(SDFORMAT_VER ${sdformat10_VERSION_MAJOR})
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 
+include_directories(${SDFormat_INCLUDE_DIRS})
+link_directories(${SDFormat_LIBRARY_DIRS})
+
 add_executable(simple simple.cc)
-target_link_libraries(simple sdformat${SDFORMAT_VER}::sdformat${SDFORMAT_VER})
+target_link_libraries(simple ${SDFormat_LIBRARIES})
 
 add_executable(dom dom.cc)
-target_link_libraries(dom sdformat${SDFORMAT_VER}::sdformat${SDFORMAT_VER})
+target_link_libraries(dom ${SDFormat_LIBRARIES})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cf574e0df..fb50661b1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -103,7 +103,10 @@ if (BUILD_TESTING)
   endif()
 endif()
 
-ign_create_core_library(SOURCES ${sources} CXX_STANDARD 17)
+ign_create_core_library(SOURCES ${sources}
+  CXX_STANDARD 17
+  LEGACY_PROJECT_PREFIX SDFormat
+  )
 
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC

From 795e10192d0a03859fab5fbe5c719fa2abd932ba Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Tue, 21 Dec 2021 15:38:54 -0800
Subject: [PATCH 24/28] Add comment, remove messages and find python

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 CMakeLists.txt | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c039009e2..eca3d1830 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,7 @@ set (SDF_PROTOCOL_VERSION 1.7)
 
 OPTION(SDFORMAT_DISABLE_CONSOLE_LOGFILE "Disable the sdformat console logfile" OFF)
 
+# BUILD_SDF is preserved for backwards compatibility but can be removed on the main branch
 set (BUILD_SDF ON CACHE INTERNAL "Build SDF" FORCE)
 
 #################################################
@@ -25,9 +26,6 @@ if (BUILD_SDF)
     NO_IGNITION_PREFIX
     REPLACE_IGNITION_INCLUDE_PATH sdf)
 
-  message (STATUS "\n\n====== Finding 3rd Party Packages ======")
-  message(STATUS "Building for arch: ${ARCH}")
-
   #################################################
   # Find tinyxml2.
   ign_find_package(TINYXML2 REQUIRED)
@@ -58,11 +56,6 @@ if (BUILD_SDF)
   # Find ign command line utility:
   ign_find_package(ignition-tools)
 
-  ################################################
-  # Find the Python interpreter for running the
-  # check_test_ran.py script
-  find_package(PythonInterp 3 QUIET)
-
   ################################################
   # Find psutil python package for memory tests
   include (${PROJECT_SOURCE_DIR}/cmake/SDFUtils.cmake)
@@ -86,7 +79,6 @@ if (BUILD_SDF)
   ign_find_package(ignition-math6 VERSION REQUIRED)
   set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
 
-  message (STATUS "----------------------------------------\n")
 
   ign_configure_build(HIDE_SYMBOLS_BY_DEFAULT QUIT_IF_BUILD_ERRORS)
   ign_create_packages()

From c1ae0a3b3ddf5ab922c89a19ff6dcf1da451e3e3 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Tue, 21 Dec 2021 15:39:29 -0800
Subject: [PATCH 25/28] Find ign program instead of ignition-tools

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 CMakeLists.txt        | 2 +-
 sdf/CMakeLists.txt    | 4 ++--
 src/CMakeLists.txt    | 2 +-
 test/CMakeLists.txt   | 1 +
 test/test_config.h.in | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eca3d1830..37a95d4a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,7 @@ if (BUILD_SDF)
 
   #################################################
   # Find ign command line utility:
-  ign_find_package(ignition-tools)
+  find_program(IGN_PROGRAM ign)
 
   ################################################
   # Find psutil python package for memory tests
diff --git a/sdf/CMakeLists.txt b/sdf/CMakeLists.txt
index 7d50012da..728d66aed 100644
--- a/sdf/CMakeLists.txt
+++ b/sdf/CMakeLists.txt
@@ -20,7 +20,7 @@ execute_process(
 # Generate aggregated SDF description files for use by the sdformat.org 
 # website. If the description files change, the generated full*.sdf files need 
 # to be removed before running this target.
-if (IGNITION-TOOLS_BINARY_DIRS)
+if (IGN_PROGRAM)
 
   # Update this list as new sdformat spec versions are added.
   set(sdf_desc_versions 1.4 1.5 1.6 1.7)
@@ -33,7 +33,7 @@ if (IGNITION-TOOLS_BINARY_DIRS)
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/full_${desc_ver_dash}.sdf
       COMMAND
         ${CMAKE_COMMAND} -E env IGN_CONFIG_PATH=${CMAKE_BINARY_DIR}/test/conf
-        ${IGNITION-TOOLS_BINARY_DIRS}/ign
+        ${IGN_PROGRAM}
       ARGS sdf -d ${desc_ver} > ${CMAKE_CURRENT_BINARY_DIR}/full_${desc_ver_dash}.sdf
       COMMENT "Generating full description for spec ${desc_ver}"
       VERBATIM)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fb50661b1..e2e02bbdf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
 
 if (BUILD_TESTING)
   # Build this test file only if Ignition Tools is installed.
-  if (NOT IGNITION-TOOLS_BINARY_DIRS)
+  if (NOT IGN_PROGRAM)
     list(REMOVE_ITEM gtest_sources ign_TEST.cc)
   endif()
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 90d9e254d..466d6f637 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+get_filename_component(IGN_PATH ${IGN_PROGRAM} DIRECTORY)
 configure_file(test_config.h.in ${PROJECT_BINARY_DIR}/include/test_config.h)
 
 # Build gtest
diff --git a/test/test_config.h.in b/test/test_config.h.in
index 0342e73a9..cf63247bd 100644
--- a/test/test_config.h.in
+++ b/test/test_config.h.in
@@ -19,7 +19,7 @@
 #define SDF_TEST_CONFIG_HH_
 
 #define IGN_CONFIG_PATH "@CMAKE_BINARY_DIR@/test/conf"
-#define IGN_PATH "@IGNITION-TOOLS_BINARY_DIRS@"
+#define IGN_PATH "@IGN_PATH@"
 #define IGN_TEST_LIBRARY_PATH "${PROJECT_BINARY_DIR}/src:"\
   "@IGNITION-MSGS_LIBRARY_DIRS@:"
 #define PROJECT_SOURCE_PATH "${PROJECT_SOURCE_DIR}"

From 17aa0d0700990f96d78efd53c7dd49c60a1e1ca2 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Tue, 21 Dec 2021 15:49:55 -0800
Subject: [PATCH 26/28] Use python3-psutils as dependency

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 .github/ci/packages.apt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
index 9596b3ee0..31db08f14 100644
--- a/.github/ci/packages.apt
+++ b/.github/ci/packages.apt
@@ -4,5 +4,5 @@ libignition-tools-dev
 libtinyxml2-dev
 liburdfdom-dev
 libxml2-utils
-python-psutil
+python3-psutil
 ruby-dev

From 6865f453b3bd777179e151c6d740171d1b8b63d7 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Tue, 21 Dec 2021 16:11:39 -0800
Subject: [PATCH 27/28] Add backwards compatibility comment in headers

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 include/sdf/sdf.hh       | 2 ++
 include/sdf/sdf_config.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/include/sdf/sdf.hh b/include/sdf/sdf.hh
index c03d12d74..900a12a04 100644
--- a/include/sdf/sdf.hh
+++ b/include/sdf/sdf.hh
@@ -18,6 +18,8 @@
 #ifndef SDF_SDF_HH_
 #define SDF_SDF_HH_
 
+// This file is kept for backwards compatibility.
+// Use sdformat.hh directly instead.
 #include <sdformat.hh>
 
 #endif
diff --git a/include/sdf/sdf_config.h b/include/sdf/sdf_config.h
index fdf7d347b..656f17b85 100644
--- a/include/sdf/sdf_config.h
+++ b/include/sdf/sdf_config.h
@@ -18,6 +18,8 @@
 #ifndef SDF_SDF_CONFIG_H_
 #define SDF_SDF_CONFIG_H_
 
+// This file is kept for backwards compatibility.
+// Use sdf/config.hh directly instead.
 #include <sdf/config.hh>
 
 #endif

From 4a7e7e3650fa471c7cd8ad149ac29e8290619244 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Tue, 21 Dec 2021 16:18:16 -0800
Subject: [PATCH 28/28] Move find_python_module to root CMakeLists.txt

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 CMakeLists.txt       | 26 +++++++++++++++++++++++++-
 cmake/SDFUtils.cmake | 23 -----------------------
 2 files changed, 25 insertions(+), 24 deletions(-)
 delete mode 100644 cmake/SDFUtils.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37a95d4a4..cb413fbca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,9 +56,33 @@ if (BUILD_SDF)
   # Find ign command line utility:
   find_program(IGN_PROGRAM ign)
 
+  #################################################
+  # Copied from catkin/cmake/empy.cmake
+  include(IgnPython)
+  function(find_python_module module)
+    # cribbed from http://www.cmake.org/pipermail/cmake/2011-January/041666.html
+    string(TOUPPER ${module} module_upper)
+    if(NOT PY_${module_upper})
+      if(ARGC GREATER 1 AND ARGV1 STREQUAL "REQUIRED")
+        set(${module}_FIND_REQUIRED TRUE)
+      endif()
+      # A module's location is usually a directory, but for
+      # binary modules
+      # it's a .so file.
+      execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" "import re, ${module}; print(re.compile('/__init__.py.*').sub('',${module}.__file__))"
+        RESULT_VARIABLE _${module}_status
+        OUTPUT_VARIABLE _${module}_location
+        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+      if(NOT _${module}_status)
+        set(PY_${module_upper} ${_${module}_location} CACHE STRING "Location of Python module ${module}")
+      endif(NOT _${module}_status)
+    endif(NOT PY_${module_upper})
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(PY_${module} DEFAULT_MSG PY_${module_upper})
+  endfunction(find_python_module)
+
   ################################################
   # Find psutil python package for memory tests
-  include (${PROJECT_SOURCE_DIR}/cmake/SDFUtils.cmake)
   find_python_module(psutil)
   if (NOT PY_PSUTIL)
     ign_build_warning("Python psutil package not found. Memory leak tests will be skipped")
diff --git a/cmake/SDFUtils.cmake b/cmake/SDFUtils.cmake
deleted file mode 100644
index a1895c5cc..000000000
--- a/cmake/SDFUtils.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-#################################################
-# Copied from catkin/cmake/empy.cmake
-function(find_python_module module)
-  # cribbed from http://www.cmake.org/pipermail/cmake/2011-January/041666.html
-  string(TOUPPER ${module} module_upper)
-  if(NOT PY_${module_upper})
-    if(ARGC GREATER 1 AND ARGV1 STREQUAL "REQUIRED")
-      set(${module}_FIND_REQUIRED TRUE)
-    endif()
-    # A module's location is usually a directory, but for
-    # binary modules
-    # it's a .so file.
-    execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" "import re, ${module}; print(re.compile('/__init__.py.*').sub('',${module}.__file__))"
-      RESULT_VARIABLE _${module}_status
-      OUTPUT_VARIABLE _${module}_location
-      ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(NOT _${module}_status)
-      set(PY_${module_upper} ${_${module}_location} CACHE STRING "Location of Python module ${module}")
-    endif(NOT _${module}_status)
-  endif(NOT PY_${module_upper})
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(PY_${module} DEFAULT_MSG PY_${module_upper})
-endfunction(find_python_module)