[PATCH] Correctly check for the main file in the presence of line markers

Eli Friedman eli.friedman at gmail.com
Wed Aug 21 17:00:41 PDT 2013


On Wed, Aug 21, 2013 at 2:53 PM, Richard Smith <richard at metafoo.co.uk>wrote:

> I think isPresumedFromMainFile should be the more common choice, so maybe
> should have the more obvious name. Perhaps call the new mechanism
> isFromMainFile and rename the existing mechanism to isWrittenInMainFile?
> I'm still not overjoyed with those names.
>
> FWIW, all calls of isFromMainFile in lib/StaticAnalyzer look like they
> should be using the new mechanism, for consistency when handling
> preprocessed source. [That only leaves the calls in lib/Rewrite and
> VerifyDiagnosticConsumer (both of which should stay as-is), and the one
> caller of isInPrimaryFile that you didn't change (which seems reasonable to
> switch over, assuming the #include_next implementation can cope with
> presumed locations).]
>
>
> +  /// whether it came from a file other than the main file. This is
> different
> +  // from isFromMainFile() because it takes line marker directives into
> +  // account.
>
> /// not // here :-)
>
>
> The testing seems a little light.
>

Do you have any suggestions for tests?  I'm not sure adding a test for
every user of isMainFile is productive.

-Eli
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20130821/a8021e2b/attachment.html>


More information about the cfe-commits mailing list