From 09bfa665367477ab14baea643ca565f163c49b41 Mon Sep 17 00:00:00 2001 From: Edoardo Prezioso Date: Wed, 28 Dec 2011 22:51:13 +0100 Subject: [PATCH] Always by pressing request, oops. --- lib/tokenize.cpp | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp index c05c1df7f..e73fe752d 100644 --- a/lib/tokenize.cpp +++ b/lib/tokenize.cpp @@ -2625,6 +2625,34 @@ void Tokenizer::simplifyDoublePlusAndDoubleMinus() } } +void Tokenizer::simplifyJavaAndCSharp() +{ + // better don't call isJava in the loop + bool isJava_ = isJava(); + for (Token *tok = _tokens; tok; tok = tok->next()) { + if (tok->str() == "private") + tok->str("private:"); + else if (tok->str() == "protected") + tok->str("protected:"); + else if (tok->str() == "public") + tok->str("public:"); + + else if (isJava_) { + if (Token::Match(tok, ") throws %var% {")) + tok->deleteNext(2); + } else { + if (Token::Match(tok, "%type% [ ] %var% [=;]") && + (!tok->previous() || Token::Match(tok->previous(), "[;{}]"))) { + tok->deleteNext(2); + tok->insertToken("*"); + tok = tok->tokAt(2); + if (tok->next()->str() == "=") + tok = tok->next(); + } + } + } +} + /** Specify array size if it hasn't been given */ void Tokenizer::arraySize()