Fix getLoc() for DotSyntaxCallExpr.

Eli Friedman · Eli Friedman · commit 2947962120f4 · 2012-05-25T21:22:41.000Z
Swift SVN r1999
diff --git a/include/swift/AST/Expr.h b/include/swift/AST/Expr.h
@@ -1578,9 +1578,11 @@ class DotSyntaxCallExpr : public ThisApplyExpr {
   }
 
   SourceLoc getDotLoc() const { return DotLoc; }
-  SourceLoc getLoc() const { return getArg()->getStartLoc(); }
+  SourceLoc getLoc() const {
+    return DotLoc.isValid() ? getArg()->getStartLoc() : getFn()->getStartLoc();
+  }
   SourceLoc getEndLoc() const {
-    return DotLoc.isValid()? getFn()->getEndLoc() : getArg()->getEndLoc();
+    return getFn()->getEndLoc();
   }
   
   SourceRange getSourceRange() const {

Original file line number	Diff line number	Diff line change
`@@ -1578,9 +1578,11 @@ class DotSyntaxCallExpr : public ThisApplyExpr {`
`1578`	`1578`	`}`
`1579`	`1579`
`1580`	`1580`	`SourceLoc getDotLoc() const { return DotLoc; }`
`1581`		`- SourceLoc getLoc() const { return getArg()->getStartLoc(); }`
	`1581`	`+ SourceLoc getLoc() const {`
	`1582`	`+ return DotLoc.isValid() ? getArg()->getStartLoc() : getFn()->getStartLoc();`
	`1583`	`+ }`
`1582`	`1584`	`SourceLoc getEndLoc() const {`
`1583`		`- return DotLoc.isValid()? getFn()->getEndLoc() : getArg()->getEndLoc();`
	`1585`	`+ return getFn()->getEndLoc();`
`1584`	`1586`	`}`
`1585`	`1587`
`1586`	`1588`	`SourceRange getSourceRange() const {`