[cfe-commits] r40492 - in /cfe/trunk: Sema/SemaExpr.cpp include/clang/Parse/Parser.h

[Steve Naroff]

Author: snaroff
Date: Wed Jul 25 15:45:33 2007
New Revision: 40492

URL: http://llvm.org/viewvc/llvm-project?rev=40492&view=rev
Log:
- Fix commit in Parser.h (patch by Kevin Andre).
- Add comment and minor cleanup to yesterday's fix to ParseCallExpr().

Modified:
    cfe/trunk/Sema/SemaExpr.cpp
    cfe/trunk/include/clang/Parse/Parser.h

Modified: cfe/trunk/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Sema/SemaExpr.cpp?rev=40492&r1=40491&r2=40492&view=diff

==============================================================================
--- cfe/trunk/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/Sema/SemaExpr.cpp Wed Jul 25 15:45:33 2007
@@ -434,12 +434,10 @@
       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,

Modified: cfe/trunk/include/clang/Parse/Parser.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/Parser.h?rev=40492&r1=40491&r2=40492&view=diff

==============================================================================
--- cfe/trunk/include/clang/Parse/Parser.h (original)
+++ cfe/trunk/include/clang/Parse/Parser.h Wed Jul 25 15:45:33 2007
@@ -225,7 +225,7 @@
   }
   
   /// 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.