carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-04 14:31:04 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Generic functions, first baby step (#658)

Browse Source 
* generic functions: progress on parser and AST

* finished first baby step

* revisions based on reviews

* Update executable_semantics/interpreter/interpreter.cpp

Co-authored-by: Jon Meow <46229924+jonmeow@users.noreply.github.com>

* Symbol => VariableType

Co-authored-by: Jon Meow <46229924+jonmeow@users.noreply.github.com>
This commit is contained in:
Jeremy G. Siek
2021-07-22 15:16:56 -04:00
committed by GitHub
co-authored by Jon Meow
parent cc56afb79e
commit 864b3bde02
27 changed files with 437 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/interpreter/interpreter.cpp
+9 -2
View File
@@ -109,7 +109,14 @@ void InitEnv(const Declaration& d, Env* env) {
case DeclarationKind::FunctionDeclaration: {
const FunctionDefinition& func_def =
d.GetFunctionDeclaration().definition;
auto pt = InterpExp(*env, func_def.param_pattern);
Env new_env = *env;
// Bring the deduced parameters into scope.
for (const auto& deduced : func_def.deduced_parameters) {
Address a =
state->heap.AllocateValue(Value::MakeVariableType(deduced.name));
new_env.Set(deduced.name, a);
}
auto pt = InterpExp(new_env, func_def.param_pattern);
auto f = Value::MakeFunctionValue(func_def.name, pt, func_def.body);
Address a = state->heap.AllocateValue(f);
env->Set(func_def.name, a);
@@ -740,7 +747,7 @@ void StepExp() {
// { { rt :: fn pt -> [] :: C, E, F} :: S, H}
// -> { fn pt -> rt :: {C, E, F} :: S, H}
const Value* v =
Value::MakeFunctionType(act->results[0], act->results[1]);
Value::MakeFunctionType({}, act->results[0], act->results[1]);
frame->todo.Pop(1);
frame->todo.Push(Action::MakeValAction(v));
}