mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support for removing a statement as a whole

Browse Source 
Change-Id: Icb7b017a0c76a6169f0f629bb40bf97449c75837
This commit is contained in:
Luboš Luňák
2012-12-20 23:08:52 +01:00
parent 217e3f2ea1
commit c26e655264
2 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
compilerplugins/clang/plugin.hxx
View File

@@ -44,18 +44,39 @@ class RewritePlugin
public:
explicit RewritePlugin( ASTContext& context, Rewriter& rewriter );
protected:
typedef Rewriter::RewriteOptions RewriteOptions;
// This enum allows passing just 'RemoveLineIfEmpty' to functions below.
enum RemoveLineIfEmpty_t { RemoveLineIfEmpty };
// Use this to remove the declaration/statement as a whole, i.e. all whitespace before the statement
// and the trailing semicolor (is not part of the AST element range itself).
// The trailing semicolon must be present.
enum RemoveWholeStatement_t { RemoveWholeStatement };
enum RemoveLineIfEmptyAndWholeStatement_t { RemoveLineIfEmptyAndWholeStatement };
// syntactic sugar to be able to write 'RemoveLineIfEmpty | RemoveWholeStatement'
friend RemoveLineIfEmptyAndWholeStatement_t operator|( RemoveLineIfEmpty_t, RemoveWholeStatement_t )
{ return RemoveLineIfEmptyAndWholeStatement; }
struct RewriteOptions
: public Rewriter::RewriteOptions
{
RewriteOptions() : RemoveWholeStatement( false ) {} // default
RewriteOptions( RemoveLineIfEmpty_t ) : RemoveWholeStatement( false ) { RemoveLineIfEmpty = true; }
RewriteOptions( RemoveWholeStatement_t ) : RemoveWholeStatement( true ) {}
RewriteOptions( RemoveLineIfEmptyAndWholeStatement_t ) : RemoveWholeStatement( true ) { RemoveLineIfEmpty = true; }
bool RemoveWholeStatement;
};
// These following insert/remove/replaceText functions map to functions
// in clang::Rewriter, with two differences:
// in clang::Rewriter, with these differences:
// - they (more intuitively) return false on failure rather than true
// - they report a warning when the change cannot be done
// - There is RemoveWholeStatement to also remove the trailing semicolon when removing (must be there)
// and al preceding whitespace.
bool insertText( SourceLocation Loc, StringRef Str,
bool InsertAfter = true, bool indentNewLines = false );
bool insertTextAfter( SourceLocation Loc, StringRef Str );
bool insertTextAfterToken( SourceLocation Loc, StringRef Str );
bool insertTextBefore( SourceLocation Loc, StringRef Str );
bool removeText( SourceLocation Start, unsigned Length, RewriteOptions opts = RewriteOptions());
bool removeText( CharSourceRange range, RewriteOptions opts = RewriteOptions());
// CharSourceRange not supported, unless really needed, as it makes RemoveSemicolon more complicated
//bool removeText( CharSourceRange range, RewriteOptions opts = RewriteOptions());
bool removeText( SourceRange range, RewriteOptions opts = RewriteOptions());
bool replaceText( SourceLocation Start, unsigned OrigLength, StringRef NewStr );
bool replaceText( SourceRange range, StringRef NewStr );
@@ -63,6 +84,7 @@ class RewritePlugin
Rewriter& rewriter;
private:
bool reportEditFailure( SourceLocation loc );
bool adjustForWholeStatement( SourceRange* range );
};
inline