- Fix commit in Parser.h (patch by Kevin Andre).

- Add comment and minor cleanup to yesterday's fix to ParseCallExpr().

llvm-svn: 40492

clang/Sema/SemaExpr.cpp

@@ -434,12 +434,10 @@ ParseCallExpr(ExprTy *fn, SourceLocation LParenLoc,
       QualType lhsType = proto->getArgType(i);
       QualType rhsType = argExpr->getType();
 
-      // C99 6.7.5.3p7
+      // If necessary, apply function/array conversion. C99 6.7.5.3p[7,8]. 
       if (const ArrayType *ary = lhsType->isArrayType())
         lhsType = Context.getPointerType(ary->getElementType());
-        
-      // C99 6.7.5.3p8
-      if (lhsType->isFunctionType())
+      else if (lhsType->isFunctionType())
         lhsType = Context.getPointerType(lhsType);
 
       AssignmentCheckResult result = CheckSingleAssignmentConstraints(lhsType,

clang/include/clang/Parse/Parser.h

@@ -225,7 +225,7 @@ private:
   }
   
   /// SkipUntil - Read tokens until we get to the specified token, then consume
-  /// it (unless DontConsume is false).  Because we cannot guarantee that the
+  /// it (unless DontConsume is true).  Because we cannot guarantee that the
   /// token will ever occur, this skips to the next token, or to some likely
   /// good stopping point.  If StopAtSemi is true, skipping will stop at a ';'
   /// character.