diff options
| author |   Stephen L Arnold <nerdboy@gentoo.org> | 2017-03-05 23:15:51 -0800 |
|---|---|---|
| committer | Stephen L Arnold <nerdboy@gentoo.org> | 2017-03-05 23:16:59 -0800 |
| commit | 0903db364fb0a9e3ce66947a374b5511e19525ac (patch) | |
| tree | ed118a26f34fc5735fbdf9e8de03663d016ca174 /dev-util | |
| parent | dev-ruby/travis: Install required assets, fix whitespace, bug 609506 (diff) | |
| download | gentoo-0903db364fb0a9e3ce66947a374b5511e19525ac.tar.gz gentoo-0903db364fb0a9e3ce66947a374b5511e19525ac.tar.bz2 gentoo-0903db364fb0a9e3ce66947a374b5511e19525ac.zip | |
dev-util/cccc: Add missing MFC dialect patch and options file
Closes bug 602368.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cccc/files/cccc-MFC-dialect.opt | 21 | ||||
| -rw-r--r-- | dev-util/cccc/files/cccc-c_dialect.patch | 79 |
2 files changed, 100 insertions, 0 deletions
diff --git a/dev-util/cccc/files/cccc-MFC-dialect.opt b/dev-util/cccc/files/cccc-MFC-dialect.opt new file mode 100644 index 000000000000..4c4acb32e1fb --- /dev/null +++ b/dev-util/cccc/files/cccc-MFC-dialect.opt @@ -0,0 +1,21 @@ +;;Pro*C embedded SQL +;; looks like +;; EXEC SQL UPDATE ARM43_OD_PRODUIT_SERV +;; SET ARM43ID_TPS_FIN = NULL WHERE +ARM43ID_TPS_FIN = 0; + +CCCC_FileExt@.pc@c++.ansi@ + +CCCC_Dialect@c++.pc@EXEC@skip_stmt@ + +;;MFC +CCCC_Dialect@c++.mfc@ON_WM_PAINT@skip_line@ +CCCC_Dialect@c++.mfc@DECLARE_MESSAGE_MAP@skip_line@ +CCCC_Dialect@c++.mfc@DECLARE_DISPATCH_MAP@skip_line@ + +CCCC_Dialect@c++.stl@__STL_BEGIN_NAMESPACE@ignore@ +CCCC_Dialect@c++.stl@__STL_END_NAMESPACE@ignore@ + +CCCC_Dialect@c++.mfc@BEGIN_EVENT_MAP@start_skipping@ +CCCC_Dialect@c++.mfc@END_EVENT_MAP@stop_skipping@ + diff --git a/dev-util/cccc/files/cccc-c_dialect.patch b/dev-util/cccc/files/cccc-c_dialect.patch new file mode 100644 index 000000000000..c8951aef13c4 --- /dev/null +++ b/dev-util/cccc/files/cccc-c_dialect.patch @@ -0,0 +1,79 @@ +diff --git a/cccc/cccc.g b/cccc/cccc.g +index bdb6805..fd7b504 100644 +--- a/cccc/cccc.g ++++ b/cccc/cccc.g +@@ -84,6 +84,30 @@ inline void endOfLine(CLexer &lexer) + #token MAC_NL "\r" << endOfLine(*this); >> + #token UNIX_NL "\n" << endOfLine(*this); >> + ++/* augment dialect policies -- M.H added */ ++#lexclass SKIP_STMT ++#token SKCOLON ";" << skip();mode(START); >> ++#token SKANYTHING "~[; \t\n]" << skip();more();>> ++#token SKNL "\n" << skip();endOfLine(*this);>> ++#token SKBLANK "[ \t]+" << skip(); >> ++#lexclass START ++ ++#lexclass SKIP_BLOCK ++#token SK_ANY "[a-zA-Z0-9_]*" ++<< ++std::string treatment = ++ CCCC_Options::dialectKeywordPolicy(parse_language,lextext()); ++ ++if ( treatment != "stop_skipping" ) ++{ ++ skip(); ++} ++else ++{ ++ mode(COMMENT_LINE);skip(); ++} ++>> ++#lexclass START + + /* preprocessor constructs - comments, #defines etc */ + +@@ -343,17 +367,29 @@ inline void endOfLine(CLexer &lexer) + if( treatment == "ignore" ) + { + skip(); ++ //std::cout << toktext << std::endl <<" :ignore" << std::endl; + } + // Ultimately, the next two cases will need to be handled + // using a #lexclass or something similar, for the moment + // we just try to skip the tokens themselves. + else if ( treatment == "start_skipping" ) + { +- skip(); ++ mode(SKIP_BLOCK);skip(); + } + else if ( treatment == "stop_skipping" ) + { +- skip(); ++ skip(); mode(COMMENT_LINE); ++ //gobble end of line M.H. ++ } ++ else if ( treatment == "skip_line" )//M.H added ++ { ++ mode(COMMENT_LINE);skip(); ++ //std::cout << "skip_line" << std::endl; ++ } ++ else if ( treatment == "skip_stmt" )//M.H added ++ { ++ mode(SKIP_STMT);skip(); ++ //std::cout << "skip_stmt" << std::endl; + } + >> + +@@ -426,8 +462,10 @@ void init(const string& filename, const string& language) + pu=ParseUtility::currentInstance(); + ps=ParseStore::currentInstance(); + +- ANTLRParser::init(); + parse_language=language; ++ ANTLRParser::init(); ++ //parse_language=language; ++ //move above, M.H.1st otherwise time init not to language + } + + >> |