mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Experimental control-flow operator (#368)
* AST and syntax for delimited control * stashing for later * a little more progress * progress on delimited continuations * delimit, suspend, and resume implemented (draft) * example that generates the natural numbers * fixes * tinkering * changed demo to experimental * comments and name changes * describe delimited continuations in the README * renamed Snapshot to Continuation, edits to comments * Update executable_semantics/ast/statement.h improve comment for MakeDelimitStmt Co-authored-by: Dave Abrahams <dabrahams@google.com> * Update executable_semantics/interpreter/interpreter.cpp remove snake_case Co-authored-by: Dave Abrahams <dabrahams@google.com> * edits to comments, change name of variable * updates to handle review edits * trailing whitespace * fixes to delimited continuations, added more tests, also fixed assignment to do a copy * improvements from Geoffrey * new test from Geoffrey, fix for empty blocks * more suggestions from Geoffrey * more tests for delimited continuations, renaming some of them * renamed test files * improve a comment * sketch of creating continuation * initial implementation of shift/reset style continuations * more documentation * fix some camel case * implemented deep copy of continuations, added a test case for it * fixed a bug and got the recursive test case working * removed __delimit, polished up __continuation * back to shallow copy for continuations * suggestions from Geoffrey * removed structured binding (for now) * Update executable_semantics/ast/expression.cpp Co-authored-by: Geoff Romer <gromer@google.com> * responses to Geoffrey Co-authored-by: Dave Abrahams <dabrahams@google.com> Co-authored-by: Geoff Romer <gromer@google.com>
This commit is contained in:
committed by
GitHub
co-authored by
Dave Abrahams
Geoff Romer
parent
6df0d51516
commit
3fa72d2984
@@ -104,6 +104,36 @@ auto MakeMatch(int line_num, Expression* exp,
|
||||
return s;
|
||||
}
|
||||
|
||||
// Returns an AST node for a continuation statement give its line number and
|
||||
// parts.
|
||||
auto MakeContinuationStatement(int line_num, std::string continuation_variable,
|
||||
Statement* body) -> Statement* {
|
||||
auto* continuation = new Statement();
|
||||
continuation->line_num = line_num;
|
||||
continuation->tag = StatementKind::Continuation;
|
||||
continuation->u.continuation.continuation_variable =
|
||||
new std::string(continuation_variable);
|
||||
continuation->u.continuation.body = body;
|
||||
return continuation;
|
||||
}
|
||||
|
||||
// Returns an AST node for a run statement give its line number and argument.
|
||||
auto MakeRun(int line_num, Expression* argument) -> Statement* {
|
||||
auto* run = new Statement();
|
||||
run->line_num = line_num;
|
||||
run->tag = StatementKind::Run;
|
||||
run->u.run.argument = argument;
|
||||
return run;
|
||||
}
|
||||
|
||||
// Returns an AST node for an await statement give its line number.
|
||||
auto MakeAwait(int line_num) -> Statement* {
|
||||
auto* await = new Statement();
|
||||
await->line_num = line_num;
|
||||
await->tag = StatementKind::Await;
|
||||
return await;
|
||||
}
|
||||
|
||||
void PrintStatement(Statement* s, int depth) {
|
||||
if (!s) {
|
||||
return;
|
||||
@@ -177,13 +207,44 @@ void PrintStatement(Statement* s, int depth) {
|
||||
PrintStatement(s->u.sequence.stmt, depth);
|
||||
if (depth < 0 || depth > 1) {
|
||||
std::cout << std::endl;
|
||||
} else {
|
||||
std::cout << " ";
|
||||
}
|
||||
PrintStatement(s->u.sequence.next, depth - 1);
|
||||
break;
|
||||
case StatementKind::Block:
|
||||
std::cout << "{" << std::endl;
|
||||
PrintStatement(s->u.block.stmt, depth - 1);
|
||||
std::cout << std::endl << "}" << std::endl;
|
||||
std::cout << "{";
|
||||
if (depth < 0 || depth > 1) {
|
||||
std::cout << std::endl;
|
||||
}
|
||||
PrintStatement(s->u.block.stmt, depth);
|
||||
if (depth < 0 || depth > 1) {
|
||||
std::cout << std::endl;
|
||||
}
|
||||
std::cout << "}";
|
||||
if (depth < 0 || depth > 1) {
|
||||
std::cout << std::endl;
|
||||
}
|
||||
break;
|
||||
case StatementKind::Continuation:
|
||||
std::cout << "continuation " << *s->u.continuation.continuation_variable
|
||||
<< " ";
|
||||
if (depth < 0 || depth > 1) {
|
||||
std::cout << std::endl;
|
||||
}
|
||||
PrintStatement(s->u.continuation.body, depth - 1);
|
||||
if (depth < 0 || depth > 1) {
|
||||
std::cout << std::endl;
|
||||
}
|
||||
break;
|
||||
case StatementKind::Run:
|
||||
std::cout << "run ";
|
||||
PrintExp(s->u.run.argument);
|
||||
std::cout << ";";
|
||||
break;
|
||||
case StatementKind::Await:
|
||||
std::cout << "await;";
|
||||
break;
|
||||
}
|
||||
}
|
||||
} // namespace Carbon
|
||||
|
||||
Reference in New Issue
Block a user