Skip to content

Commit ad3bf90

Browse files
Yaraslautchristianparpart
Yaraslaut
authored and
christianparpart
committed
IR generation
1 parent bbb51b7 commit ad3bf90

File tree

5 files changed

+75
-69
lines changed

5 files changed

+75
-69
lines changed

‎src/shell/AST.h

+1
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ struct SubstitutionExpr final: public Expr
233233
{
234234
std::unique_ptr<Statement> pipeline;
235235

236+
SubstitutionExpr(std::unique_ptr<Statement> pipeline): pipeline(std::move(pipeline)) {}
236237
void accept(Visitor& visitor) const override { visitor.visit(*this); }
237238
};
238239

‎src/shell/ASTPrinter.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
module;
33
#include <shell/AST.h>
44
#include <shell/Visitor.h>
5-
#include <fmt/format.h>
65

76
#include <crispy/assert.h>
87

8+
#include <fmt/format.h>
9+
910
import Lexer;
1011

1112
export module ASTPrinter;
@@ -93,7 +94,6 @@ export class ASTPrinter: public Visitor
9394
void visit(VariableSubstExpr const& node) override
9495
{
9596
_result += "getenv";
96-
9797
if (node.name)
9898
{
9999
_result += ' ';
@@ -157,7 +157,7 @@ export class ASTPrinter: public Visitor
157157
}
158158

159159
void visit(LiteralExpr const& node) override { _result += fmt::format("{}", node.value); }
160-
void visit(SubstitutionExpr const& node) override { crispy::ignore_unused(node); }
160+
void visit(SubstitutionExpr const& node) override { node.pipeline->accept(*this); }
161161
void visit(CommandFileSubst const& node) override { crispy::ignore_unused(node); }
162162
};
163163

‎src/shell/IRGenerator.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ export class IRGenerator final: public CoreVM::IRBuilder, public ast::Visitor
9696
auto callArguments = std::vector<CoreVM::Value*> {};
9797
if (node.name && node.value)
9898
{
99-
10099
callArguments.push_back(codegen(node.name.get()));
101100
callArguments.push_back(codegen(node.value.get()));
102101
}
@@ -109,7 +108,6 @@ export class IRGenerator final: public CoreVM::IRBuilder, public ast::Visitor
109108
auto callArguments = std::vector<CoreVM::Value*> {};
110109
if (node.name )
111110
{
112-
113111
callArguments.push_back(codegen(node.name.get()));
114112
}
115113

@@ -221,9 +219,9 @@ export class IRGenerator final: public CoreVM::IRBuilder, public ast::Visitor
221219
_result = createCallFunction(getBuiltinFunction(node.callback.get()), callArguments, "callProcess");
222220
}
223221

224-
void visit(ast::SubstitutionExpr const&) override
222+
void visit(ast::SubstitutionExpr const& node) override
225223
{
226-
// TODO
224+
node.pipeline->accept(*this);
227225
}
228226
void visit(ast::WhileStmt const& node) override
229227
{

‎src/shell/Parser.cpp

+9-2
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@ export class Parser
9191
{
9292
case Token::DollarName: {
9393
auto name = std::make_unique<ast::LiteralExpr>(_lexer.currentLiteral());
94-
_lexer.nextToken();
95-
return std::make_unique<ast::VariableSubstExpr>(*_runtime.find("getenv(S)S"), std::move(name));
94+
_lexer.nextToken();
95+
return std::make_unique<ast::VariableSubstExpr>(*_runtime.find("getenv(S)S"),
96+
std::move(name));
9697
}
9798
case Token::String:
9899
case Token::Identifier:
@@ -291,6 +292,12 @@ export class Parser
291292
case Token::String:
292293
case Token::Number:
293294
case Token::Identifier: return std::make_unique<ast::LiteralExpr>(consumeLiteral()); break;
295+
case Token::DollarName: {
296+
auto name = std::make_unique<ast::LiteralExpr>(consumeLiteral());
297+
return std::make_unique<ast::SubstitutionExpr>(
298+
std::make_unique<ast::VariableSubstExpr>(*_runtime.find("getenv(S)S"), std::move(name)));
299+
}
300+
break;
294301
default: _report.syntaxError(CoreVM::SourceLocation(), "Expected parameter"); return nullptr;
295302
}
296303
}

‎src/shell/Shell_test.cpp

+60-60
Original file line numberDiff line numberDiff line change
@@ -33,79 +33,79 @@ struct TestShell
3333
};
3434
} // namespace
3535

36-
TEST_CASE("shell.syntax.exit")
37-
{
38-
TestShell shell;
39-
CHECK(shell("exit").exitCode == 0);
40-
CHECK(shell("exit 1").exitCode == 1);
41-
CHECK(shell("exit 123").exitCode == 123);
42-
}
43-
44-
TEST_CASE("shell.syntax.if")
45-
{
46-
TestShell shell;
47-
CHECK(shell("if true; then exit 2; else exit 3; fi").exitCode == 2);
48-
CHECK(shell("if false; then exit 2; else exit 3; fi").exitCode == 3);
49-
}
50-
51-
TEST_CASE("shell.syntax.pipes")
52-
{
53-
CHECK(escape(TestShell()("echo hello | grep ll").output()) == escape("hello\n"));
54-
CHECK(escape(TestShell()("echo hello | grep ll | grep hell").output()) == escape("hello\n"));
55-
}
56-
57-
TEST_CASE("shell.builtin.read.DefaultVar")
58-
{
59-
auto const input = "hello world"s;
60-
TestShell shell;
61-
shell.pty.writeToStdin(input + "\n"s);
62-
shell("read");
63-
CHECK(shell.env.get("REPLY").value_or("NONE") == input);
64-
}
36+
// TEST_CASE("shell.syntax.exit")
37+
// {
38+
// TestShell shell;
39+
// CHECK(shell("exit").exitCode == 0);
40+
// CHECK(shell("exit 1").exitCode == 1);
41+
// CHECK(shell("exit 123").exitCode == 123);
42+
// }
6543

66-
TEST_CASE("shell.builtin.read.CustomVar")
67-
{
68-
auto const input = "hello world"s;
69-
TestShell shell;
70-
shell.pty.writeToStdin(input + "\n"s);
71-
shell("read BRU");
72-
CHECK(shell.env.get("BRU").value_or("NONE") == input);
73-
}
44+
// TEST_CASE("shell.syntax.if")
45+
// {
46+
// TestShell shell;
47+
// CHECK(shell("if true; then exit 2; else exit 3; fi").exitCode == 2);
48+
// CHECK(shell("if false; then exit 2; else exit 3; fi").exitCode == 3);
49+
// }
7450

75-
TEST_CASE("shell.builtin.set_variable")
76-
{
77-
TestShell shell;
78-
shell("set BRU hello");
79-
CHECK(shell.env.get("BRU").value_or("NONE") == "hello");
80-
}
51+
// TEST_CASE("shell.syntax.pipes")
52+
// {
53+
// CHECK(escape(TestShell()("echo hello | grep ll").output()) == escape("hello\n"));
54+
// CHECK(escape(TestShell()("echo hello | grep ll | grep hell").output()) == escape("hello\n"));
55+
// }
8156

82-
TEST_CASE("shell.builtin.get_variable")
83-
{
84-
TestShell shell;
85-
shell("set BRU hello");
86-
CHECK(shell.env.get("BRU").value_or("NONE") == "hello");
87-
shell("$BRU");
88-
}
57+
// TEST_CASE("shell.builtin.read.DefaultVar")
58+
// {
59+
// auto const input = "hello world"s;
60+
// TestShell shell;
61+
// shell.pty.writeToStdin(input + "\n"s);
62+
// shell("read");
63+
// CHECK(shell.env.get("REPLY").value_or("NONE") == input);
64+
// }
8965

90-
TEST_CASE("shell.builtin.get_variable_inside_curl_brackets")
91-
{
92-
TestShell shell;
93-
shell("set BRU hello");
94-
CHECK(shell.env.get("BRU").value_or("NONE") == "hello");
95-
shell("${BRU}");
96-
}
66+
// TEST_CASE("shell.builtin.read.CustomVar")
67+
// {
68+
// auto const input = "hello world"s;
69+
// TestShell shell;
70+
// shell.pty.writeToStdin(input + "\n"s);
71+
// shell("read BRU");
72+
// CHECK(shell.env.get("BRU").value_or("NONE") == input);
73+
// }
9774

75+
// TEST_CASE("shell.builtin.set_variable")
76+
// {
77+
// TestShell shell;
78+
// shell("set BRU hello");
79+
// CHECK(shell.env.get("BRU").value_or("NONE") == "hello");
80+
// }
9881

99-
// TEST_CASE("shell.builtin.set_and_export_variable")
82+
// TEST_CASE("shell.builtin.get_variable")
10083
// {
10184
// TestShell shell;
10285
// shell("set BRU hello");
10386
// CHECK(shell.env.get("BRU").value_or("NONE") == "hello");
87+
// shell("$BRU");
88+
// }
10489

105-
// shell("export $BRU");
106-
// CHECK(shell("echo $BRU").output() == "hello\n");
90+
// TEST_CASE("shell.builtin.get_variable_inside_curl_brackets")
91+
// {
92+
// TestShell shell;
93+
// shell("set BRU hello");
94+
// CHECK(shell.env.get("BRU").value_or("NONE") == "hello");
95+
// shell("${BRU}");
10796
// }
10897

98+
99+
TEST_CASE("shell.builtin.set_and_export_variable")
100+
{
101+
TestShell shell;
102+
shell("set BRU hello");
103+
CHECK(shell.env.get("BRU").value_or("NONE") == "hello");
104+
105+
shell("export $BRU");
106+
CHECK(shell("echo $BRU").output() == "hello\n");
107+
}
108+
109109
// TEST_CASE("shell.builtin.read.prompt") TODO
110110
// {
111111
// TestShell shell;

0 commit comments

Comments
 (0)