diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-27T20·56+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-27T20·56+0100 |
| commit | 3652326ed281f5f753423acef51103fb8df62a6d (patch) | |
| tree | 3e6969ccaa13e77eb42f887cd081b45d7fffed80 /third_party/nix/src/libexpr/parser.y | |
| parent | 86a35d963d7b6108dec44411c8ebd5aadbb148ac (diff) | |
refactor(3p/nix): Anchor local includes at src/ r/865
Previously all includes were anchored in one global mess of header files. This moves the includes into filesystem "namespaces" (if you will) for each sub-package of Nix. Note: This commit does not introduce the relevant build system changes.
Diffstat (limited to 'third_party/nix/src/libexpr/parser.y')
| -rw-r--r-- | third_party/nix/src/libexpr/parser.y | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/third_party/nix/src/libexpr/parser.y b/third_party/nix/src/libexpr/parser.y index 9ba053ee7b..fe8759f3c6 100644 --- a/third_party/nix/src/libexpr/parser.y +++ b/third_party/nix/src/libexpr/parser.y @@ -16,9 +16,9 @@ #ifndef BISON_HEADER #define BISON_HEADER -#include "util.hh" -#include "nixexpr.hh" -#include "eval.hh" +#include "libutil/util.hh" +#include "libexpr/nixexpr.hh" +#include "libexpr/eval.hh" #include <glog/logging.h> namespace nix { @@ -50,8 +50,8 @@ namespace nix { %{ -#include "parser-tab.hh" -#include "lexer-tab.hh" +#include "generated/parser-tab.hh" +#include "generated/lexer-tab.hh" YY_DECL; @@ -539,9 +539,9 @@ formal #include <fcntl.h> #include <unistd.h> -#include "eval.hh" -#include "download.hh" -#include "store-api.hh" +#include "libexpr/eval.hh" +#include "libstore/download.hh" +#include "libstore/store-api.hh" namespace nix { |