lix-project/lix
20
55
Fork 31
Code Issues 343 Code Review (Gerrit) Projects 3 Releases Wiki Activity

a few merge fixes

Browse source
This commit is contained in:
Ben Burdette 2022-02-04 17:35:56 -07:00
parent dbe3fd3735
commit 195db83148
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/libexpr/eval.cc
View file

@ -860,18 +860,18 @@ LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const
throw error;
}
LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const string &s2, Env & env, Expr *expr))
{
auto error = TypeError({
.msg = hintfmt(s, s2),
.errPos = pos
});
// LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const string &s2, Env & env, Expr *expr))
// {
// auto error = TypeError({
// .msg = hintfmt(s, s2),
// .errPos = pos
// });
if (debuggerHook && expr)
debuggerHook(&error, env, *expr);
// if (debuggerHook && expr)
// debuggerHook(&error, env, *expr);
throw error;
}
// throw error;
// }
LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const ExprLambda & fun, const Symbol & s2, Env & env, Expr *expr))
{
@ -1243,7 +1243,7 @@ inline bool EvalState::evalBool(Env & env, Expr * e)
Value v;
e->eval(*this, env, v);
if (v.type() != nBool)
throwTypeError("value is %1% while a Boolean was expected", v);
throwTypeError(noPos, "value is %1% while a Boolean was expected", v);
return v.boolean;
}
@ -1262,7 +1262,7 @@ inline void EvalState::evalAttrs(Env & env, Expr * e, Value & v)
{
e->eval(*this, env, v);
if (v.type() != nAttrs)
throwTypeError("value is %1% while a set was expected", v);
throwTypeError(noPos, "value is %1% while a set was expected", v);
}

4
src/libexpr/eval.hh
View file

@ -195,7 +195,7 @@ public:
Expr * parseExprFromFile(const Path & path, std::shared_ptr<StaticEnv> & staticEnv);
/* Parse a Nix expression from the specified string. */
Expr * parseExprFromString(std::string s, const Path & basePath, , std::shared_ptr<StaticEnv> & staticEnv);
Expr * parseExprFromString(std::string s, const Path & basePath, std::shared_ptr<StaticEnv> & staticEnv);
Expr * parseExprFromString(std::string s, const Path & basePath);
Expr * parseStdin();
@ -331,7 +331,7 @@ private:
friend struct ExprLet;
Expr * parse(char * text, size_t length, FileOrigin origin, const PathView path,
const Path & basePath, std::shared_ptr<StaticEnv> & staticEnv);
const PathView basePath, std::shared_ptr<StaticEnv> & staticEnv);
public: