From 358515491a0d6891e6a709688a30ad087df1beb1 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Mon, 11 Sep 2017 16:33:48 +0000 Subject: Revert "Switch to the new SkSL lexer." This reverts commit c576e93d174f3106e072a2f506bca3990b541265. Reason for revert: ASAN failures Original change's description: > Switch to the new SkSL lexer. > > This completely replaces flex with a new in-house lexical analyzer generator, > which we have done for performance and memory usage reasons. Flex requires us > to copy strings every time we need the text of a token, whereas this new lexer > allows us to handle strings as a (non-null-terminated) pointer and length > everywhere, eliminating most string copies. > > Bug: skia: > Change-Id: I2add26efc9e20cb699520e82abcf713af3968aca > Reviewed-on: https://skia-review.googlesource.com/39780 > Reviewed-by: Brian Salomon > Commit-Queue: Ethan Nicholas TBR=bsalomon@google.com,ethannicholas@google.com Change-Id: If27b750a5f696d06a6bcffed12fe9f0598e084a6 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/44881 Reviewed-by: Ethan Nicholas Commit-Queue: Ethan Nicholas --- gn/run_sksllex.py | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 gn/run_sksllex.py (limited to 'gn/run_sksllex.py') diff --git a/gn/run_sksllex.py b/gn/run_sksllex.py deleted file mode 100644 index 0377283b5a..0000000000 --- a/gn/run_sksllex.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2017 Google Inc. -# -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import os -import subprocess -import sys - -sksllex = sys.argv[1] -clangFormat = sys.argv[2] -src = sys.argv[3] -try: - subprocess.check_output([sksllex, src + "/sksl/lex/sksl.lex", "Lexer", - "Token", src + "/sksl/SkSLLexer.h", src + - "/sksl/SkSLLexer.cpp"]) - subprocess.check_call(clangFormat + " -i \"" + src + "/sksl/SkSLLexer.h\"", - shell=True) - subprocess.check_call(clangFormat + " -i \"" + src + - "/sksl/SkSLLexer.cpp\"", shell=True) - subprocess.check_output([sksllex, src + "/sksl/lex/layout.lex", - "LayoutLexer", "LayoutToken", - src + "/sksl/SkSLLayoutLexer.h", - src + "/sksl/SkSLLayoutLexer.cpp"]) - subprocess.check_call(clangFormat + " -i \"" + src + - "/sksl/SkSLLayoutLexer.h\"", shell=True) - subprocess.check_call(clangFormat + " -i \"" + src + - "/sksl/SkSLLayoutLexer.cpp\"", shell=True) -except subprocess.CalledProcessError as err: - print("### Lexer error:") - print(err.output) - exit(1) -- cgit v1.2.3