view etc/images/connect.xpm @ 106395:f2b36fb84bf7

Enhance `c-parse-state' to run efficiently in "brace desserts". * progmodes/cc-mode.el (c-basic-common-init): Call c-state-cache-init. (c-neutralize-syntax-in-and-mark-CPP): Renamed from c-extend-and-neutralize-syntax-in-CPP. Mark each CPP construct by placing `category' properties value 'c-cpp-delimiter at its boundaries. * progmodes/cc-langs.el (c-before-font-lock-function): c-extend-and-neutralize-syntax-in-CPP has been renamed c-neutralize-syntax-in-and-mark-CPP. * progmodes/cc-fonts.el (c-cpp-matchers): Mark template brackets with `category' properties now, not `syntax-table' ones. * progmodes/cc-engine.el (c-syntactic-end-of-macro): A new enhanced (but slower) version of c-end-of-macro that won't land inside a literal or on another awkward character. (c-state-cache-too-far, c-state-cache-start) (c-state-nonlit-pos-interval, c-state-nonlit-pos-cache) (c-state-nonlit-pos-cache-limit, c-state-point-min) (c-state-point-min-lit-type, c-state-point-min-lit-start) (c-state-min-scan-pos, c-state-brace-pair-desert) (c-state-old-cpp-beg, c-state-old-cpp-end): New constants and buffer local variables. (c-state-literal-at, c-state-lit-beg) (c-state-cache-non-literal-place, c-state-get-min-scan-pos) (c-state-mark-point-min-literal, c-state-cache-top-lparen) (c-state-cache-top-paren, c-state-cache-after-top-paren) (c-get-cache-scan-pos, c-get-fallback-scan-pos) (c-state-balance-parens-backwards, c-parse-state-get-strategy) (c-renarrow-state-cache) (c-append-lower-brace-pair-to-state-cache) (c-state-push-any-brace-pair, c-append-to-state-cache) (c-remove-stale-state-cache) (c-remove-stale-state-cache-backwards, c-state-cache-init) (c-invalidate-state-cache-1, c-parse-state-1) (c-invalidate-state-cache): New defuns/defmacros/defsubsts. (c-parse-state): Enhanced and refactored. (c-debug-parse-state): Amended to deal with all the new variables. * progmodes/cc-defs.el (c-<-as-paren-syntax, c-mark-<-as-paren) (c->-as-paren-syntax, c-mark->-as-paren, c-unmark-<->-as-paren): modify to use category text properties rather than syntax-table ones. (c-suppress-<->-as-parens, c-restore-<->-as-parens): new defsubsts to switch off/on the syntactic paren property of C++ template delimiters using the category property. (c-with-<->-as-parens-suppressed): Macro to invoke code with template delims suppressed. (c-cpp-delimiter, c-set-cpp-delimiters, c-clear-cpp-delimiters): New constant/macros which apply category properties to the start and end of preprocessor constructs. (c-comment-out-cpps, c-uncomment-out-cpps): defsubsts which "comment out" the syntactic value of characters in preprocessor constructs. (c-with-cpps-commented-out) (c-with-all-but-one-cpps-commented-out): Macros to invoke code with characters in all or all but one preprocessor constructs "commented out".

/* XPM */
static char * stock_connect_xpm[] = {
"24 24 58 1",
" 	c None",
".	c #000000",
"+	c #989389",
"@	c #807D74",
"#	c #C6C2BA",
"$	c #34332D",
"%	c #B7B3AA",
"&	c #C4C2BD",
"*	c #EAE8E3",
"=	c #9C978D",
"-	c #BCB9B2",
";	c #363433",
">	c #E2E1DD",
",	c #F0EFEC",
"'	c #AAA7A0",
")	c #F0EEEB",
"!	c #B2B0AB",
"~	c #F9F9F8",
"{	c #C5C3BD",
"]	c #0F0F0D",
"^	c #F2F0ED",
"/	c #EBEAE6",
"(	c #8A857B",
"_	c #ECEBE8",
":	c #EEECEA",
"<	c #9F9C93",
"[	c #F3F2F0",
"}	c #E8E7E4",
"|	c #E3E1DD",
"1	c #78756B",
"2	c #BEBBB5",
"3	c #B3B1AA",
"4	c #7D786E",
"5	c #E1DFDB",
"6	c #D1D0CC",
"7	c #938E84",
"8	c #C8C5BF",
"9	c #A7A298",
"0	c #010101",
"a	c #8C8981",
"b	c #A6A29B",
"c	c #726D63",
"d	c #CECAC3",
"e	c #A7A49E",
"f	c #7E7A70",
"g	c #A09D94",
"h	c #817D73",
"i	c #6C685E",
"j	c #3C3933",
"k	c #8B877E",
"l	c #706C62",
"m	c #B1ADA4",
"n	c #97938A",
"o	c #625E54",
"p	c #6A655B",
"q	c #37342D",
"r	c #646056",
"s	c #8B877D",
"                        ",
"                        ",
"                        ",
"                        ",
"                        ",
"                        ",
"          .. ..         ",
"        ..+@.#@..       ",
"       $%&*@.*@=-;      ",
"      .>,'*@.)@!~{]     ",
"......@>,'*@.)@!~{@.....",
"*******^/(_@.:@<[}|*****",
"@@@@@1123451.6@789@@@@@@",
".....01abcd1.e@fghi.....",
"      ]abcd1.e@fgh]     ",
"      ]jklmi.n@opq.     ",
"        ]]+r.s@..       ",
"          ]] ].         ",
"                        ",
"                        ",
"                        ",
"                        ",
"                        ",
"                        "};