GYP generator for GN

tools/gn/args.h

Index: tools/gn/args.h
diff --git a/tools/gn/args.h b/tools/gn/args.h
index d3225ca1d7f3e55ff660b23e04c6ec5d3b9ba23c..5abc127d5fcaf36ad48ce3feb24a669a45eb333e 100644
--- a/tools/gn/args.h
+++ b/tools/gn/args.h
@@ -23,10 +23,12 @@ extern const char kBuildArgs_Help[];
 class Args {
  public:
   Args();
+  Args(const Args& other);
   ~Args();
 
   // Specifies overrides of the build arguments. These are normally specified
   // on the command line.
+  void AddArgOverride(const char* name, const Value& value);
   void AddArgOverrides(const Scope::KeyValueMap& overrides);
 
   // Sets up the root scope for a toolchain. This applies the default system
@@ -82,7 +84,7 @@ class Args {
   // the user set variables on the command line that are not used anywhere.
   mutable Scope::KeyValueMap declared_arguments_;
 
-  DISALLOW_COPY_AND_ASSIGN(Args);
+  Args& operator=(const Args& other);  // Disallow assignment.

[scottmg, 2013/10/15 19:58:21]

I'm assuming somewhere says you shouldn't do this because of "Args x = y;".

[brettw, 2013/10/15 21:18:06]

Yes, Google style says you should do disallow copy and assign. I first write a
clone() function, but that make it more likely that somebody forgets to edit it
when adding a field, which is dangerous. So I figured this is a case where
readable code trumps the letter of the style guide (since I do want to copy
these in some cases). My concession was I can at least prevent assignment,
although I think in your example the compiler is likely to convert that to a
call to the copy constructor.

[scottmg, 2013/10/15 21:19:54]

Yes, that's what I meant. It seems like you should implement op= instead then.

 };
 
 #endif  // TOOLS_GN_ARGS_H_