philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

remove error-demo from make; clean up comment

Browse source
This commit is contained in:
Ben Burdette 2020-05-21 16:04:18 -06:00
parent 0e49de6a2b
commit b7057fa627
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -17,8 +17,7 @@ makefiles = \
misc/upstart/local.mk \ misc/upstart/local.mk \
doc/manual/local.mk \ doc/manual/local.mk \
tests/local.mk \ tests/local.mk \
tests/plugins/local.mk \ tests/plugins/local.mk
src/error-demo/local.mk
-include Makefile.config -include Makefile.config

1
src/libexpr/parser.y
View file

@ -663,7 +663,6 @@ Expr * EvalState::parseExprFromString(std::string_view s, const Path & basePath)
Expr * EvalState::parseStdin() Expr * EvalState::parseStdin()
{ {
//Activity act(*logger, lvlTalkative, format("parsing standard input")); //Activity act(*logger, lvlTalkative, format("parsing standard input"));
// return parseExprFromString(foStdin, drainFD(0), absPath("."));
return parse(drainFD(0).data(), foStdin, "", absPath("."), staticBaseEnv); return parse(drainFD(0).data(), foStdin, "", absPath("."), staticBaseEnv);
} }