Refactor MacroInfo for easier access in for-loops

[• edse]

Summary

Added possibilty to extract the arguments in a MacroInfo as a container in order to use C++11 style for loops.

[danielmarjamaki]

looks good to me

[alexfh]

Looks good with comments.

include/clang/Lex/MacroInfo.h

185

I'd probably go with ArrayRef<const IdentifierInfo*>, if no potential users need a non-const version.

lib/Lex/PPMacroExpansion.cpp

365

Lines 365-369 can be replaced with:

return std::find(MI->args_begin(), MI->args_end(), II) == MI->args_end();

lib/Serialization/ASTWriter.cpp

2138

Specifying the exact type would make the code more readable here, imho:

for (const IdentifierInfo *I : MI->args())
  ...

[danielmarjamaki]

I applied patch you gave me. rL238547

include/clang/Lex/MacroInfo.h

public:
   }
 
   /// Arguments - The list of arguments for a function-like macro.  This can be
   /// empty, for, e.g. "#define X()".
   typedef IdentifierInfo* const *arg_iterator;
   bool arg_empty() const { return NumArguments == 0; }
   arg_iterator arg_begin() const { return ArgumentList; }
   arg_iterator arg_end() const { return ArgumentList+NumArguments; }
+  ArrayRef<IdentifierInfo*> args() const {
+    return ArrayRef<IdentifierInfo*>(ArgumentList, NumArguments);
+  }
   unsigned getNumArgs() const { return NumArguments; }
 
   /// \brief Return the argument number of the specified identifier,
   /// or -1 if the identifier is not a formal argument identifier.
   int getArgumentNum(IdentifierInfo *Arg) const {
     for (arg_iterator I = arg_begin(), E = arg_end(); I != E; ++I)
       if (*I == Arg) return I-arg_begin();
     return -1;

lib/Lex/PPMacroExpansion.cpp

if (ExpansionMI->isEnabled() &&
       return false;
 
   // If this is an object-like macro invocation, it is safe to trivially expand
   // it.
   if (MI->isObjectLike()) return true;
 
   // If this is a function-like macro invocation, it's safe to trivially expand
   // as long as the identifier is not a macro argument.
-  for (MacroInfo::arg_iterator I = MI->arg_begin(), E = MI->arg_end();
-       I != E; ++I)
-    if (*I == II)
+  for (const auto &I : MI->args())
+    if (I == II)
       return false;   // Identifier is a macro argument.
 
   return true;
 }
 
 
 /// isNextPPTokenLParen - Determine whether the next preprocessor token to be
 /// lexed is a '('.  If so, consume the token and return true, if not, this

lib/Serialization/ASTWriter.cpp

if (MI->isObjectLike()) {
       Code = PP_MACRO_OBJECT_LIKE;
     } else {
       Code = PP_MACRO_FUNCTION_LIKE;
 
       Record.push_back(MI->isC99Varargs());
       Record.push_back(MI->isGNUVarargs());
       Record.push_back(MI->hasCommaPasting());
       Record.push_back(MI->getNumArgs());
-      for (MacroInfo::arg_iterator I = MI->arg_begin(), E = MI->arg_end();
-           I != E; ++I)
-        AddIdentifierRef(*I, Record);
+      for (const auto &I : MI->args())
+        AddIdentifierRef(I, Record);
     }
 
     // If we have a detailed preprocessing record, record the macro definition
     // ID that corresponds to this macro.
     if (PPRec)
       Record.push_back(MacroDefinitions[PPRec->findMacroDefinition(MI)]);
 
     Stream.EmitRecord(Code, Record);