diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 21:16:22 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 21:16:22 +0000 |
| commit | a4e86292a7f40c74642185d4ba9cab037da44753 (patch) | |
| tree | 870ef7d1fb63be77d46580f741b3cffeca290ee7 /tools/gn/function_set_defaults.cc | |
| parent | 59fbc1ced64f6cd7a6729d801bf82bd10a8de394 (diff) | |
| download | chromium_src-a4e86292a7f40c74642185d4ba9cab037da44753.zip chromium_src-a4e86292a7f40c74642185d4ba9cab037da44753.tar.gz chromium_src-a4e86292a7f40c74642185d4ba9cab037da44753.tar.bz2 | |
Don't dynamically scope GN templates.
Implement defined() for accessors so you can say defined(invoker.bar)
Implement a MakeClosure() function on Scope for cloning and flattening the variables in a scope for later use.
A new Template class that tracks both the template code and the closure information.
Hooking up the new template class to where we use templates.
R=scottmg@chromium.org, scottmg
Review URL: https://codereview.chromium.org/212933008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259991 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn/function_set_defaults.cc')
| -rw-r--r-- | tools/gn/function_set_defaults.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/gn/function_set_defaults.cc b/tools/gn/function_set_defaults.cc index 94e9ff3..17d1103 100644 --- a/tools/gn/function_set_defaults.cc +++ b/tools/gn/function_set_defaults.cc @@ -82,7 +82,8 @@ Value RunSetDefaults(Scope* scope, // Now copy the values set on the scope we made into the free-floating one // (with no containing scope) used to hold the target defaults. Scope* dest = scope->MakeTargetDefaults(target_type); - block_scope.NonRecursiveMergeTo(dest, function, "<SHOULD NOT FAIL>", err); + block_scope.NonRecursiveMergeTo(dest, false, function, + "<SHOULD NOT FAIL>", err); return Value(); } |