Commit 9d0c8d3f authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r339372, r339373, r339374, and r339379 

------------------------------------------------------------------------
r339372 | steveire | 2018-08-09 22:05:03 +0200 (Thu, 09 Aug 2018) | 5 lines

Add getBeginLoc API to replace getLocStart

Subscribers: cfe-commits

Differential Revision: https://reviews.llvm.org/D50346
------------------------------------------------------------------------

------------------------------------------------------------------------
r339373 | steveire | 2018-08-09 22:05:18 +0200 (Thu, 09 Aug 2018) | 7 lines

Add getBeginLoc API to replace getStartLoc

Reviewers: teemperor!

Subscribers: cfe-commits

Differential Revision: https://reviews.llvm.org/D50347
------------------------------------------------------------------------

------------------------------------------------------------------------
r339374 | steveire | 2018-08-09 22:05:47 +0200 (Thu, 09 Aug 2018) | 5 lines

Add getEndLoc API to replace getLocEnd

Subscribers: cfe-commits

Differential Revision: https://reviews.llvm.org/D50348
------------------------------------------------------------------------

------------------------------------------------------------------------
r339379 | steveire | 2018-08-09 22:21:09 +0200 (Thu, 09 Aug 2018) | 1 line

Fix build
------------------------------------------------------------------------

llvm-svn: 340332
parent 5396514e

clang/include/clang/AST/Comment.h

+4 −6
Original line number Diff line number Diff line
@@ -215,13 +215,11 @@ public: 


  SourceRange getSourceRange() const LLVM_READONLY { return Range; }



  SourceLocation getLocStart() const LLVM_READONLY {

    return Range.getBegin();

  }

  SourceLocation getLocStart() const LLVM_READONLY { return getBeginLoc(); }

  SourceLocation getBeginLoc() const LLVM_READONLY { return Range.getBegin(); }



  SourceLocation getLocEnd() const LLVM_READONLY {

    return Range.getEnd();

  }

  SourceLocation getLocEnd() const LLVM_READONLY { return getEndLoc(); }

  SourceLocation getEndLoc() const LLVM_READONLY { return Range.getEnd(); }



  SourceLocation getLocation() const LLVM_READONLY { return Loc; }

clang/include/clang/AST/Decl.h

+8 −4
Original line number Diff line number Diff line
@@ -614,7 +614,8 @@ public: 
    return SourceRange(LocStart, RBraceLoc);

  }



  SourceLocation getLocStart() const LLVM_READONLY { return LocStart; }

  SourceLocation getLocStart() const LLVM_READONLY { return getBeginLoc(); }

  SourceLocation getBeginLoc() const LLVM_READONLY { return LocStart; }

  SourceLocation getRBraceLoc() const { return RBraceLoc; }

  void setLocStart(SourceLocation L) { LocStart = L; }

  void setRBraceLoc(SourceLocation L) { RBraceLoc = L; }
@@ -735,7 +736,8 @@ public: 


  SourceRange getSourceRange() const override LLVM_READONLY;



  SourceLocation getLocStart() const LLVM_READONLY {

  SourceLocation getLocStart() const LLVM_READONLY { return getBeginLoc(); }

  SourceLocation getBeginLoc() const LLVM_READONLY {

    return getOuterLocStart();

  }
@@ -2851,7 +2853,8 @@ public: 
  const Type *getTypeForDecl() const { return TypeForDecl; }

  void setTypeForDecl(const Type *TD) { TypeForDecl = TD; }



  SourceLocation getLocStart() const LLVM_READONLY { return LocStart; }

  SourceLocation getLocStart() const LLVM_READONLY { return getBeginLoc(); }

  SourceLocation getBeginLoc() const LLVM_READONLY { return LocStart; }

  void setLocStart(SourceLocation L) { LocStart = L; }

  SourceRange getSourceRange() const override LLVM_READONLY {

    if (LocStart.isValid())
@@ -4223,7 +4226,8 @@ public: 
  SourceLocation getRBraceLoc() const { return RBraceLoc; }

  void setRBraceLoc(SourceLocation L) { RBraceLoc = L; }



  SourceLocation getLocEnd() const LLVM_READONLY {

  SourceLocation getLocEnd() const LLVM_READONLY { return getEndLoc(); }

  SourceLocation getEndLoc() const LLVM_READONLY {

    if (RBraceLoc.isValid())

      return RBraceLoc;

    // No braces: get the end location of the (only) declaration in context

clang/include/clang/AST/DeclBase.h

+4 −2
Original line number Diff line number Diff line
@@ -406,11 +406,13 @@ public: 
    return SourceRange(getLocation(), getLocation());

  }



  SourceLocation getLocStart() const LLVM_READONLY {

  SourceLocation getLocStart() const LLVM_READONLY { return getBeginLoc(); }

  SourceLocation getBeginLoc() const LLVM_READONLY {

    return getSourceRange().getBegin();

  }



  SourceLocation getLocEnd() const LLVM_READONLY {

  SourceLocation getLocEnd() const LLVM_READONLY { return getEndLoc(); }

  SourceLocation getEndLoc() const LLVM_READONLY {

    return getSourceRange().getEnd();

  }

clang/include/clang/AST/DeclCXX.h

+6 −3
Original line number Diff line number Diff line
@@ -233,8 +233,10 @@ public: 


  /// Retrieves the source range that contains the entire base specifier.

  SourceRange getSourceRange() const LLVM_READONLY { return Range; }

  SourceLocation getLocStart() const LLVM_READONLY { return Range.getBegin(); }

  SourceLocation getLocEnd() const LLVM_READONLY { return Range.getEnd(); }

  SourceLocation getLocStart() const LLVM_READONLY { return getBeginLoc(); }

  SourceLocation getBeginLoc() const LLVM_READONLY { return Range.getBegin(); }

  SourceLocation getLocEnd() const LLVM_READONLY { return getEndLoc(); }

  SourceLocation getEndLoc() const LLVM_READONLY { return Range.getEnd(); }



  /// Get the location at which the base class type was written.

  SourceLocation getBaseTypeLoc() const LLVM_READONLY {
@@ -2884,7 +2886,8 @@ public: 
    HasBraces = RBraceLoc.isValid();

  }



  SourceLocation getLocEnd() const LLVM_READONLY {

  SourceLocation getLocEnd() const LLVM_READONLY { return getEndLoc(); }

  SourceLocation getEndLoc() const LLVM_READONLY {

    if (hasBraces())

      return getRBraceLoc();

    // No braces: get the end location of the (only) declaration in context

clang/include/clang/AST/DeclObjC.h

+6 −3
Original line number Diff line number Diff line
@@ -318,8 +318,10 @@ public: 
  SourceLocation getDeclaratorEndLoc() const { return DeclEndLoc; }



  // Location information, modeled after the Stmt API.

  SourceLocation getLocStart() const LLVM_READONLY { return getLocation(); }

  SourceLocation getLocEnd() const LLVM_READONLY;

  SourceLocation getLocStart() const LLVM_READONLY { return getBeginLoc(); }

  SourceLocation getBeginLoc() const LLVM_READONLY { return getLocation(); }

  SourceLocation getLocEnd() const LLVM_READONLY { return getEndLoc(); }

  SourceLocation getEndLoc() const LLVM_READONLY;

  SourceRange getSourceRange() const override LLVM_READONLY {

    return SourceRange(getLocation(), getLocEnd());

  }
@@ -2831,7 +2833,8 @@ public: 


  SourceRange getSourceRange() const override LLVM_READONLY;



  SourceLocation getLocStart() const LLVM_READONLY { return AtLoc; }

  SourceLocation getLocStart() const LLVM_READONLY { return getBeginLoc(); }

  SourceLocation getBeginLoc() const LLVM_READONLY { return AtLoc; }

  void setAtLoc(SourceLocation Loc) { AtLoc = Loc; }



  ObjCPropertyDecl *getPropertyDecl() const {