From cc39cc1174ac4182977704845d8dd1cdb8926f43 Mon Sep 17 00:00:00 2001
From: Ben Smith <binjimin@gmail.com>
Date: Wed, 3 Apr 2019 23:20:50 -0700
Subject: Rewrite the lexer manually, instead of re2c (#1058)

The current lexer uses re2c. It easy to change, but it generates a huge amount of code, and it's easy to forgot to update it.

This PR rewrites the lexer manually, and uses gperf instead to match keywords. The generated source is much smaller.
---
 scripts/travis-before-install.sh | 4 +---
 scripts/travis-build.sh          | 5 +----
 scripts/travis-test.sh           | 6 ------
 3 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'scripts')

diff --git a/scripts/travis-before-install.sh b/scripts/travis-before-install.sh
index 134c93bf..249f0490 100755
--- a/scripts/travis-before-install.sh
+++ b/scripts/travis-before-install.sh
@@ -16,13 +16,11 @@
 #
 
 if [[ ${TRAVIS_OS_NAME} = "linux" ]]; then
-  sudo add-apt-repository ppa:jbboehr/build-deps -y # For re2c 0.16.
   sudo apt-get update -qq
-  sudo apt-get install -qq re2c gcc-4.8-multilib g++-4.8-multilib -y
+  sudo apt-get install -qq gcc-4.8-multilib g++-4.8-multilib -y
   sudo pip install flake8
 elif [[ ${TRAVIS_OS_NAME} = "osx" ]]; then
   brew update
-  brew install re2c
 else
   echo "unknown TRAVIS_OS_NAME: ${TRAVIS_OS_NAME}"
   exit 1
diff --git a/scripts/travis-build.sh b/scripts/travis-build.sh
index 5bb56892..fc1c369f 100755
--- a/scripts/travis-build.sh
+++ b/scripts/travis-build.sh
@@ -25,10 +25,7 @@ if [[ ${TRAVIS_OS_NAME} = "linux" ]]; then
   flake8 --ignore=E111,E114 ./scripts/
 fi
 
-if [[ ${COMPILER} = "gcc" ]]; then
-  # Build without re2c to test prebuilt C sources
-  make gcc-debug-no-re2c
-elif [[ ${COMPILER} = "clang" && -z ${SANITIZER:-} ]]; then
+if [[ ${COMPILER} = "clang" && -z ${SANITIZER:-} ]]; then
   # Test building without GTest submodule
   make clang-debug-no-tests
 fi
diff --git a/scripts/travis-test.sh b/scripts/travis-test.sh
index 3ce6e0b2..a03e132d 100755
--- a/scripts/travis-test.sh
+++ b/scripts/travis-test.sh
@@ -45,12 +45,6 @@ set_run_test_args() {
   BINDIR="out/${COMPILER}/${BUILD_TYPE}/${CONFIG}"
 }
 
-if [ ${CC} = "gcc" ]; then
-  if set_run_test_args gcc Debug no-re2c; then
-    run_tests
-  fi
-fi
-
 for BUILD_TYPE in ${BUILD_TYPES_UPPER}; do
   if [[ -n "${SANITIZER:-}" ]]; then
     if set_run_test_args ${COMPILER} ${BUILD_TYPE} ${SANITIZER}; then
-- 
cgit v1.2.3