gtksourceview r1942 - in trunk: . gtksourceview/language-specs
- From: muntyan svn gnome org
- To: svn-commits-list gnome org
- Subject: gtksourceview r1942 - in trunk: . gtksourceview/language-specs
- Date: Wed, 9 Apr 2008 17:42:51 +0100 (BST)
Author: muntyan
Date: Wed Apr 9 17:42:51 2008
New Revision: 1942
URL: http://svn.gnome.org/viewvc/gtksourceview?rev=1942&view=rev
Log:
2008-04-09 Yevgen Muntyan <muntyan tamu edu>
* gtksourceview/language-specs/python.lang: def:line-continue
is not needed in the main context.
* gtksourceview/language-specs/sh.lang: 'for' loops work
without 'in' too.
* gtksourceview/language-specs/yacc.lang: prettified.
Modified:
trunk/ChangeLog
trunk/gtksourceview/language-specs/python.lang
trunk/gtksourceview/language-specs/sh.lang
trunk/gtksourceview/language-specs/yacc.lang
Modified: trunk/gtksourceview/language-specs/python.lang
==============================================================================
--- trunk/gtksourceview/language-specs/python.lang (original)
+++ trunk/gtksourceview/language-specs/python.lang Wed Apr 9 17:42:51 2008
@@ -123,7 +123,6 @@
<include>
<context ref="def:shebang"/>
<context ref="def:shell-like-comment"/>
- <context ref="def:line-continue"/>
<context ref="multiline-double-quoted-string"/>
<context ref="multiline-single-quoted-string"/>
Modified: trunk/gtksourceview/language-specs/sh.lang
==============================================================================
--- trunk/gtksourceview/language-specs/sh.lang (original)
+++ trunk/gtksourceview/language-specs/sh.lang Wed Apr 9 17:42:51 2008
@@ -200,7 +200,7 @@
<context id="for-command">
<start>\bfor\b</start>
- <end>\bin\b</end>
+ <end>\b(in|do)\b</end>
<include>
<context sub-pattern="0" where="start" style-ref="keyword"/>
<context sub-pattern="0" where="end" style-ref="keyword"/>
Modified: trunk/gtksourceview/language-specs/yacc.lang
==============================================================================
--- trunk/gtksourceview/language-specs/yacc.lang (original)
+++ trunk/gtksourceview/language-specs/yacc.lang Wed Apr 9 17:42:51 2008
@@ -76,12 +76,19 @@
<keyword>union</keyword>
</context>
- <context id="token">
+ <context id="token" end-at-line-end="true">
<start>^(%(token|type))(<[A-Za-z_][A-Za-z0-9_]*>)?(?![\w_-])</start>
- <end></end>
<include>
<context sub-pattern="1" where="start" style-ref="keyword"/>
<context sub-pattern="3" where="start" style-ref="token-type"/>
+ <context ref="c:string"/>
+ <context ref="c:char"/>
+ <context ref="c:float"/>
+ <context ref="c:hexadecimal"/>
+ <context ref="c:octal"/>
+ <context ref="c:decimal"/>
+ <context ref="c:comment"/>
+ <context ref="c:comment-multiline"/>
</include>
</context>
@@ -112,6 +119,9 @@
<context ref="c-with-brackets"/>
</include>
</context>
+ <context style-ref="keyword">
+ <match>(\$(<[\w\d_-]*>)?[\$0-9]|[ ][$0-9])</match>
+ </context>
<context ref="c:c"/>
</include>
</context>
@@ -123,9 +133,6 @@
<context sub-pattern="0" where="start" style-ref="keyword"/>
<context sub-pattern="0" where="end" style-ref="keyword"/>
<context ref="c-with-brackets"/>
- <context style-ref="keyword">
- <match>\$(<[\w\d_-]*>)?[\$0-9]</match>
- </context>
</include>
</context>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]