Menu
▾
▴
[clr-ci] SF.net SVN: colorer:[1086] branches/EFREMOV-BASE2/colorer
|
From: <for...@us...> - 2009-03-30 22:10:40
|
Revision: 1086
http://colorer.svn.sourceforge.net/colorer/?rev=1086&view=rev
Author: formirror
Date: 2009-03-30 22:10:18 +0000 (Mon, 30 Mar 2009)
Log Message:
-----------
new def region, change region structure in c, xml, dtd
Modified Paths:
--------------
branches/EFREMOV-BASE2/colorer/bin/xsd2hrc/xsd2hrc.xsl
branches/EFREMOV-BASE2/colorer/hrc/base/c.hrc
branches/EFREMOV-BASE2/colorer/hrc/lib/default.hrc
branches/EFREMOV-BASE2/colorer/hrc/xml/dtd.hrc
branches/EFREMOV-BASE2/colorer/hrc/xml/xml.hrc
branches/EFREMOV-BASE2/colorer/hrd/console/mirror.hrd
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/asm-test.cpp.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/cpp.cpp.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/full/colorer.cpp.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/full/qt/dlcat.cpp.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/full/qt/dlcat.h.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/full/qt/longcat.qrc.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/full/typelist.h.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/testcases.c.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/xx.c.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/html/parser-hang2.xhtml.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xml/build.xml.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xml/ex1.wsdl.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xml/full/animals.rdf.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xml/full/book-order.xml.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xml/full/bxml.xml.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xml/full/cpp.hrc.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xml/full/ibatis.xml.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xml/full/log4jsample.xml.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xml/full/web-app/2.3/web.xml.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xml/full/web-app/2.4/web.xml.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xml/full/web-app/2.5/web.xml.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xml/full/xml.xml.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xml/journal.dtd.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xml/xxx.xml.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xslt/full/foo.xsl.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xslt/full/test.xsl.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xslt/full/xsd2hrc.xsl.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xslt/test.xsl.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xslt/xpath-bug.xq.html
branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/xslt/xsieve/entities.xsl.html
Modified: branches/EFREMOV-BASE2/colorer/bin/xsd2hrc/xsd2hrc.xsl
===================================================================
--- branches/EFREMOV-BASE2/colorer/bin/xsd2hrc/xsd2hrc.xsl 2009-03-30 18:29:15 UTC (rev 1085)
+++ branches/EFREMOV-BASE2/colorer/bin/xsd2hrc/xsd2hrc.xsl 2009-03-30 22:10:18 UTC (rev 1086)
@@ -71,51 +71,8 @@
<!-- possible used namespace prefixes -->
-
- <!-- EE:new - ->
- <xsl:variable name="ns-map" select="$custom-type/c:prefix | $custom-type/c:empty-prefix | $custom-type/c:any-prefix"/>
- <!- - EE:new - ->
- <xsl:template name="ns-real-prefix">
- <xsl:param name="nscolon"/>
- <xsl:if test="$ns-map">
- <xsl:text>(?{}</xsl:text>
- <xsl:choose>
- <xsl:when test="$ns-map/self::c:any-prefix">
- <xsl:text>%xml:NCName;</xsl:text>
- </xsl:when>
- <xsl:when test="$ns-map/self::c:prefix">
- <xsl:text>(?{}</xsl:text>
- <xsl:for-each select="$ns-map/self::c:prefix">
- <xsl:value-of select="."/>
- <xsl:if test="position() != last()">|</xsl:if>
- </xsl:for-each>
- <xsl:text>)</xsl:text>
- </xsl:when>
- </xsl:choose>
- <xsl:text>(?{</xsl:text>
- <xsl:value-of select="$nscolon"/>
- <xsl:text>}:))</xsl:text>
- </xsl:if>
- </xsl:template>
<xsl:variable name="ns-real-prefix">
- <xsl:call-template name="ns-real-prefix"/>
- </xsl:variable>
- <xsl:variable name="nsprefix">
- <xsl:if test="$ns-map">
- <xsl:value-of select="$ns-real-prefix"/>
- <xsl:if test="$ns-map/self::c:empty-prefix">?</xsl:if>
- </xsl:if>
- </xsl:variable>
-
- <xsl:variable name="attr-nsprefix"><!- - EE:new - ->
- <xsl:call-template name="ns-real-prefix">
- <xsl:with-param name="nscolon" select="'Attribute.nscolon'"/>
- </xsl:call-template>
- </xsl:variable>
- -->
-
- <xsl:variable name="ns-real-prefix">
<xsl:apply-templates mode='nsprefix-real' select='$custom-type'/>
</xsl:variable>
Modified: branches/EFREMOV-BASE2/colorer/hrc/base/c.hrc
===================================================================
--- branches/EFREMOV-BASE2/colorer/hrc/base/c.hrc 2009-03-30 18:29:15 UTC (rev 1085)
+++ branches/EFREMOV-BASE2/colorer/hrc/base/c.hrc 2009-03-30 22:10:18 UTC (rev 1086)
@@ -43,9 +43,10 @@
<region name="StructureSymbol" parent="def:SymbolStrong"/>
<region name="PrefixSymbol" parent="def:SymbolStrong"/> <!-- !!EE: new -->
- <region name="Preproc" parent="def:Directive"/>
+ <region name="Preproc" parent="def:DirectiveContent"/>
+ <region name="PreprocPref" parent="def:DirectiveEdge"/> <!-- # -->
<region name="PreprocSpec" parent="def:KeywordStrong"/>
- <region name="PreprocWord" parent="def:DirectiveContent"/> <!-- !!EE: def:Keyword -->
+ <region name="PreprocWord" parent="def:Directive"/> <!-- !!EE: def:Keyword -->
<region name="PreprocInclude" parent="def:Path"/>
<region name="PreprocIncludeEdge" parent="def:StringEdge"/>
<region name="AsmCode" parent="def:Directive"/>
@@ -231,15 +232,15 @@
<scheme name="PreprocComment">
<regexp match="/(\/\/.*$)/" region="LineComment"/>
<block start="/\/\*/" end="/\*\//" scheme="def:Comment" region="Comment"/>
- <block start="/^\s*#\s*if/" end="/^\s*\#\s*endif/" scheme="PreprocComment" region="Comment"/>
+ <block start="/^\s*(#)\s*if/" end="/^\s*\#\s*endif/" scheme="PreprocComment" region="Comment"/>
</scheme>
<scheme name="c">
<!-- c preprocessor -->
<block start="/^\s*\#\s*if\s+0\s*$/" end="/^\s*(?{Directive}\#\s*(endif|else))/"
scheme="PreprocComment" region00="def:Directive" region="def:Comment"/>
- <block start="/^\s*#/" end="/(^ | [^\\]?#1) $/x"
- scheme="Preproc" region="Preproc"/>
+ <block start="/^\s*(#)/" end="/(^ | [^\\]?#1) $/x"
+ scheme="Preproc" region="Preproc" region01='PreprocPref'/>
<block start="/(\{)/" end="/(\})/" scheme="c"
@@ -433,8 +434,8 @@
#endif
)
-->
- <block start="/^\s*#/" end="/(^ | [^\\]?#1) $/x"
- scheme="Preproc" region="Preproc"/>
+ <block start="/^\s*(#)/" end="/(^ | [^\\]?#1) $/x"
+ scheme="Preproc" region="Preproc" region01='PreprocPref'/>
<!-- Numbers -->
<inherit scheme="def:Number"/>
Modified: branches/EFREMOV-BASE2/colorer/hrc/lib/default.hrc
===================================================================
--- branches/EFREMOV-BASE2/colorer/hrc/lib/default.hrc 2009-03-30 18:29:15 UTC (rev 1085)
+++ branches/EFREMOV-BASE2/colorer/hrc/lib/default.hrc 2009-03-30 22:10:18 UTC (rev 1086)
@@ -73,6 +73,7 @@
<region name="Directive" description="Compiler/Preprocessor directive"/>
<region name="DirectiveContent" parent="Directive" description="Internal directive text"/>
+ <region name="DirectiveEdge" parent="DirectiveContent" description="Directive edges"/>
<region name="Parameter" description="Parameter declaration"/>
<region name="ParameterStrong" parent="Parameter" description="Special parameter"/>
Modified: branches/EFREMOV-BASE2/colorer/hrc/xml/dtd.hrc
===================================================================
--- branches/EFREMOV-BASE2/colorer/hrc/xml/dtd.hrc 2009-03-30 18:29:15 UTC (rev 1085)
+++ branches/EFREMOV-BASE2/colorer/hrc/xml/dtd.hrc 2009-03-30 22:10:18 UTC (rev 1086)
@@ -18,26 +18,27 @@
<region name="EntityValue" parent="def:String"/>
+ <region name="doctypedecl" parent="xml:decl"/>
+ <region name="doctypedecl.start" parent="xml:decl.start"/>
+ <region name="doctypedecl.end" parent="xml:decl.end"/>
+ <region name="doctypedecl.tag" parent="def:Keyword"/> <!-- xml:decl.name -->
- <region name="doctypedecl" parent="def:default"/>
- <region name="doctypedecl.start" parent="def:Directive"/>
- <region name="doctypedecl.end" parent="def:Directive"/>
- <region name="doctypedecl.tag" parent="def:Directive"/>
- <region name="doctypedecl.name" parent="def:DirectiveContent"/>
+ <region name="doctypedecl.name" parent="def:KeywordStrong"/>
+ <region name="doctypedecl.attr" parent="xml:decl.name"/>
-
- <region name="doctype.keyword" parent="def:Keyword"/>
+
<region name='Literal' parent="xml:AttValue"/>
<region name='Literal.start' parent="xml:AttValue.start"/>
<region name='Literal.end' parent="xml:AttValue.end"/>
- <region name="ExternalID" parent="doctype.keyword"/>
+
+ <region name="ExternalID" parent="doctypedecl.attr"/>
<region name="ExternalID.SYSTEM" parent="ExternalID"/>
<region name="ExternalID.PUBLIC" parent="ExternalID"/>
<region name="PubidLiteral" parent="Literal"/>
<region name="SystemLiteral" parent="Literal"/>
- <region name="PubidLiteral.own" parent="uri:nsprefix"/>
+ <region name="PubidLiteral.own" parent="def:Directive"/>
<region name="PubidLiteral.sep" parent="uri:delit"/>
@@ -90,7 +91,7 @@
<!-- attr name -->
<region name="AttDef.name" parent="AttlistDecl.name"/>
<!-- ID, IDREF ... -->
- <region name="AttType.spec" parent="doctype.keyword"/>
+ <region name="AttType.spec" parent="doctypedecl.attr"/>
<!-- NOTATION -->
<region name="NotationType.spec" parent="AttType.spec"/>
<!-- #REQUIRED #IMPLIED #FIXED -->
@@ -116,7 +117,7 @@
<!-- % -->
<region name="EntityDecl.PE" parent="contentspec.op"/>
<!-- NDATA -->
- <region name="NDataDecl" parent="doctype.keyword"/>
+ <region name="NDataDecl" parent="doctypedecl.attr"/>
<!-- <!NOTATION name PUBLIC "aaa"> -->
<region name="NotationDecl" parent="doctypedecl"/>
Modified: branches/EFREMOV-BASE2/colorer/hrc/xml/xml.hrc
===================================================================
--- branches/EFREMOV-BASE2/colorer/hrc/xml/xml.hrc 2009-03-30 18:29:15 UTC (rev 1085)
+++ branches/EFREMOV-BASE2/colorer/hrc/xml/xml.hrc 2009-03-30 22:10:18 UTC (rev 1086)
@@ -101,21 +101,28 @@
<region name="AttValue.defined.end" parent="AttValue.end"/>
- <region name="CDStart" parent="def:CommentEdge"/>
+ <region name="decl" parent="def:default" description="Directives like <! ... gt;"/>
+ <region name="decl.start" parent="def:DirectiveEdge"/>
+ <region name="decl.end" parent="def:DirectiveEdge"/>
+ <region name="decl.name" parent="def:Directive"/>
+ <region name="decl.content" parent="def:DirectiveContent"/>
+
+
+ <region name="PI.start" parent="decl.start" description="Processing Instruction [<?]"/>
+ <region name="PI.name" parent="decl.name" description="Processing Instruction Name"/>
+ <region name="PI.content" parent="decl.content" description="Processing Instruction Content"/>
+ <region name="PI.end" parent="decl.end" description="Processing Instruction [?>]"/>
+
+
+ <region name="CDStart" parent="decl.start"/>
<region name="CData" parent="def:default"/>
- <region name="CDEnd" parent="def:CommentEdge"/>
+ <region name="CDEnd" parent="decl.end"/>
- <region name="PI.start" parent="def:Directive" description="Processing Instruction [<?]"/>
- <region name="PI.name" parent="def:Directive" description="Processing Instruction Name"/>
- <region name="PI.content" parent="def:DirectiveContent" description="Processing Instruction Content"/>
- <region name="PI.end" parent="def:Directive" description="Processing Instruction [?>]"/>
-
+
<!-- autogenrateted PI ... -->
- <region name="PI.name.defined" parent="element.defined.start.name"/>
- <!-- parent="" def:Label -->
- <region name="PI.start.defined" parent="PI.content"/>
- <!-- parent="element.defined.lt" def:Label -->
- <region name="PI.end.defined" parent="PI.start.defined"/>
+ <region name="PI.name.defined" parent="element.defined.start.name"/>
+ <region name="PI.start.defined" parent="PI.start"/>
+ <region name="PI.end.defined" parent="PI.end"/>
<region name="XMLDecl" parent="PI.content"/>
Modified: branches/EFREMOV-BASE2/colorer/hrd/console/mirror.hrd
===================================================================
--- branches/EFREMOV-BASE2/colorer/hrd/console/mirror.hrd 2009-03-30 18:29:15 UTC (rev 1085)
+++ branches/EFREMOV-BASE2/colorer/hrd/console/mirror.hrd 2009-03-30 22:10:18 UTC (rev 1086)
@@ -69,6 +69,7 @@
<assign name="def:Directive" fore="#A" style='1'/>
<assign name="def:DirectiveContent" fore="#2" style='1'/>
+ <assign name="def:DirectiveEdge" fore="#2" style='1'/>
<assign name="def:Parameter" fore="#A" style='2'/>
<assign name="def:ParameterStrong" fore="#D" style='2'/>
Modified: branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/asm-test.cpp.html
===================================================================
--- branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/asm-test.cpp.html 2009-03-30 18:29:15 UTC (rev 1085)
+++ branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/asm-test.cpp.html 2009-03-30 22:10:18 UTC (rev 1086)
@@ -1,4 +1,4 @@
- 0: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>if</span><span class='c-Preproc def-Directive'> </span><span class='c-PreprocWord def-DirectiveContent def-Directive'>defined</span><span class='c-Symbol def-Symbol'>(</span><span class='c-Preproc def-Directive'>__GNUC__</span><span class='c-Symbol def-Symbol'>)</span>
+ 0: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>if</span><span class='c-Preproc def-DirectiveContent def-Directive'> </span><span class='c-PreprocWord def-Directive'>defined</span><span class='c-Symbol def-Symbol'>(</span><span class='c-Preproc def-DirectiveContent def-Directive'>__GNUC__</span><span class='c-Symbol def-Symbol'>)</span>
1: <span class='c-AsmCode def-Directive'>asm</span>("pushfl<span class='asm-asmSymbol def-Symbol'>;</span> \
2: popl <span class='asm-asmSymbol def-Symbol'>%</span><span class='asm-asmSymbol def-Symbol'>%</span><span class='asm-asmRegister def-Register'>eax</span><span class='asm-asmSymbol def-Symbol'>;</span> \
3: movl <span class='asm-asmSymbol def-Symbol'>%</span><span class='asm-asmSymbol def-Symbol'>%</span><span class='asm-asmRegister def-Register'>eax</span><span class='asm-asmSymbol def-Symbol'>,</span><span class='asm-asmSymbol def-Symbol'>%</span><span class='asm-asmSymbol def-Symbol'>%</span><span class='asm-asmRegister def-Register'>ecx</span><span class='asm-asmSymbol def-Symbol'>;</span> \
@@ -12,13 +12,13 @@
11: <span class='asm-asmSymbol def-Symbol'>:</span><span class='c-String def-String'>"=m"</span>(temp)
12: <span class='asm-asmSymbol def-Symbol'>:</span>
13: <span class='asm-asmSymbol def-Symbol'>:</span><span class='c-String def-String'>"%eax"</span><span class='asm-asmSymbol def-Symbol'>,</span> <span class='c-String def-String'>"%ecx"</span>)<span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
-14: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>endif</span>
+14: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>endif</span>
15: <span class='c-KeywordANSI def-Keyword'>if</span><span class='c-Symbol def-Symbol'>(</span>temp <span class='c-Symbol def-Symbol'>=</span><span class='c-Symbol def-Symbol'>=</span> <span class='def-NumberDec def-Number'>0</span><span class='c-Symbol def-Symbol'>)</span>
16: <span class='def-SymbolStrong def-Symbol'>{</span>
17: <span class='c-KeywordANSI def-Keyword'>return</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
18: <span class='def-SymbolStrong def-Symbol'>}</span>
19:
-20: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>if</span><span class='c-Preproc def-Directive'> </span><span class='c-PreprocWord def-DirectiveContent def-Directive'>defined</span><span class='c-Symbol def-Symbol'>(</span><span class='c-Preproc def-Directive'>_WIN32</span><span class='c-Symbol def-Symbol'>)</span>
+20: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>if</span><span class='c-Preproc def-DirectiveContent def-Directive'> </span><span class='c-PreprocWord def-Directive'>defined</span><span class='c-Symbol def-Symbol'>(</span><span class='c-Preproc def-DirectiveContent def-Directive'>_WIN32</span><span class='c-Symbol def-Symbol'>)</span>
21: <span class='c-LineComment def-LineComment def-Comment def-Syntax'>// Save CPU feature flags</span>
22: <span class='c-AsmCode def-Directive'>_asm</span>
23: <span class='asm-asmSymbol def-Symbol'>{</span>
Modified: branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/cpp.cpp.html
===================================================================
--- branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/cpp.cpp.html 2009-03-30 18:29:15 UTC (rev 1085)
+++ branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/cpp.cpp.html 2009-03-30 22:10:18 UTC (rev 1086)
@@ -1,7 +1,7 @@
0:
- 1: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>ifdef</span><span class='c-Preproc def-Directive'> Test</span>
- 2: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>error</span><span class='c-PreprocSpec def-KeywordStrong def-Keyword'> Test :(</span>
- 3: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>endif</span>
+ 1: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>ifdef</span><span class='c-Preproc def-DirectiveContent def-Directive'> Test</span>
+ 2: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>error</span><span class='c-PreprocSpec def-KeywordStrong def-Keyword'> Test :(</span>
+ 3: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>endif</span>
4:
5: <span class='c-KeywordANSI-typenames c-KeywordANSI def-Keyword'>const</span> <span class='c-KeywordANSI-typenames c-KeywordANSI def-Keyword'>int</span> test<span class='c-Symbol def-Symbol'>=</span><span class='def-NumberDec def-Number'>12345</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
6:
Modified: branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/full/colorer.cpp.html
===================================================================
--- branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/full/colorer.cpp.html 2009-03-30 18:29:15 UTC (rev 1085)
+++ branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/full/colorer.cpp.html 2009-03-30 22:10:18 UTC (rev 1086)
@@ -5,33 +5,33 @@
4: <span class='c-LineComment def-LineComment def-Comment def-Syntax'>// to Colorer License (see /doc/license.txt for more information).</span>
5: <span class='c-LineComment def-LineComment def-Comment def-Syntax'>//</span>
6:
- 7: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>ifdef</span><span class='c-Preproc def-Directive'> __MSDOS__</span>
- 8: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>io.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 9: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>new.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 10: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>stdlib.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 11: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>conio.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 12: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>endif</span>
+ 7: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>ifdef</span><span class='c-Preproc def-DirectiveContent def-Directive'> __MSDOS__</span>
+ 8: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>io.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 9: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>new.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 10: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>stdlib.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 11: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>conio.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 12: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>endif</span>
13:
- 14: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>ifdef</span><span class='c-Preproc def-Directive'> _WIN32</span>
- 15: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>io.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 16: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>windows.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 17: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>sys/timeb.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 18: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>time.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 19: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>string</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 20: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>list</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 21: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>"</span><span class='c-PreprocInclude def-Path def-URI'>clip.hpp</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>"</span>
- 22: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>endif</span>
+ 14: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>ifdef</span><span class='c-Preproc def-DirectiveContent def-Directive'> _WIN32</span>
+ 15: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>io.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 16: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>windows.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 17: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>sys/timeb.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 18: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>time.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 19: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>string</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 20: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>list</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 21: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>"</span><span class='c-PreprocInclude def-Path def-URI'>clip.hpp</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>"</span>
+ 22: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>endif</span>
23:
- 24: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>fcntl.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 25: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>sys/stat.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 26: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>stdio.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 27: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>string.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 28: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>colorer/classes.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 29: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>regexp/cregexp.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
- 30: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>sgml/sgml.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 24: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>fcntl.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 25: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>sys/stat.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 26: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>stdio.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 27: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>string.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 28: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>colorer/classes.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 29: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>regexp/cregexp.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
+ 30: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'><</span><span class='c-PreprocInclude def-Path def-URI'>sgml/sgml.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>></span>
31:
- 32: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>define</span><span class='c-Preproc def-Directive'> LEN 256</span>
- 33: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>define</span><span class='c-Preproc def-Directive'> UNIX_CFG </span><span class='def-StringEdge def-String'>"</span><span class='c-String def-String'>/usr/share/colorer/bin/.colorer.ini</span><span class='def-StringEdge def-String'>"</span>
+ 32: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>define</span><span class='c-Preproc def-DirectiveContent def-Directive'> LEN 256</span>
+ 33: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>define</span><span class='c-Preproc def-DirectiveContent def-Directive'> UNIX_CFG </span><span class='def-StringEdge def-String'>"</span><span class='c-String def-String'>/usr/share/colorer/bin/.colorer.ini</span><span class='def-StringEdge def-String'>"</span>
34: <span class='c-LineComment def-LineComment def-Comment def-Syntax'>// load variants</span>
35: <span class='c-KeywordANSI def-Keyword'>enum</span> <span class='def-SymbolStrong def-Symbol'>{</span> EREGEXP<span class='c-Symbol def-Symbol'>,</span> ELIST<span class='c-Symbol def-Symbol'>,</span> EVIEW<span class='c-Symbol def-Symbol'>,</span> EGEN <span class='def-SymbolStrong def-Symbol'>}</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
36: <span class='c-LineComment def-LineComment def-Comment def-Syntax'>// these structures contains file's lines</span>
@@ -782,7 +782,7 @@
781: leftpos <span class='c-Symbol def-Symbol'>=</span> topline <span class='c-Symbol def-Symbol'>=</span> <span class='def-NumberDec def-Number'>0</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
782:
783: <span class='c-LineComment def-LineComment def-Comment def-Syntax'>// WIN32 - draws through consoles</span>
- 784: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>ifdef</span><span class='c-Preproc def-Directive'> _WIN32</span>
+ 784: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>ifdef</span><span class='c-Preproc def-DirectiveContent def-Directive'> _WIN32</span>
785: <span class='c-KeywordStructure def-StructKeyword def-Keyword'>CONSOLE_SCREEN_BUFFER_INFO</span> csbi<span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
786: <span class='c-KeywordStructure def-StructKeyword def-Keyword'>HANDLE</span> hCon<span class='c-Symbol def-Symbol'>,</span> hConI<span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
787: <span class='c-KeywordStructure def-StructKeyword def-Keyword'>INPUT_RECORD</span> ir<span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
@@ -793,10 +793,10 @@
792: hConI<span class='c-Symbol def-Symbol'>=</span> <span class='c-KeywordWin32 c-KeywordLibFunctions def-FunctionKeyword def-Keyword'>GetStdHandle</span><span class='c-Symbol def-Symbol'>(</span>STD_INPUT_HANDLE<span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
793: <span class='c-KeywordWin32 c-KeywordLibFunctions def-FunctionKeyword def-Keyword'>GetConsoleScreenBufferInfo</span><span class='c-Symbol def-Symbol'>(</span>hCon<span class='c-Symbol def-Symbol'>,</span> <span class='c-Symbol def-Symbol'>&</span>csbi<span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
794:
- 795: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>ifndef</span><span class='c-Preproc def-Directive'> __DPMI32__</span>
+ 795: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>ifndef</span><span class='c-Preproc def-DirectiveContent def-Directive'> __DPMI32__</span>
796: hCon <span class='c-Symbol def-Symbol'>=</span> <span class='c-KeywordWin32 c-KeywordLibFunctions def-FunctionKeyword def-Keyword'>CreateConsoleScreenBuffer</span><span class='c-Symbol def-Symbol'>(</span>GENERIC_WRITE<span class='c-Symbol def-Symbol'>,</span> <span class='def-NumberDec def-Number'>0</span><span class='c-Symbol def-Symbol'>,</span> <span class='def-NumberDec def-Number'>0</span><span class='c-Symbol def-Symbol'>,</span> CONSOLE_TEXTMODE_BUFFER<span class='c-Symbol def-Symbol'>,</span> <span class='def-NumberDec def-Number'>0</span><span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
797: <span class='c-KeywordWin32 c-KeywordLibFunctions def-FunctionKeyword def-Keyword'>SetConsoleActiveScreenBuffer</span><span class='c-Symbol def-Symbol'>(</span>hCon<span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
- 798: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>endif</span>
+ 798: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>endif</span>
799: <span class='c-KeywordWin32 c-KeywordLibFunctions def-FunctionKeyword def-Keyword'>SetConsoleMode</span><span class='c-Symbol def-Symbol'>(</span>hConI<span class='c-Symbol def-Symbol'>,</span>ENABLE_WINDOW_INPUT<span class='c-Symbol def-Symbol'>|</span>ENABLE_MOUSE_INPUT<span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
800: <span class='cpp-KeywordNamespace def-Prefix'>std</span><span class='c-PrefixSymbol def-SymbolStrong def-Symbol'>::</span><span class='cpp-KeywordSTL c-KeywordStdio c-KeywordStructure def-StructKeyword def-Keyword'>string</span> findstring<span class='c-Symbol def-Symbol'>=</span><span class='def-StringEdge def-String'>"</span><span class='c-String def-String'>/</span><span class='def-StringEdge def-String'>"</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
801: scrbuf<span class='c-Symbol def-Symbol'>=</span><span class='c-KeywordANSI def-Keyword'>new</span> ScreenBuffer<span class='c-Symbol def-Symbol'>(</span>hCon<span class='c-Symbol def-Symbol'>,</span>csbi<span class='c-Symbol def-Symbol'>.</span>dwSize<span class='c-Symbol def-Symbol'>.</span>X<span class='c-Symbol def-Symbol'>,</span>csbi<span class='c-Symbol def-Symbol'>.</span>dwSize<span class='c-Symbol def-Symbol'>.</span>Y<span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
@@ -1100,23 +1100,23 @@
1099: <span class='def-SymbolStrong def-Symbol'>}</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1100: <span class='def-SymbolStrong def-Symbol'>}</span><span class='c-KeywordANSI def-Keyword'>while</span><span class='c-Symbol def-Symbol'>(</span><span class='c-KeywordANSI def-Keyword'>true</span><span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1101: <span class='def-SymbolStrong def-Symbol'>}</span><span class='c-KeywordANSI def-Keyword'>while</span><span class='c-Symbol def-Symbol'>(</span><span class='c-Symbol def-Symbol'>!</span>quit<span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
-1102: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>ifndef</span><span class='c-Preproc def-Directive'> __DPMI32__</span>
+1102: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>ifndef</span><span class='c-Preproc def-DirectiveContent def-Directive'> __DPMI32__</span>
1103: <span class='c-KeywordWin32 c-KeywordLibFunctions def-FunctionKeyword def-Keyword'>SetConsoleActiveScreenBuffer</span><span class='c-Symbol def-Symbol'>(</span><span class='c-KeywordWin32 c-KeywordLibFunctions def-FunctionKeyword def-Keyword'>GetStdHandle</span><span class='c-Symbol def-Symbol'>(</span>STD_OUTPUT_HANDLE<span class='c-Symbol def-Symbol'>)</span><span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
-1104: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>endif</span>
+1104: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>endif</span>
1105: <span class='c-KeywordWin32 c-KeywordLibFunctions def-FunctionKeyword def-Keyword'>CloseHandle</span><span class='c-Symbol def-Symbol'>(</span>hCon<span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1106: <span class='c-KeywordANSI def-Keyword'>delete</span> scrbuf<span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1107:
1108: <span class='c-LineComment def-LineComment def-Comment def-Syntax'>// ms dos uses video buffer</span>
-1109: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>elif</span><span class='c-Preproc def-Directive'> </span><span class='c-PreprocWord def-DirectiveContent def-Directive'>defined</span><span class='c-Preproc def-Directive'> __MSDOS__</span>
+1109: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>elif</span><span class='c-Preproc def-DirectiveContent def-Directive'> </span><span class='c-PreprocWord def-Directive'>defined</span><span class='c-Preproc def-DirectiveContent def-Directive'> __MSDOS__</span>
1110:
1111: <span class='c-KeywordANSI-typenames c-KeywordANSI def-Keyword'>int</span> j<span class='c-Symbol def-Symbol'>,</span> ch<span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1112: <span class='c-KeywordANSI-typenames c-KeywordANSI def-Keyword'>char</span> <span class='c-Symbol def-Symbol'>*</span>vm <span class='c-Symbol def-Symbol'>=</span> <span class='c-Symbol def-Symbol'>(</span><span class='c-KeywordANSI-typenames c-KeywordANSI def-Keyword'>char</span><span class='c-Symbol def-Symbol'>*</span><span class='c-Symbol def-Symbol'>)</span><span class='def-NumberHex def-Number'>0xb8000000</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
-1113: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>ifdef</span><span class='c-Preproc def-Directive'> _DPMI_</span>
+1113: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>ifdef</span><span class='c-Preproc def-DirectiveContent def-Directive'> _DPMI_</span>
1114: <span class='c-KeywordANSI-typenames c-KeywordANSI def-Keyword'>unsigned</span> <span class='c-KeywordANSI-typenames c-KeywordANSI def-Keyword'>int</span> vmsel<span class='c-Symbol def-Symbol'>=</span><span class='def-NumberHex def-Number'>0xb800</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
-1115: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>endif</span>
+1115: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>endif</span>
1116:
1117: <span class='c-LineComment def-LineComment def-Comment def-Syntax'>// DataCompBoy: get selector for videobuffer</span>
-1118: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>ifdef</span><span class='c-Preproc def-Directive'> _DPMI_</span>
+1118: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>ifdef</span><span class='c-Preproc def-DirectiveContent def-Directive'> _DPMI_</span>
1119: <span class='c-AsmCode def-Directive'>asm</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>{</span>
1120: <span class='asm-asmiBase asm-asmMnemonics def-Keyword'>mov</span> <span class='asm-asmRegister def-Register'>ax</span><span class='asm-asmSymbol def-Symbol'>,</span> <span class='asm-asmNumHex def-NumberHex def-Number'>0002h</span>
1121: <span class='asm-asmiBase asm-asmMnemonics def-Keyword'>mov</span> <span class='asm-asmRegister def-Register'>bx</span><span class='asm-asmSymbol def-Symbol'>,</span> vmsel
@@ -1124,7 +1124,7 @@
1123: <span class='asm-asmiBase asm-asmMnemonics def-Keyword'>mov</span> vmsel<span class='asm-asmSymbol def-Symbol'>,</span> <span class='asm-asmRegister def-Register'>ax</span>
1124: <span class='c-StructureSymbol def-SymbolStrong def-Symbol'>}</span>
1125: vm<span class='c-Symbol def-Symbol'>=</span><span class='c-Symbol def-Symbol'>(</span><span class='c-KeywordANSI-typenames c-KeywordANSI def-Keyword'>char</span><span class='c-Symbol def-Symbol'>*</span><span class='c-Symbol def-Symbol'>)</span><span class='c-Symbol def-Symbol'>(</span>vmsel<span class='c-Symbol def-Symbol'>*</span><span class='def-NumberHex def-Number'>0x10000</span><span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
-1126: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>endif</span>
+1126: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>endif</span>
1127: <span class='c-LineComment def-LineComment def-Comment def-Syntax'>// DataCompBoy: end</span>
1128:
1129: topline <span class='c-Symbol def-Symbol'>=</span> <span class='def-NumberDec def-Number'>0</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
@@ -1187,7 +1187,7 @@
1186: <span class='def-SymbolStrong def-Symbol'>}</span><span class='c-KeywordANSI def-Keyword'>while</span><span class='c-Symbol def-Symbol'>(</span>ch <span class='c-Symbol def-Symbol'>!</span><span class='c-Symbol def-Symbol'>=</span> <span class='def-NumberDec def-Number'>27</span><span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1187:
1188: <span class='c-LineComment def-LineComment def-Comment def-Syntax'>// UNIX systems - hmm...</span>
-1189: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>else</span>
+1189: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>else</span>
1190:
1191: <span class='c-KeywordANSI-typenames c-KeywordANSI def-Keyword'>int</span> ll<span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1192: <span class='c-KeywordANSI-typenames c-KeywordANSI def-Keyword'>char</span> <span class='c-Symbol def-Symbol'>*</span>line<span class='c-Symbol def-Symbol'>,</span> t<span class='c-Symbol def-Symbol'>[</span><span class='def-NumberDec def-Number'>1024</span><span class='c-Symbol def-Symbol'>]</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
@@ -1198,7 +1198,7 @@
1197: <span class='c-KeywordStdio c-KeywordStructure def-StructKeyword def-Keyword'>printf</span><span class='c-Symbol def-Symbol'>(</span><span class='def-StringEdge def-String'>"</span><span class='c-StringEscape def-StringContent def-String'>%s</span><span class='c-StringEscape def-StringContent def-String'>\n</span><span class='def-StringEdge def-String'>"</span><span class='c-Symbol def-Symbol'>,</span>t<span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1198: <span class='def-SymbolStrong def-Symbol'>}</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1199:
-1200: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>endif</span>
+1200: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>endif</span>
1201:
1202: clrDestroyRegions<span class='c-Symbol def-Symbol'>(</span>hlines<span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1203: <span class='c-KeywordANSI def-Keyword'>delete</span> adata<span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
@@ -1367,20 +1367,20 @@
1366: <span class='c-KeywordANSI-typenames c-KeywordANSI def-Keyword'>bool</span> setrules <span class='c-Symbol def-Symbol'>=</span> <span class='c-KeywordANSI def-Keyword'>false</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1367: <span class='c-KeywordStdio c-KeywordStructure def-StructKeyword def-Keyword'>FILE</span> <span class='c-Symbol def-Symbol'>*</span>file<span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1368:
-1369: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>ifdef</span><span class='c-Preproc def-Directive'> _WIN32</span>
+1369: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>ifdef</span><span class='c-Preproc def-DirectiveContent def-Directive'> _WIN32</span>
1370: len <span class='c-Symbol def-Symbol'>=</span> <span class='c-KeywordWin32 c-KeywordLibFunctions def-FunctionKeyword def-Keyword'>GetModuleFileName</span><span class='c-Symbol def-Symbol'>(</span><span class='c-KeywordWin32 c-KeywordLibFunctions def-FunctionKeyword def-Keyword'>GetModuleHandle</span><span class='c-Symbol def-Symbol'>(</span><span class='def-NumberDec def-Number'>0</span><span class='c-Symbol def-Symbol'>)</span><span class='c-Symbol def-Symbol'>,</span> cname<span class='c-Symbol def-Symbol'>,</span> <span class='def-NumberDec def-Number'>256</span><span class='c-Symbol def-Symbol'>)</span><span class='c-Symbol def-Symbol'>-</span><span class='def-NumberDec def-Number'>1</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1371: <span class='c-KeywordANSI def-Keyword'>while</span><span class='c-Symbol def-Symbol'>(</span>cname<span class='c-Symbol def-Symbol'>[</span>len<span class='c-Symbol def-Symbol'>]</span> <span class='c-Symbol def-Symbol'>&</span><span class='c-Symbol def-Symbol'>&</span> cname<span class='c-Symbol def-Symbol'>[</span>len<span class='c-Symbol def-Symbol'>]</span> <span class='c-Symbol def-Symbol'>!</span><span class='c-Symbol def-Symbol'>=</span> <span class='c-Character def-Character def-String'>'\\'</span><span class='c-Symbol def-Symbol'>)</span> len<span class='c-Symbol def-Symbol'>-</span><span class='c-Symbol def-Symbol'>-</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1372: <span class='c-KeywordStdio c-KeywordStructure def-StructKeyword def-Keyword'>strcpy</span><span class='c-Symbol def-Symbol'>(</span>cname<span class='c-Symbol def-Symbol'>+</span>len<span class='c-Symbol def-Symbol'>+</span><span class='def-NumberDec def-Number'>1</span><span class='c-Symbol def-Symbol'>,</span> <span class='def-StringEdge def-String'>"</span><span class='c-String def-String'>colorer.ini</span><span class='def-StringEdge def-String'>"</span><span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
-1373: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>elif</span><span class='c-Preproc def-Directive'> </span><span class='c-PreprocWord def-DirectiveContent def-Directive'>defined</span><span class='c-Preproc def-Directive'> __MSDOS__</span>
+1373: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>elif</span><span class='c-Preproc def-DirectiveContent def-Directive'> </span><span class='c-PreprocWord def-Directive'>defined</span><span class='c-Preproc def-DirectiveContent def-Directive'> __MSDOS__</span>
1374: <span class='c-LineComment def-LineComment def-Comment def-Syntax'>//DataCompBoy: begin</span>
1375: <span class='c-KeywordStdio c-KeywordStructure def-StructKeyword def-Keyword'>strcpy</span><span class='c-Symbol def-Symbol'>(</span>cname<span class='c-Symbol def-Symbol'>,</span> param0<span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1376: len <span class='c-Symbol def-Symbol'>=</span> <span class='c-KeywordStdio c-KeywordStructure def-StructKeyword def-Keyword'>strlen</span><span class='c-Symbol def-Symbol'>(</span>cname<span class='c-Symbol def-Symbol'>)</span><span class='c-Symbol def-Symbol'>-</span><span class='def-NumberDec def-Number'>1</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1377: <span class='c-KeywordANSI def-Keyword'>while</span><span class='c-Symbol def-Symbol'>(</span>cname<span class='c-Symbol def-Symbol'>[</span>len<span class='c-Symbol def-Symbol'>]</span> <span class='c-Symbol def-Symbol'>&</span><span class='c-Symbol def-Symbol'>&</span> cname<span class='c-Symbol def-Symbol'>[</span>len<span class='c-Symbol def-Symbol'>]</span> <span class='c-Symbol def-Symbol'>!</span><span class='c-Symbol def-Symbol'>=</span> <span class='c-Character def-Character def-String'>'\\'</span><span class='c-Symbol def-Symbol'>)</span> len<span class='c-Symbol def-Symbol'>-</span><span class='c-Symbol def-Symbol'>-</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1378: <span class='c-KeywordStdio c-KeywordStructure def-StructKeyword def-Keyword'>strcpy</span><span class='c-Symbol def-Symbol'>(</span>cname<span class='c-Symbol def-Symbol'>+</span>len<span class='c-Symbol def-Symbol'>+</span><span class='def-NumberDec def-Number'>1</span><span class='c-Symbol def-Symbol'>,</span> <span class='def-StringEdge def-String'>"</span><span class='c-String def-String'>colorer.ini</span><span class='def-StringEdge def-String'>"</span><span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
1379: <span class='c-LineComment def-LineComment def-Comment def-Syntax'>//DataCompBoy: end</span>
-1380: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>else</span>
+1380: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>else</span>
1381: <span class='c-KeywordStdio c-KeywordStructure def-StructKeyword def-Keyword'>strcpy</span><span class='c-Symbol def-Symbol'>(</span>cname<span class='c-Symbol def-Symbol'>,</span> UNIX_CFG<span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
-1382: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>endif</span>
+1382: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>endif</span>
1383:
1384:
1385: file <span class='c-Symbol def-Symbol'>=</span> <span class='c-KeywordStdio c-KeywordStructure def-StructKeyword def-Keyword'>fopen</span><span class='c-Symbol def-Symbol'>(</span>cname<span class='c-Symbol def-Symbol'>,</span> <span class='def-StringEdge def-String'>"</span><span class='c-String def-String'>r</span><span class='def-StringEdge def-String'>"</span><span class='c-Symbol def-Symbol'>)</span><span class='c-StructureSymbol def-SymbolStrong def-Symbol'>;</span>
Modified: branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/full/qt/dlcat.cpp.html
===================================================================
--- branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/full/qt/dlcat.cpp.html 2009-03-30 18:29:15 UTC (rev 1085)
+++ branches/EFREMOV-BASE2/colorer/src/test/hrc/_valid/cpp/full/qt/dlcat.cpp.html 2009-03-30 22:10:18 UTC (rev 1086)
@@ -1,5 +1,5 @@
- 0: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include </span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>"</span><span class='c-PreprocInclude def-Path def-URI'>dlabel.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>"</span>
- 1: <span class='c-Preproc def-Directive'>#</span><span class='c-PreprocWord def-DirectiveContent def-Directive'>include </span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>"</span><span class='c-PreprocInclude def-Path def-URI'>dlcat.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>"</span>
+ 0: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include </span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>"</span><span class='c-PreprocInclude def-Path def-URI'>dlabel.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>"</span>
+ 1: <span class='c-PreprocPref def-DirectiveEdge def-DirectiveContent def-Directive'>#</span><span class='c-PreprocWord def-Directive'>include </span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>"</span><span class='c-PreprocInclude def-Path def-URI'>dlcat.h</span><span class='c-PreprocIncludeEdge def-StringEdge def-String'>"</span>
2:
3: DCatWidget<span class='c-PrefixSymbol def-SymbolStrong def-Symbol'>::</span>DCatWidget<span class='c-Symbol def-Symbol'>(</span><span class='cpp-qt-class c-KeywordStructure def-StructKeyword def-Keyword'>QWidget</span> <span class='c-Symbol def-Symbol'>*</span>p<span class='c-Symbol def-Symbol'>)</span> <span class='c-StructureSymbol def-SymbolStrong def-Symbol'>:</span> <span class='cpp-qt-class c-KeywordStructure def-StructKeyword def-Keyword'>QWidg...
[truncated message content] |