common: Replace std::regex with RE2C state machines.

To avoid GCC 4.9 dependency. Fixes #370.
apitrace · Aug 14, 2015 · de9621f · de9621f
1 parent 2392d3c
commit de9621f
Show file tree

Hide file tree

Showing 7 changed files with 5,744 additions and 151 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -256,12 +256,6 @@ else ()
         message (FATAL_ERROR "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} compiler does not support C++11")
     endif ()
 
-    # std::regex is broken before GCC 4.9
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND
-        CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9")
-        message (FATAL_ERROR "GCC 4.9 or later required for C++11 std::regex support -- https://github.com/apitrace/apitrace/issues/370")
-    endif ()
-
     # Adjust warnings
     add_compiler_flags (-Wall)
     # XXX: it's safer to use ssize_t everywhere instead of disabling warning

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
@@ -46,3 +46,6 @@ if (ANDROID)
         log
     )
 endif ()
+
+add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp)
+target_link_libraries (trace_parser_flags_test common)
diff --git a/common/trace_parser.hpp b/common/trace_parser.hpp
@@ -138,9 +138,11 @@ class Parser
     EnumSig *parse_enum_sig();
     BitmaskSig *parse_bitmask_sig();
 
+public:
     static CallFlags
     lookupCallFlags(const char *name);
 
+protected:
     Call *parse_Call(Mode mode);
 
     void parse_enter(Mode mode);

diff --git a/common/trace_parser_flags.cpp b/common/trace_parser_flags.cpp
diff --git a/common/trace_parser_flags.cpp.re b/common/trace_parser_flags.cpp.re
diff --git a/common/trace_parser_flags_test.cpp b/common/trace_parser_flags_test.cpp
diff --git a/guids/guids_test.cpp b/guids/guids_test.cpp
@@ -1,4 +1,3 @@
-
 /**************************************************************************
  *
  * Copyright 2015 VMware, Inc.