diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmDependsJavaParserHelper.cxx | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Source/cmDependsJavaParserHelper.cxx')
-rw-r--r-- | Source/cmDependsJavaParserHelper.cxx | 333 |
1 files changed, 131 insertions, 202 deletions
diff --git a/Source/cmDependsJavaParserHelper.cxx b/Source/cmDependsJavaParserHelper.cxx index 51a1cb4..bd3ee4d 100644 --- a/Source/cmDependsJavaParserHelper.cxx +++ b/Source/cmDependsJavaParserHelper.cxx @@ -15,7 +15,7 @@ #include "cmSystemTools.h" #include <cmsys/FStream.hxx> -int cmDependsJava_yyparse( yyscan_t yyscanner ); +int cmDependsJava_yyparse(yyscan_t yyscanner); cmDependsJavaParserHelper::cmDependsJavaParserHelper() { @@ -29,185 +29,152 @@ cmDependsJavaParserHelper::cmDependsJavaParserHelper() this->ClassStack.push_back(tl); } - cmDependsJavaParserHelper::~cmDependsJavaParserHelper() { this->CleanupParser(); } -void cmDependsJavaParserHelper::CurrentClass -::AddFileNamesForPrinting(std::vector<std::string> *files, - const char* prefix, const char* sep) +void cmDependsJavaParserHelper::CurrentClass::AddFileNamesForPrinting( + std::vector<std::string>* files, const char* prefix, const char* sep) { std::string rname = ""; - if ( prefix ) - { + if (prefix) { rname += prefix; rname += sep; - } + } rname += this->Name; files->push_back(rname); std::vector<CurrentClass>::iterator it; - for ( it = this->NestedClasses->begin(); - it != this->NestedClasses->end(); - ++ it ) - { + for (it = this->NestedClasses->begin(); it != this->NestedClasses->end(); + ++it) { it->AddFileNamesForPrinting(files, rname.c_str(), sep); - } + } } void cmDependsJavaParserHelper::DeallocateParserType(char** pt) { - if (!pt) - { + if (!pt) { return; - } - if (!*pt) - { + } + if (!*pt) { return; - } + } *pt = 0; - this->UnionsAvailable --; + this->UnionsAvailable--; } void cmDependsJavaParserHelper::AddClassFound(const char* sclass) { - if( ! sclass ) - { + if (!sclass) { return; - } + } std::vector<std::string>::iterator it; - for ( it = this->ClassesFound.begin(); - it != this->ClassesFound.end(); - it ++ ) - { - if ( *it == sclass ) - { + for (it = this->ClassesFound.begin(); it != this->ClassesFound.end(); it++) { + if (*it == sclass) { return; - } } + } this->ClassesFound.push_back(sclass); } void cmDependsJavaParserHelper::AddPackagesImport(const char* sclass) { std::vector<std::string>::iterator it; - for ( it = this->PackagesImport.begin(); - it != this->PackagesImport.end(); - it ++ ) - { - if ( *it == sclass ) - { + for (it = this->PackagesImport.begin(); it != this->PackagesImport.end(); + it++) { + if (*it == sclass) { return; - } } + } this->PackagesImport.push_back(sclass); } -void cmDependsJavaParserHelper::SafePrintMissing(const char* str, - int line, int cnt) +void cmDependsJavaParserHelper::SafePrintMissing(const char* str, int line, + int cnt) { - if ( str ) - { + if (str) { std::cout << line << " String " << cnt << " exists: "; unsigned int cc; - for ( cc = 0; cc < strlen(str); cc ++ ) - { + for (cc = 0; cc < strlen(str); cc++) { unsigned char ch = str[cc]; - if ( ch >= 32 && ch <= 126 ) - { + if (ch >= 32 && ch <= 126) { std::cout << (char)ch; - } - else - { + } else { std::cout << "<" << (int)ch << ">"; break; - } } - std::cout << "- " << strlen(str) << std::endl; } + std::cout << "- " << strlen(str) << std::endl; + } } void cmDependsJavaParserHelper::Print(const char* place, const char* str) { - if ( this->Verbose ) - { + if (this->Verbose) { std::cout << "[" << place << "=" << str << "]" << std::endl; - } + } } -void cmDependsJavaParserHelper::CombineUnions(char** out, - const char* in1, char** in2, - const char* sep) +void cmDependsJavaParserHelper::CombineUnions(char** out, const char* in1, + char** in2, const char* sep) { size_t len = 1; - if ( in1 ) - { + if (in1) { len += strlen(in1); - } - if ( *in2 ) - { + } + if (*in2) { len += strlen(*in2); - } - if ( sep ) - { + } + if (sep) { len += strlen(sep); - } - *out = new char [ len ]; + } + *out = new char[len]; *out[0] = 0; - if ( in1 ) - { + if (in1) { strcat(*out, in1); - } - if ( sep ) - { + } + if (sep) { strcat(*out, sep); - } - if ( *in2 ) - { + } + if (*in2) { strcat(*out, *in2); - } - if ( *in2 ) - { + } + if (*in2) { this->DeallocateParserType(in2); - } - this->UnionsAvailable ++; + } + this->UnionsAvailable++; } -void cmDependsJavaParserHelper -::CheckEmpty(int line, int cnt, cmDependsJavaParserHelper::ParserType* pt) +void cmDependsJavaParserHelper::CheckEmpty( + int line, int cnt, cmDependsJavaParserHelper::ParserType* pt) { int cc; int kk = -cnt + 1; - for ( cc = 1; cc <= cnt; cc ++) - { + for (cc = 1; cc <= cnt; cc++) { cmDependsJavaParserHelper::ParserType* cpt = pt + kk; this->SafePrintMissing(cpt->str, line, cc); - kk ++; - } + kk++; + } } -void cmDependsJavaParserHelper -::PrepareElement(cmDependsJavaParserHelper::ParserType* me) +void cmDependsJavaParserHelper::PrepareElement( + cmDependsJavaParserHelper::ParserType* me) { // Inititalize self me->str = 0; } -void cmDependsJavaParserHelper -::AllocateParserType(cmDependsJavaParserHelper::ParserType* pt, - const char* str, int len) +void cmDependsJavaParserHelper::AllocateParserType( + cmDependsJavaParserHelper::ParserType* pt, const char* str, int len) { pt->str = 0; - if ( len == 0 ) - { + if (len == 0) { len = (int)strlen(str); - } - if ( len == 0 ) - { + } + if (len == 0) { return; - } - this->UnionsAvailable ++; - pt->str = new char[ len + 1 ]; + } + this->UnionsAvailable++; + pt->str = new char[len + 1]; strncpy(pt->str, str, len); pt->str[len] = 0; this->Allocates.push_back(pt->str); @@ -219,51 +186,43 @@ void cmDependsJavaParserHelper::StartClass(const char* cls) cl.Name = cls; this->ClassStack.push_back(cl); - this->CurrentDepth ++; + this->CurrentDepth++; } void cmDependsJavaParserHelper::EndClass() { CurrentClass* parent = 0; CurrentClass* current = 0; - if (!this->ClassStack.empty()) - { + if (!this->ClassStack.empty()) { current = &(*(this->ClassStack.end() - 1)); - if ( this->ClassStack.size() > 1 ) - { + if (this->ClassStack.size() > 1) { parent = &(*(this->ClassStack.end() - 2)); - } } - if ( current == 0 ) - { + } + if (current == 0) { std::cerr << "Error when parsing. Current class is null" << std::endl; abort(); - } - if ( parent == 0 ) - { + } + if (parent == 0) { std::cerr << "Error when parsing. Parent class is null" << std::endl; abort(); - } - this->CurrentDepth --; + } + this->CurrentDepth--; parent->NestedClasses->push_back(*current); - this->ClassStack.erase(this->ClassStack.end()-1, this->ClassStack.end()); + this->ClassStack.erase(this->ClassStack.end() - 1, this->ClassStack.end()); } void cmDependsJavaParserHelper::PrintClasses() { - if (this->ClassStack.empty()) - { + if (this->ClassStack.empty()) { std::cerr << "Error when parsing. No classes on class stack" << std::endl; abort(); - } + } std::vector<std::string> files = this->GetFilesProduced(); std::vector<std::string>::iterator sit; - for ( sit = files.begin(); - sit != files.end(); - ++ sit ) - { + for (sit = files.begin(); sit != files.end(); ++sit) { std::cout << " " << *sit << ".class" << std::endl; - } + } } std::vector<std::string> cmDependsJavaParserHelper::GetFilesProduced() @@ -271,77 +230,62 @@ std::vector<std::string> cmDependsJavaParserHelper::GetFilesProduced() std::vector<std::string> files; CurrentClass* toplevel = &(*(this->ClassStack.begin())); std::vector<CurrentClass>::iterator it; - for ( it = toplevel->NestedClasses->begin(); - it != toplevel->NestedClasses->end(); - ++ it ) - { + for (it = toplevel->NestedClasses->begin(); + it != toplevel->NestedClasses->end(); ++it) { it->AddFileNamesForPrinting(&files, 0, "$"); - } + } return files; } int cmDependsJavaParserHelper::ParseString(const char* str, int verb) { - if ( !str) - { + if (!str) { return 0; - } + } this->Verbose = verb; this->InputBuffer = str; this->InputBufferPos = 0; this->CurrentLine = 0; - yyscan_t yyscanner; cmDependsJava_yylex_init(&yyscanner); cmDependsJava_yyset_extra(this, yyscanner); int res = cmDependsJava_yyparse(yyscanner); cmDependsJava_yylex_destroy(yyscanner); - if ( res != 0 ) - { + if (res != 0) { std::cout << "JP_Parse returned: " << res << std::endl; return 0; - } + } - if ( verb ) - { - if (!this->CurrentPackage.empty()) - { - std::cout << "Current package is: " << - this->CurrentPackage << std::endl; - } + if (verb) { + if (!this->CurrentPackage.empty()) { + std::cout << "Current package is: " << this->CurrentPackage << std::endl; + } std::cout << "Imports packages:"; - if (!this->PackagesImport.empty()) - { + if (!this->PackagesImport.empty()) { std::vector<std::string>::iterator it; - for ( it = this->PackagesImport.begin(); - it != this->PackagesImport.end(); - ++ it ) - { + for (it = this->PackagesImport.begin(); it != this->PackagesImport.end(); + ++it) { std::cout << " " << *it; - } } + } std::cout << std::endl; std::cout << "Depends on:"; - if (!this->ClassesFound.empty()) - { + if (!this->ClassesFound.empty()) { std::vector<std::string>::iterator it; - for ( it = this->ClassesFound.begin(); - it != this->ClassesFound.end(); - ++ it ) - { + for (it = this->ClassesFound.begin(); it != this->ClassesFound.end(); + ++it) { std::cout << " " << *it; - } } + } std::cout << std::endl; std::cout << "Generated files:" << std::endl; this->PrintClasses(); - if ( this->UnionsAvailable != 0 ) - { - std::cout << "There are still " << - this->UnionsAvailable << " unions available" << std::endl; - } + if (this->UnionsAvailable != 0) { + std::cout << "There are still " << this->UnionsAvailable + << " unions available" << std::endl; } + } this->CleanupParser(); return 1; } @@ -349,82 +293,67 @@ int cmDependsJavaParserHelper::ParseString(const char* str, int verb) void cmDependsJavaParserHelper::CleanupParser() { std::vector<char*>::iterator it; - for ( it = this->Allocates.begin(); - it != this->Allocates.end(); - ++ it ) - { - delete [] *it; - } - this->Allocates.erase(this->Allocates.begin(), - this->Allocates.end()); + for (it = this->Allocates.begin(); it != this->Allocates.end(); ++it) { + delete[] * it; + } + this->Allocates.erase(this->Allocates.begin(), this->Allocates.end()); } int cmDependsJavaParserHelper::LexInput(char* buf, int maxlen) { - if ( maxlen < 1 ) - { + if (maxlen < 1) { return 0; - } - if ( this->InputBufferPos < this->InputBuffer.size() ) - { - buf[0] = this->InputBuffer[ this->InputBufferPos++ ]; - if ( buf[0] == '\n' ) - { - this->CurrentLine ++; - } - return(1); - } - else - { + } + if (this->InputBufferPos < this->InputBuffer.size()) { + buf[0] = this->InputBuffer[this->InputBufferPos++]; + if (buf[0] == '\n') { + this->CurrentLine++; + } + return (1); + } else { buf[0] = '\n'; - return( 0 ); - } + return (0); + } } void cmDependsJavaParserHelper::Error(const char* str) { unsigned long pos = static_cast<unsigned long>(this->InputBufferPos); - fprintf(stderr, "JPError: %s (%lu / Line: %d)\n", - str, pos, this->CurrentLine); + fprintf(stderr, "JPError: %s (%lu / Line: %d)\n", str, pos, + this->CurrentLine); int cc; std::cerr << "String: ["; - for ( cc = 0; - cc < 30 && *(this->InputBuffer.c_str() + this->InputBufferPos + cc); - cc ++ ) - { + for (cc = 0; + cc < 30 && *(this->InputBuffer.c_str() + this->InputBufferPos + cc); + cc++) { std::cerr << *(this->InputBuffer.c_str() + this->InputBufferPos + cc); - } + } std::cerr << "]" << std::endl; } void cmDependsJavaParserHelper::UpdateCombine(const char* str1, const char* str2) { - if ( this->CurrentCombine == "" && str1 != 0) - { + if (this->CurrentCombine == "" && str1 != 0) { this->CurrentCombine = str1; - } + } this->CurrentCombine += "."; this->CurrentCombine += str2; } int cmDependsJavaParserHelper::ParseFile(const char* file) { - if ( !cmSystemTools::FileExists(file)) - { + if (!cmSystemTools::FileExists(file)) { return 0; - } + } cmsys::ifstream ifs(file); - if ( !ifs ) - { + if (!ifs) { return 0; - } + } std::string fullfile = ""; std::string line; - while ( cmSystemTools::GetLineFromStream(ifs, line) ) - { + while (cmSystemTools::GetLineFromStream(ifs, line)) { fullfile += line + "\n"; - } + } return this->ParseString(fullfile.c_str(), 0); } - |