[gtksourceview] Moved contexts out of main context and placed main context to bottom. Moved regexs to top.
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] Moved contexts out of main context and placed main context to bottom. Moved regexs to top.
- Date: Wed, 18 May 2011 17:30:00 +0000 (UTC)
commit 92311794113013127ca2c42d14d91b67b0558370
Author: Carnë Draug <carandraug+dev gmail com>
Date: Wed May 18 17:04:15 2011 +0100
Moved contexts out of main context and placed main context to bottom. Moved regexs to top.
data/language-specs/c.lang | 428 +++++++++++++++++++++++---------------------
1 files changed, 224 insertions(+), 204 deletions(-)
---
diff --git a/data/language-specs/c.lang b/data/language-specs/c.lang
index 823d3c4..4dc6f07 100644
--- a/data/language-specs/c.lang
+++ b/data/language-specs/c.lang
@@ -54,6 +54,17 @@
</styles>
<definitions>
+ <!--regexs-->
+ <define-regex id="escaped-character" extended="true">
+ \\( # leading backslash
+ [\\\"\'nrbtfav\?] | # escaped character
+ [0-7]{1,3} | # one, two, or three octal digits
+ x[0-9A-Fa-f]+ # 'x' followed by hex digits
+ )
+ </define-regex>
+ <define-regex id="preproc-start">^\s*#\s*</define-regex>
+
+ <!--contexts NOT used on the main context-->
<!-- TODO: what about scanf ? -->
<!-- man 3 printf -->
<context id="printf" style-ref="printf" extend-parent="false">
@@ -68,237 +79,246 @@
</match>
</context>
- <define-regex id="escaped-character" extended="true">
- \\( # leading backslash
- [\\\"\'nrbtfav\?] | # escaped character
- [0-7]{1,3} | # one, two, or three octal digits
- x[0-9A-Fa-f]+ # 'x' followed by hex digits
- )
- </define-regex>
+ <!--contexts used on the main context-->
+ <!-- Comments -->
+ <context id="comment" style-ref="comment" end-at-line-end="true" class="comment" class-disabled="no-spell-check">
+ <start>//</start>
- <context id="c" class="no-spell-check">
<include>
+ <context ref="def:in-line-comment"/>
+ </include>
+ </context>
- <!-- gtk-doc -->
- <context ref="gtk-doc:inline-docs-section"/>
-
- <!-- Comments -->
- <context id="comment" style-ref="comment" end-at-line-end="true" class="comment" class-disabled="no-spell-check">
- <start>//</start>
-
- <include>
- <context ref="def:in-line-comment"/>
- </include>
- </context>
-
- <context id="comment-multiline" style-ref="comment" class="comment" class-disabled="no-spell-check">
- <start>/\*</start>
- <end>\*/</end>
- <include>
- <context ref="def:in-comment"/>
- </include>
- </context>
-
- <context id="close-comment-outside-comment" style-ref="error">
- <match>\*/(?!\*)</match>
- </context>
+ <context id="comment-multiline" style-ref="comment" class="comment" class-disabled="no-spell-check">
+ <start>/\*</start>
+ <end>\*/</end>
+ <include>
+ <context ref="def:in-comment"/>
+ </include>
+ </context>
- <!-- Preprocessor -->
- <define-regex id="preproc-start">^\s*#\s*</define-regex>
+ <context id="close-comment-outside-comment" style-ref="error">
+ <match>\*/(?!\*)</match>
+ </context>
- <context id="if0-comment" style-ref="comment">
- <start>\%{preproc-start}if\b\s*0\b</start>
- <end>\%{preproc-start}(endif|else|elif)\b</end>
+ <!-- Preprocessor -->
+ <context id="if0-comment" style-ref="comment">
+ <start>\%{preproc-start}if\b\s*0\b</start>
+ <end>\%{preproc-start}(endif|else|elif)\b</end>
+ <include>
+ <context id="if-in-if0">
+ <start>\%{preproc-start}if(n?def)?\b</start>
+ <end>\%{preproc-start}endif\b</end>
<include>
- <context id="if-in-if0">
- <start>\%{preproc-start}if(n?def)?\b</start>
- <end>\%{preproc-start}endif\b</end>
- <include>
- <context ref="if-in-if0"/>
- <context ref="def:in-comment"/>
- </include>
- </context>
+ <context ref="if-in-if0"/>
<context ref="def:in-comment"/>
</include>
</context>
+ <context ref="def:in-comment"/>
+ </include>
+ </context>
- <context id="include" style-ref="preprocessor">
- <match extended="true">
- \%{preproc-start}
- (include|import)\s*
- (".*?"|<.*>)
- </match>
- <include>
- <context id="included-file" sub-pattern="2" style-ref="included-file"/>
- </include>
- </context>
+ <context id="include" style-ref="preprocessor">
+ <match extended="true">
+ \%{preproc-start}
+ (include|import)\s*
+ (".*?"|<.*>)
+ </match>
+ <include>
+ <context id="included-file" sub-pattern="2" style-ref="included-file"/>
+ </include>
+ </context>
- <context id="preprocessor" style-ref="preprocessor" end-at-line-end="true">
- <start extended="true">
- \%{preproc-start}
- (define|undef|error|pragma|ident|if(n?def)?|else|elif|endif|line|warning)
- \b
- </start>
- <include>
- <context ref="def:line-continue" ignore-style="true"/>
- <context ref="string" ignore-style="true"/>
- <context ref="comment"/>
- <context ref="comment-multiline"/>
- </include>
- </context>
+ <context id="preprocessor" style-ref="preprocessor" end-at-line-end="true">
+ <start extended="true">
+ \%{preproc-start}
+ (define|undef|error|pragma|ident|if(n?def)?|else|elif|endif|line|warning)
+ \b
+ </start>
+ <include>
+ <context ref="def:line-continue" ignore-style="true"/>
+ <context ref="string" ignore-style="true"/>
+ <context ref="comment"/>
+ <context ref="comment-multiline"/>
+ </include>
+ </context>
- <context id="string" style-ref="string" end-at-line-end="true" class="string" class-disabled="no-spell-check">
- <start>L?"</start>
- <end>"</end>
- <include>
- <context ref="printf"/>
- <context id="escaped-character" style-ref="escaped-character">
- <match>\%{escaped-character}</match>
- </context>
- <context ref="def:line-continue"/>
- </include>
+ <context id="string" style-ref="string" end-at-line-end="true" class="string" class-disabled="no-spell-check">
+ <start>L?"</start>
+ <end>"</end>
+ <include>
+ <context ref="printf"/>
+ <context id="escaped-character" style-ref="escaped-character">
+ <match>\%{escaped-character}</match>
</context>
+ <context ref="def:line-continue"/>
+ </include>
+ </context>
- <context id="char" style-ref="char">
- <match>L?'(\%{escaped-character}|.)'</match>
- </context>
+ <context id="char" style-ref="char">
+ <match>L?'(\%{escaped-character}|.)'</match>
+ </context>
- <!-- http://www.lysator.liu.se/c/ANSI-C-grammar-l.html -->
- <context id="float" style-ref="floating-point">
- <match extended="true">
- (?<![\w\.])
- ((\.[0-9]+ | [0-9]+\.[0-9]*) ([Ee][+-]?[0-9]*)? |
- ([0-9]+[Ee][+-]?[0-9]*))
- [fFlL]?
- (?![\w\.])
- </match>
- </context>
+ <!-- http://www.lysator.liu.se/c/ANSI-C-grammar-l.html -->
+ <context id="float" style-ref="floating-point">
+ <match extended="true">
+ (?<![\w\.])
+ ((\.[0-9]+ | [0-9]+\.[0-9]*) ([Ee][+-]?[0-9]*)? |
+ ([0-9]+[Ee][+-]?[0-9]*))
+ [fFlL]?
+ (?![\w\.])
+ </match>
+ </context>
- <context id="hexadecimal" style-ref="hexadecimal">
- <match extended="true">
- (?<![\w\.])
- 0[xX][a-fA-F0-9]+[uUlL]*
- (?![\w\.])
- </match>
- </context>
+ <context id="hexadecimal" style-ref="hexadecimal">
+ <match extended="true">
+ (?<![\w\.])
+ 0[xX][a-fA-F0-9]+[uUlL]*
+ (?![\w\.])
+ </match>
+ </context>
- <context id="octal" style-ref="octal">
- <match extended="true">
- (?<![\w\.])
- 0[0-7]+[uUlL]*
- (?![\w\.])
- </match>
- </context>
+ <context id="octal" style-ref="octal">
+ <match extended="true">
+ (?<![\w\.])
+ 0[0-7]+[uUlL]*
+ (?![\w\.])
+ </match>
+ </context>
- <context id="decimal" style-ref="decimal">
- <match extended="true">
- (?<![\w\.])
- [0-9]+[uUlL]*
- (?![\w\.])
- </match>
- </context>
+ <context id="decimal" style-ref="decimal">
+ <match extended="true">
+ (?<![\w\.])
+ [0-9]+[uUlL]*
+ (?![\w\.])
+ </match>
+ </context>
- <!-- Keywords -->
- <context id="keywords" style-ref="keyword">
- <keyword>asm</keyword>
- <keyword>break</keyword>
- <keyword>case</keyword>
- <keyword>continue</keyword>
- <keyword>default</keyword>
- <keyword>do</keyword>
- <keyword>else</keyword>
- <keyword>enum</keyword>
- <keyword>for</keyword>
- <keyword>fortran</keyword>
- <keyword>goto</keyword>
- <keyword>if</keyword>
- <keyword>return</keyword>
- <keyword>sizeof</keyword>
- <keyword>struct</keyword>
- <keyword>switch</keyword>
- <keyword>typedef</keyword>
- <keyword>union</keyword>
- <keyword>while</keyword>
- </context>
+ <!-- Keywords -->
+ <context id="keywords" style-ref="keyword">
+ <keyword>asm</keyword>
+ <keyword>break</keyword>
+ <keyword>case</keyword>
+ <keyword>continue</keyword>
+ <keyword>default</keyword>
+ <keyword>do</keyword>
+ <keyword>else</keyword>
+ <keyword>enum</keyword>
+ <keyword>for</keyword>
+ <keyword>fortran</keyword>
+ <keyword>goto</keyword>
+ <keyword>if</keyword>
+ <keyword>return</keyword>
+ <keyword>sizeof</keyword>
+ <keyword>struct</keyword>
+ <keyword>switch</keyword>
+ <keyword>typedef</keyword>
+ <keyword>union</keyword>
+ <keyword>while</keyword>
+ </context>
- <context id="types" style-ref="type">
- <keyword>_Bool</keyword>
- <keyword>_Complex</keyword>
- <keyword>_Imaginary</keyword>
- <keyword>bool</keyword>
- <keyword>char</keyword>
- <keyword>double</keyword>
- <keyword>float</keyword>
- <keyword>int</keyword>
- <keyword>long</keyword>
- <keyword>short</keyword>
- <keyword>signed</keyword>
- <keyword>size_t</keyword>
- <keyword>unsigned</keyword>
- <keyword>void</keyword>
- </context>
+ <context id="types" style-ref="type">
+ <keyword>_Bool</keyword>
+ <keyword>_Complex</keyword>
+ <keyword>_Imaginary</keyword>
+ <keyword>bool</keyword>
+ <keyword>char</keyword>
+ <keyword>double</keyword>
+ <keyword>float</keyword>
+ <keyword>int</keyword>
+ <keyword>long</keyword>
+ <keyword>short</keyword>
+ <keyword>signed</keyword>
+ <keyword>size_t</keyword>
+ <keyword>unsigned</keyword>
+ <keyword>void</keyword>
+ </context>
- <context id="storage-class" style-ref="storage-class">
- <keyword>auto</keyword>
- <keyword>const</keyword>
- <keyword>extern</keyword>
- <keyword>inline</keyword>
- <keyword>register</keyword>
- <keyword>restrict</keyword>
- <keyword>static</keyword>
- <keyword>volatile</keyword>
- </context>
+ <context id="storage-class" style-ref="storage-class">
+ <keyword>auto</keyword>
+ <keyword>const</keyword>
+ <keyword>extern</keyword>
+ <keyword>inline</keyword>
+ <keyword>register</keyword>
+ <keyword>restrict</keyword>
+ <keyword>static</keyword>
+ <keyword>volatile</keyword>
+ </context>
- <!-- C99 booleans -->
- <context id="boolean" style-ref="boolean">
- <keyword>true</keyword>
- <keyword>false</keyword>
- </context>
+ <!-- C99 booleans -->
+ <context id="boolean" style-ref="boolean">
+ <keyword>true</keyword>
+ <keyword>false</keyword>
+ </context>
- <context id="common-defines" style-ref="common-defines">
- <keyword>NULL</keyword>
- <keyword>MAX</keyword>
- <keyword>MIN</keyword>
- <keyword>TRUE</keyword>
- <keyword>FALSE</keyword>
- <keyword>__LINE__</keyword>
- <keyword>__DATA__</keyword>
- <keyword>__FILE__</keyword>
- <keyword>__func__</keyword>
- <keyword>__TIME__</keyword>
- <keyword>__STDC__</keyword>
- </context>
+ <context id="common-defines" style-ref="common-defines">
+ <keyword>NULL</keyword>
+ <keyword>MAX</keyword>
+ <keyword>MIN</keyword>
+ <keyword>TRUE</keyword>
+ <keyword>FALSE</keyword>
+ <keyword>__LINE__</keyword>
+ <keyword>__DATA__</keyword>
+ <keyword>__FILE__</keyword>
+ <keyword>__func__</keyword>
+ <keyword>__TIME__</keyword>
+ <keyword>__STDC__</keyword>
+ </context>
- <context id="standard-streams" style-ref="standard-stream">
- <keyword>stdin</keyword>
- <keyword>stdout</keyword>
- <keyword>stderr</keyword>
- </context>
+ <context id="standard-streams" style-ref="standard-stream">
+ <keyword>stdin</keyword>
+ <keyword>stdout</keyword>
+ <keyword>stderr</keyword>
+ </context>
- <context id="signals" style-ref="signal-name">
- <keyword>SIGABRT</keyword>
- <keyword>SIGALRM</keyword>
- <keyword>SIGCHLD</keyword>
- <keyword>SIGCONT</keyword>
- <keyword>SIGFPE</keyword>
- <keyword>SIGHUP</keyword>
- <keyword>SIGILL</keyword>
- <keyword>SIGINT</keyword>
- <keyword>SIGKILL</keyword>
- <keyword>SIGPIPE</keyword>
- <keyword>SIGQUIT</keyword>
- <keyword>SIGSEGV</keyword>
- <keyword>SIGSTOP</keyword>
- <keyword>SIGTERM</keyword>
- <keyword>SIGTRAP</keyword>
- <keyword>SIGTSTP</keyword>
- <keyword>SIGTTIN</keyword>
- <keyword>SIGTTOU</keyword>
- <keyword>SIGUSR1</keyword>
- <keyword>SIGUSR2</keyword>
- </context>
+ <context id="signals" style-ref="signal-name">
+ <keyword>SIGABRT</keyword>
+ <keyword>SIGALRM</keyword>
+ <keyword>SIGCHLD</keyword>
+ <keyword>SIGCONT</keyword>
+ <keyword>SIGFPE</keyword>
+ <keyword>SIGHUP</keyword>
+ <keyword>SIGILL</keyword>
+ <keyword>SIGINT</keyword>
+ <keyword>SIGKILL</keyword>
+ <keyword>SIGPIPE</keyword>
+ <keyword>SIGQUIT</keyword>
+ <keyword>SIGSEGV</keyword>
+ <keyword>SIGSTOP</keyword>
+ <keyword>SIGTERM</keyword>
+ <keyword>SIGTRAP</keyword>
+ <keyword>SIGTSTP</keyword>
+ <keyword>SIGTTIN</keyword>
+ <keyword>SIGTTOU</keyword>
+ <keyword>SIGUSR1</keyword>
+ <keyword>SIGUSR2</keyword>
+ </context>
+ <!--Main context-->
+ <context id="c" class="no-spell-check">
+ <include>
+ <context ref="gtk-doc:inline-docs-section"/>
+ <context ref="comment"/>
+ <context ref="comment-multiline"/>
+ <context ref="close-comment-outside-comment"/>
+ <context ref="if0-comment"/>
+ <context ref="include"/>
+ <context ref="preprocessor"/>
+ <context ref="string"/>
+ <context ref="char"/>
+ <context ref="float"/>
+ <context ref="hexadecimal"/>
+ <context ref="octal"/>
+ <context ref="decimal"/>
+ <context ref="keywords"/>
+ <context ref="types"/>
+ <context ref="storage-class"/>
+ <context ref="boolean"/>
+ <context ref="common-defines"/>
+ <context ref="standard-streams"/>
+ <context ref="signals"/>
</include>
</context>
+
</definitions>
</language>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
