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

Fix tests on systems with a non-master git defaultBranch #1

Open
zebreus wants to merge 140 commits from fix-tests-without-master into main
pull from: fix-tests-without-master
merge into: zebreus:main
Conversation 0 Commits 140 Files changed 216 +11 -3
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4ea8c9d643 - Show all commits

2
meson.build
View file

@ -50,7 +50,7 @@ project('lix', 'cpp', 'rust',
meson_version : '>=1.4.0', meson_version : '>=1.4.0',
version : run_command('bash', '-c', 'echo -n $(jq -r .version < ./version.json)$VERSION_SUFFIX', check : true).stdout().strip(), version : run_command('bash', '-c', 'echo -n $(jq -r .version < ./version.json)$VERSION_SUFFIX', check : true).stdout().strip(),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
'rust_std=2021', 'rust_std=2021',
'warning_level=2', 'warning_level=2',
'debug=true', 'debug=true',

8
src/libexpr/nixexpr.cc
View file

@ -21,6 +21,14 @@ std::ostream & operator <<(std::ostream & str, const SymbolStr & symbol)
return printIdentifier(str, s); return printIdentifier(str, s);
} }
AttrName::AttrName(Symbol s) : symbol(s)
{
}
AttrName::AttrName(std::unique_ptr<Expr> e) : expr(std::move(e))
{
}
void Expr::show(const SymbolTable & symbols, std::ostream & str) const void Expr::show(const SymbolTable & symbols, std::ostream & str) const
{ {
abort(); abort();

4
src/libexpr/nixexpr.hh
View file

@ -30,8 +30,8 @@ struct AttrName
{ {
Symbol symbol; Symbol symbol;
std::unique_ptr<Expr> expr; std::unique_ptr<Expr> expr;
AttrName(Symbol s) : symbol(s) {}; AttrName(Symbol s);
AttrName(std::unique_ptr<Expr> e) : expr(std::move(e)) {}; AttrName(std::unique_ptr<Expr> e);
}; };
typedef std::vector<AttrName> AttrPath; typedef std::vector<AttrName> AttrPath;