From b7057fa6272ed1e2867ed5491463b6714aa34673 Mon Sep 17 00:00:00 2001 From: Ben Burdette Date: Thu, 21 May 2020 16:04:18 -0600 Subject: [PATCH] remove error-demo from make; clean up comment --- Makefile | 3 +-- src/libexpr/parser.y | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 05c4bdc8a..f4ad2c468 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,7 @@ makefiles = \ misc/upstart/local.mk \ doc/manual/local.mk \ tests/local.mk \ - tests/plugins/local.mk \ - src/error-demo/local.mk + tests/plugins/local.mk -include Makefile.config diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 1a4f3d56b..f8b5fb0d5 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -663,7 +663,6 @@ Expr * EvalState::parseExprFromString(std::string_view s, const Path & basePath) Expr * EvalState::parseStdin() { //Activity act(*logger, lvlTalkative, format("parsing standard input")); - // return parseExprFromString(foStdin, drainFD(0), absPath(".")); return parse(drainFD(0).data(), foStdin, "", absPath("."), staticBaseEnv); }