From 105ad71015465104db98a7e6077a4cc48bd8e5f0 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 19 Jul 2020 02:26:42 +0100 Subject: refactor(3p/nix/libexpr): Move some code out of lexer.l Moves a function that is not dependent on the generated code over to parser.hh. This function also looks like it could be improved, but that is left as an exercise for the reader. Code that remains in lexer.l has been reformatted, while we're here. Change-Id: I9c26bb4eed0772a720d0715029e8bc10ab16ac38 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1279 Tested-by: BuildkiteCI Reviewed-by: Kane York --- third_party/nix/src/libexpr/lexer.l | 73 +++++++++++------------------------ third_party/nix/src/libexpr/parser.hh | 32 ++++++++++++++- 2 files changed, 53 insertions(+), 52 deletions(-) (limited to 'third_party') diff --git a/third_party/nix/src/libexpr/lexer.l b/third_party/nix/src/libexpr/lexer.l index be5fe4a78f7d..d5b8a459363a 100644 --- a/third_party/nix/src/libexpr/lexer.l +++ b/third_party/nix/src/libexpr/lexer.l @@ -14,68 +14,39 @@ %{ #include -#include "libexpr/nixexpr.hh" #include "generated/parser-tab.hh" +#include "libexpr/nixexpr.hh" +#include "libexpr/parser.hh" using namespace nix; namespace nix { - -static void initLoc(YYLTYPE * loc) -{ - loc->first_line = loc->last_line = 1; - loc->first_column = loc->last_column = 1; +static void initLoc(YYLTYPE* loc) { + loc->first_line = loc->last_line = 1; + loc->first_column = loc->last_column = 1; } - -static void adjustLoc(YYLTYPE * loc, const char * s, size_t len) -{ - loc->first_line = loc->last_line; - loc->first_column = loc->last_column; - - while (len--) { - switch (*s++) { - case '\r': - if (*s == '\n') /* cr/lf */ - s++; - /* fall through */ - case '\n': - ++loc->last_line; - loc->last_column = 1; - break; - default: - ++loc->last_column; - } +static void adjustLoc(YYLTYPE* loc, const char* s, size_t len) { + loc->first_line = loc->last_line; + loc->first_column = loc->last_column; + + while (len--) { + switch (*s++) { + case '\r': + if (*s == '\n') /* cr/lf */ + s++; + /* fall through */ + case '\n': + ++loc->last_line; + loc->last_column = 1; + break; + default: + ++loc->last_column; } + } } - -static Expr * unescapeStr(SymbolTable & symbols, const char * s, size_t length) -{ - std::string t; - t.reserve(length); - char c; - while ((c = *s++)) { - if (c == '\\') { - assert(*s); - c = *s++; - if (c == 'n') { t += '\n'; } - else if (c == 'r') { t += '\r'; } - else if (c == 't') { t += '\t'; } - else t += c; - } - else if (c == '\r') { - /* Normalise CR and CR/LF into LF. */ - t += '\n'; - if (*s == '\n') { s++; } /* cr/lf */ - } - else t += c; - } - return new ExprString(symbols.Create(t)); -} - - } #define YY_USER_INIT initLoc(yylloc) diff --git a/third_party/nix/src/libexpr/parser.hh b/third_party/nix/src/libexpr/parser.hh index 7f4c360b1bfd..7592e3f82ce6 100644 --- a/third_party/nix/src/libexpr/parser.hh +++ b/third_party/nix/src/libexpr/parser.hh @@ -19,7 +19,7 @@ namespace nix { -struct ParseData { +struct ParseData : public gc { EvalState& state; SymbolTable& symbols; Expr* result; @@ -55,4 +55,34 @@ Expr* stripIndentation(const Pos& pos, SymbolTable& symbols, Path resolveExprPath(Path path); +// implementations originally from lexer.l + +static Expr* unescapeStr(SymbolTable& symbols, const char* s, size_t length) { + std::string t; + t.reserve(length); + char c; + while ((c = *s++)) { + if (c == '\\') { + assert(*s); + c = *s++; + if (c == 'n') { + t += '\n'; + } else if (c == 'r') { + t += '\r'; + } else if (c == 't') { + t += '\t'; + } else + t += c; + } else if (c == '\r') { + /* Normalise CR and CR/LF into LF. */ + t += '\n'; + if (*s == '\n') { + s++; + } /* cr/lf */ + } else + t += c; + } + return new ExprString(symbols.Create(t)); +} + } // namespace nix -- cgit 1.4.1