Menu
▾
▴
[clr-ci] SF.net SVN: colorer:[1944] branches/lazyeugene
|
From: <laz...@us...> - 2013-04-21 04:25:06
|
Revision: 1944
http://sourceforge.net/p/colorer/svn/1944
Author: lazyeugene
Date: 2013-04-21 04:24:59 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
* merge from trunk
Modified Paths:
--------------
branches/lazyeugene/hrc/changelog
branches/lazyeugene/hrc/hrc/CHANGELOG
branches/lazyeugene/hrc/hrc/base/csharp.hrc
branches/lazyeugene/hrc/hrc/base/d.hrc
branches/lazyeugene/hrc/hrc/proto.hrc
branches/lazyeugene/hrc/hrc/proto.hrc.far
branches/lazyeugene/hrc/hrc/rare/ie-weidu/dialog.hrc
branches/lazyeugene/hrc/hrc/rare/mako.hrc
branches/lazyeugene/hrc/hrc/rare/modula.hrc
branches/lazyeugene/hrc/hrc/rare/ubasic.hrc
branches/lazyeugene/hrc/hrc/scripts/graphviz.hrc
branches/lazyeugene/hrc/hrc/scripts/ini/reg.hrc
branches/lazyeugene/hrc/hrc/xml/dtdcatalog.hrc
branches/lazyeugene/hrc/test/_valid/cpp/full/colorer.cpp.html
branches/lazyeugene/hrc/test/_valid/other/modula2/full/mod.graph.mod.html
branches/lazyeugene/hrc/test/_valid/other/modula2/full/mod.mod.html
branches/lazyeugene/hrc/test/_valid/other/modula2/full/mod.window.mod.html
branches/lazyeugene/hrc/test/_valid/other/modula2/mod.ovl.mod.html
branches/lazyeugene/hrc/test/_valid/reg/far.reg.html
branches/lazyeugene/hrc/test/_valid/reg/test.reg.html
Property Changed:
----------------
branches/lazyeugene/
branches/lazyeugene/hrc/hrc/
branches/lazyeugene/hrc/src/
branches/lazyeugene/hrc/test/
branches/lazyeugene/hrd/hrd/
Index: branches/lazyeugene
===================================================================
--- branches/lazyeugene 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene 2013-04-21 04:24:59 UTC (rev 1944)
Property changes on: branches/lazyeugene
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/EFREMOV-BASE2/schemes:1029-1068,1071-1078,1080-1099,1101-1107,1110,1214,1251-1304
/branches/Efremov-hrc:1386-1399
-/trunk/schemes:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305,1812-1906
+/trunk/schemes:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305,1812-1943
\ No newline at end of property
Modified: branches/lazyeugene/hrc/changelog
===================================================================
--- branches/lazyeugene/hrc/changelog 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/changelog 2013-04-21 04:24:59 UTC (rev 1944)
@@ -1,5 +1,30 @@
$Revision$
$Author$ $Date$
+ - исправления в hrc файлов ошибок, свзяанных с форматом xml
+ - ошибка в modula.hrc
+
+#Revision: 1933
+ #Author: ctapmex Date: 2013-03-13 13:35:53 +0600 (Ср, 13 мар 2013)
+ - дополнен modula.hrc ( Alexander Naumov)
+
+#Revision: 1932
+ #Author: ctapmex Date: 2013-03-12 20:49:14 +0600 (Вт, 12 мар 2013)
+ - слито с branches/lazyeugene
+
+#Revision: 1928
+ #Author: ctapmex Date: 2013-03-02 17:41:14 +0600 (Сб, 02 мар 2013)
+ - слито с branches/lazyeugene
+
+#Revision: 1917
+ #Author: ctapmex Date: 2013-02-21 16:48:56 +0600 (Чт, 21 фев 2013)
+ - слито с branches/lazyeugene
+
+#Revision: 1911
+ #Author: ctapmex Date: 2013-02-13 09:41:33 +0600 (Ср, 13 фев 2013)
+ - слито с branches/lazyeugene
+
+#Revision: 1906
+ #Author: ctapmex Date: 2013-02-09 18:20:44 +0600 (Сб, 09 фев 2013)
- js добавление анонимных функций в outline
#Revision: 1905
Index: branches/lazyeugene/hrc/hrc
===================================================================
--- branches/lazyeugene/hrc/hrc 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/hrc 2013-04-21 04:24:59 UTC (rev 1944)
Property changes on: branches/lazyeugene/hrc/hrc
___________________________________________________________________
Modified: svn:mergeinfo
## -3,4 +3,4 ##
/branches/Efremov-hrc/hrc/hrc:1386-1399
/branches/TECHTONIK-HRC-REF/colorer/hrc:909-1221,1223-1240
/trunk/colorer/hrc:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305,1327
-/trunk/schemes/hrc/hrc:1812-1906
+/trunk/schemes/hrc/hrc:1812-1943
\ No newline at end of property
Modified: branches/lazyeugene/hrc/hrc/CHANGELOG
===================================================================
--- branches/lazyeugene/hrc/hrc/CHANGELOG 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/hrc/CHANGELOG 2013-04-21 04:24:59 UTC (rev 1944)
@@ -1,3 +1,43 @@
+2013-04-15
+ Fixed:
+ - d.hrc, ie-weidu/dialog.hrc, mako.hrc, ubasic.hrc, graphiz.hrc, reg.hrc, dtdcatalog.hrc - fix error in xml format
+ - modula - fix error
+
+2013-03-29
+ Fixed:
+ - c# - point in a method name (Roman Kuzmin)
+ - less - new functions, some improvements
+ - php - constants
+ - c - win32 constants
+
+2013-03-13
+ Fixed:
+ - modula (Alexander Naumov)
+
+2013-03-12
+ Fixed:
+ - c++ - added constants for dll loading;
+ - added some constants and functions;
+ - added __declspec() directives
+
+2013-03-02
+ New:
+ - Twig scheme
+ - YAML scheme
+ Fixed:
+ - SilverStripe comment scheme improvement
+
+2013-21-02
+ Fixed:
+ - lua - errors processing (single closed brackets and "end" keyword);
+ Sting edges, paired brackets changes;
+ some more error handling;
+ - wrong xml detection if files like *.html.*
+
+2013-13-02
+ New:
+ - scheme for new macrolib+lua (lazyeugene)
+
2013-09-02
Fixed:
- SilverStripe - some fixes (lazyeugene)
Modified: branches/lazyeugene/hrc/hrc/base/csharp.hrc
===================================================================
--- branches/lazyeugene/hrc/hrc/base/csharp.hrc 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/hrc/base/csharp.hrc 2013-04-21 04:24:59 UTC (rev 1944)
@@ -59,7 +59,7 @@
(\w [\w*\[\]\s]+? [*\[\]\s]) (delegate \s* \([\w_*~,\[\]\s]*\)\s*)?
(?{csharp:FuncOutline}
- ([\w]+?)
+ ([\w.]+?)
)
(\sfor)?~4 (\sif)?~3 (\swhile)?~6 (\sdo)?~3 (\sswitch)?~7 (\scatch)?~6 (\sforeach)?~8
@@ -74,7 +74,6 @@
[\:\w]+ [\:\w\s]*? ([^;]|$)
)/x
]]></regexp>
-
<keywords region="csSymbol">
<symb name=";" region="csSymbolStrong"/>
<symb name=":"/>
Modified: branches/lazyeugene/hrc/hrc/base/d.hrc
===================================================================
--- branches/lazyeugene/hrc/hrc/base/d.hrc 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/hrc/base/d.hrc 2013-04-21 04:24:59 UTC (rev 1944)
@@ -292,10 +292,10 @@
</block>
<block scheme='def:empty' region='string.delimited'>
- <start match='/(q)("(\<))/'
+ <start match='/(q)("(<))/'
region0='string.quote' region1='string.pref' region2='def:PairStart' region3='string.delimited.name'
/>
- <end match='/((\>)")/' region0='string.quote' region1='def:PairEnd' region2='string.delimited.name'/>
+ <end match='/((>)")/' region0='string.quote' region1='def:PairEnd' region2='string.delimited.name'/>
</block>
<block scheme='def:empty' region='string.delimited'>
Modified: branches/lazyeugene/hrc/hrc/proto.hrc
===================================================================
--- branches/lazyeugene/hrc/hrc/proto.hrc 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/hrc/proto.hrc 2013-04-21 04:24:59 UTC (rev 1944)
@@ -86,7 +86,7 @@
</prototype>
<prototype name="perl" group="main" description="Perl">
<location link="base/perl.hrc"/>
- <filename>/\.(pl[sx]?|pm|pod|t)$/i</filename>
+ <filename>/\.(pl[sx]?|pm|pod|t|ph)$/i</filename>
<firstline weight='2'>/^\#!\s*.+perl\b/</firstline>
<firstline>/perl/i</firstline>
<parameters>
@@ -227,6 +227,10 @@
<location link="inet/twig.hrc"/>
<filename weight="10">/\.(twig)$/</filename>
</prototype>
+ <prototype name="twig" group="inet" description="Twig PHP Templates">
+ <location link="inet/twig.hrc"/>
+ <filename weight="10">/\.(twig)$/</filename>
+ </prototype>
<prototype name="haml" group="inet" description="HAML">
<location link="inet/haml.hrc"/>
Modified: branches/lazyeugene/hrc/hrc/proto.hrc.far
===================================================================
--- branches/lazyeugene/hrc/hrc/proto.hrc.far 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/hrc/proto.hrc.far 2013-04-21 04:24:59 UTC (rev 1944)
@@ -86,7 +86,7 @@
</prototype>
<prototype name="perl" group="main" description="Perl">
<location link="base/perl.hrc"/>
- <filename>/\.(pl[sx]?|pm|pod|t)$/i</filename>
+ <filename>/\.(pl[sx]?|pm|pod|t|ph)$/i</filename>
<firstline weight='2'>/^\#!\s*.+perl\b/</firstline>
<firstline>/perl/i</firstline>
<parameters>
Modified: branches/lazyeugene/hrc/hrc/rare/ie-weidu/dialog.hrc
===================================================================
--- branches/lazyeugene/hrc/hrc/rare/ie-weidu/dialog.hrc 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/hrc/rare/ie-weidu/dialog.hrc 2013-04-21 04:24:59 UTC (rev 1944)
@@ -462,11 +462,11 @@
/>
<block start='/\b(CHAIN)\s+(IF\s+)?!(IF_FILE_EXISTS\s+)?(%label;\s+(?{chain.out}%label;))/' end='/^\M%action;/' scheme='chain.text'
- region01='key' region03='key.check' region04='label' end='/^\M%action;/'
+ region01='key' region03='key.check' region04='label'
/>
<block start='/\bCHAIN\b/' end='/^\M%action;/' scheme='chain'
- region00='key' end='/^\M%action;/'
+ region00='key'
/>
<block start='/\b(INTERJECT(_COPY_TRANS[234]?)?|I_C_T[234]?)\s+\M(?{inter.out}[\S]+)/'
Modified: branches/lazyeugene/hrc/hrc/rare/mako.hrc
===================================================================
--- branches/lazyeugene/hrc/hrc/rare/mako.hrc 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/hrc/rare/mako.hrc 2013-04-21 04:24:59 UTC (rev 1944)
@@ -33,13 +33,13 @@
<block start="/##/" end="/$/" scheme="def:Comment" region="def:LineComment"/>
<!-- python colorization to mako tags -->
- <block start="/(?{def:PairStart}\<%def.*\>)/" end="/(?{def:PairEnd}\</%def\>)/" scheme="mako" region="MakoTag"/>
- <block start="/(?{def:PairStart}\<%(doc|textpage|include|namespace|inherit|call))/"
- end="/(?{def:PairEnd}(\>|$))/"
+ <block start="/(?{def:PairStart}<%def.*>)/" end="/(?{def:PairEnd}</%def>)/" scheme="mako" region="MakoTag"/>
+ <block start="/(?{def:PairStart}<%(doc|textpage|include|namespace|inherit|call))/"
+ end="/(?{def:PairEnd}(>|$))/"
scheme="python:python" region="MakoTag"/>
<!-- Python blocks -->
- <block start="/(?{def:PairStart}\<%)/" end="/(?{def:PairEnd}%\>)/" scheme="python:python" region="PythonBlock"/>
+ <block start="/(?{def:PairStart}<%)/" end="/(?{def:PairEnd}%>)/" scheme="python:python" region="PythonBlock"/>
<block start="/(?{def:PairStart}\$\{)/" end="/(?{def:PairEnd}\})/" scheme="python:python" region="PythonBlock"/>
<block start="/^\s*%/" end="/$/" scheme="python:python" region="PythonBlock"/>
Modified: branches/lazyeugene/hrc/hrc/rare/modula.hrc
===================================================================
--- branches/lazyeugene/hrc/hrc/rare/modula.hrc 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/hrc/rare/modula.hrc 2013-04-21 04:24:59 UTC (rev 1944)
@@ -11,21 +11,31 @@
<filename>/\.(mod|ob2|odf|def)$/i</filename>
<firstline>/\(\*|MODULE|DEFINITION|IMPLEMENTATION|<\*/</firstline>
]]></documentation>
- <contributors>
+ <contributors><![CDATA[
Eugene Kotlyarov 2:5058/26...@fi... http://ekot.narod.ru/far
- </contributors>
+ Alexander Naumov <ur...@ah...>
+ ]]></contributors>
</annotation>
<region name="String" parent="def:String"/>
+ <region name="Comment" parent="def:Comment"/>
<region name="Symbol" parent="def:Symbol"/>
<region name="Keyword" parent="def:Keyword"/>
<region name="Number" parent="def:Number"/>
<region name="PairStart" parent="def:PairStart"/>
<region name="PairEnd" parent="def:PairEnd"/>
+ <scheme name="NestedComment">
+ <inherit scheme="def:Comment"/>
+ <block scheme="NestedComment" region="Comment">
+ <start region="PairStart">/\(\*/</start>
+ <end region="PairEnd">/\*\)/</end>
+ </block>
+ </scheme>
+
<scheme name="modula2">
<!-- Comments -->
- <block start="/\(\*/" end="/\*\)/" scheme="def:Comment" region="def:Comment" region00="PairStart" region10="PairEnd"/>
+ <block start="/\(\*/" end="/\*\)/" scheme="NestedComment" region="Comment" region00="PairStart" region10="PairEnd"/>
<block start="/<\*/" end="/\*>/" scheme="def:Comment" region="def:Directive" region00="PairStart" region10="PairEnd"/>
<block start="/--/" end="/$/" scheme="def:Comment" region="def:LineComment"/>
<!-- paired -->
@@ -91,7 +101,6 @@
<word name="IF"/>
<word name="IMPORT"/>
<word name="IN"/>
- <word name="IS"/>
<word name="LOOP"/>
<word name="MOD"/>
<word name="MODULE"/>
@@ -110,6 +119,8 @@
<word name="VAR"/>
<word name="WHILE"/>
<word name="WITH"/>
+<!-- Oberon2 words -->
+ <word name="IS"/>
<!-- Modula2 words -->
<word name="AND"/>
<word name="EXCEPT"/>
@@ -123,27 +134,57 @@
<word name="QUALIFIED"/>
<word name="REM"/>
<word name="RETRY"/>
+<!-- Modula2 ISO ext words -->
+ <word name="AS"/>
+ <word name="ABSTRACT"/>
+ <word name="CLASS"/>
+ <word name="GUARD"/>
+ <word name="INHERIT"/>
+ <word name="OVERRIDE"/>
+ <word name="READONLY"/>
+ <word name="REVEAL"/>
+ <word name="TRACED"/>
+ <word name="UNSAFEGUARDED"/>
+ <word name="GENERIC"/>
+ </keywords>
+<!-- Modules -->
+ <keywords region="def:InterfaceKeyword">
+ <word name="SYSTEM"/>
+ <word name="EXCEPTIONS"/>
+ <word name="M2EXCEPTION"/>
+ <word name="COROUTINES"/>
+ <word name="TERMINATION"/>
+ <word name="M2OOEXCEPTION"/>
+ <word name="GARBAGECOLLECTION"/>
+ </keywords>
+<!-- Constants -->
+ <keywords region="def:Constant">
+ <word name="TRUE"/>
+ <word name="FALSE"/>
+ <word name="NIL"/>
+ </keywords>
<!-- Types -->
- <word name="SYSTEM"/>
+ <keywords region="def:TypeKeyword">
+ <word name="BOOLEAN"/>
+ <word name="CHAR"/>
<word name="CARDINAL"/>
- <word name="SHORTINT"/>
<word name="INTEGER"/>
- <word name="LONGINT"/>
<word name="REAL"/>
<word name="LONGREAL"/>
+ <word name="BITSET"/>
+ <word name="COMPLEX"/>
+ <word name="LONGCOMPLEX"/>
<word name="WORD"/>
+ <word name="LOC"/>
<word name="BYTE"/>
- <word name="BOOLEAN"/>
- <word name="CHAR"/>
+ <word name="SHORTINT"/>
+ <word name="LONGINT"/>
<word name="INT8"/>
<word name="INT16"/>
<word name="INT32"/>
<word name="CARD8"/>
<word name="CARD16"/>
<word name="CARD32"/>
- <word name="TRUE"/>
- <word name="FALSE"/>
- <word name="NIL"/>
</keywords>
</scheme>
</type>
Modified: branches/lazyeugene/hrc/hrc/rare/ubasic.hrc
===================================================================
--- branches/lazyeugene/hrc/hrc/rare/ubasic.hrc 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/hrc/rare/ubasic.hrc 2013-04-21 04:24:59 UTC (rev 1944)
@@ -99,7 +99,7 @@
region1="ubWord" region3="ubId" region4="ubSymb"
region6="ubNumb" region7="ubSymb" region8="ubSymb" region9="ubSymb"/>
- <regexp match="/\b(\w[\w\d\._]+)\b\M(\<.*\>)? \s*(:|\+|\-|)?(\=|\#)\s*\w/x"
+ <regexp match="/\b(\w[\w\d\._]+)\b\M(<.*>)? \s*(:|\+|\-|)?(\=|\#)\s*\w/x"
region1="ubId" />
<regexp match="/^\s*(\$(?:\*|CHAIN|INCLUDE|INSERT))\b\s+(\w[\w\d._]+)(?:\s+(\w[\w\d._]+))?/"
Modified: branches/lazyeugene/hrc/hrc/scripts/graphviz.hrc
===================================================================
--- branches/lazyeugene/hrc/hrc/scripts/graphviz.hrc 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/hrc/scripts/graphviz.hrc 2013-04-21 04:24:59 UTC (rev 1944)
@@ -51,7 +51,7 @@
<regexp match="/\\./" region="LabelContent"/>
<regexp match="/\\n/" region="LabelContent"/>
<regexp match="/\}/" region="LabelContent"/>
- <regexp match="/\|?[\{\|]\s*\<[\w]+\>/" region="LabelContent"/>
+ <regexp match="/\|?[\{\|]\s*<[\w]+>/" region="LabelContent"/>
</scheme>
<scheme name="id_content_html">
Modified: branches/lazyeugene/hrc/hrc/scripts/ini/reg.hrc
===================================================================
--- branches/lazyeugene/hrc/hrc/scripts/ini/reg.hrc 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/hrc/scripts/ini/reg.hrc 2013-04-21 04:24:59 UTC (rev 1944)
@@ -129,9 +129,7 @@
region00="def:PairStart" region10="def:PairEnd"
region01="def:StringEdge" region11="def:StringEdge"
/>
- <regexp match="/\-\s*$/" region="type.dword"
- region="ini:SymbolStrong"
- />
+ <regexp match="/\-\s*$/" region="type.dword"/>
<inherit scheme="ini:comment"/>
<inherit scheme="ini:error"/>
</scheme>
Modified: branches/lazyeugene/hrc/hrc/xml/dtdcatalog.hrc
===================================================================
--- branches/lazyeugene/hrc/hrc/xml/dtdcatalog.hrc 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/hrc/xml/dtdcatalog.hrc 2013-04-21 04:24:59 UTC (rev 1944)
@@ -63,7 +63,7 @@
<block start='/(--)/' end='/(--)/'
scheme='def:Comment' region='Comment'
region00='Comment.start' region10='Comment.end'
- region01='def:PairStart' region10='def:PairEnd'
+ region01='def:PairStart' region11='def:PairEnd'
/>
</scheme>
Index: branches/lazyeugene/hrc/src
===================================================================
--- branches/lazyeugene/hrc/src 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/src 2013-04-21 04:24:59 UTC (rev 1944)
Property changes on: branches/lazyeugene/hrc/src
___________________________________________________________________
Modified: svn:mergeinfo
## -3,4 +3,4 ##
/branches/Efremov-hrc/hrc/src:1386-1399
/branches/TECHTONIK-HRC-REF/colorer/src/hrc:909-1221,1223-1240
/trunk/colorer/src/hrc:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305,1327
-/trunk/schemes/hrc/src:1812-1906
+/trunk/schemes/hrc/src:1812-1943
\ No newline at end of property
Index: branches/lazyeugene/hrc/test
===================================================================
--- branches/lazyeugene/hrc/test 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/test 2013-04-21 04:24:59 UTC (rev 1944)
Property changes on: branches/lazyeugene/hrc/test
___________________________________________________________________
Modified: svn:mergeinfo
## -3,4 +3,4 ##
/branches/Efremov-hrc/hrc/test:1386-1399
/branches/TECHTONIK-HRC-REF/colorer/src/test/hrc:909-1221,1223-1240
/trunk/colorer/src/test/hrc:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305,1327
-/trunk/schemes/hrc/test:1812-1906
+/trunk/schemes/hrc/test:1812-1943
\ No newline at end of property
Modified: branches/lazyeugene/hrc/test/_valid/cpp/full/colorer.cpp.html
===================================================================
--- branches/lazyeugene/hrc/test/_valid/cpp/full/colorer.cpp.html 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/test/_valid/cpp/full/colorer.cpp.html 2013-04-21 04:24:59 UTC (rev 1944)
@@ -794,7 +794,7 @@
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-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>
+ 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><span class='c-KeywordConstant def-Constant def-Keyword'>GENERIC_WRITE</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='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-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>
Modified: branches/lazyeugene/hrc/test/_valid/other/modula2/full/mod.graph.mod.html
===================================================================
--- branches/lazyeugene/hrc/test/_valid/other/modula2/full/mod.graph.mod.html 2013-04-21 03:47:13 UTC (rev 1943)
+++ branches/lazyeugene/hrc/test/_valid/other/modula2/full/mod.graph.mod.html 2013-04-21 04:24:59 UTC (rev 1944)
@@ -1,8 +1,8 @@
- 0: <span class='def-Comment def-Syntax'>(* Copyright (C) 1987 Jensen & Partners International *)</span>
+ 0: <span class='modula2-Comment def-Comment def-Syntax'>(* Copyright (C) 1987 Jensen & Partners International *)</span>
1:
- 2: <span class='def-Comment def-Syntax'>(*$N,V-,I-,R-,A-,S-*)</span>
+ 2: <span class='modula2-Comment def-Comment def-Syntax'>(*$N,V-,I-,R-,A-,S-*)</span>
3: <span class='modula2-Keyword def-Keyword'>IMPLEMENTATION</span> <span class='modula2-Keyword def-Keyword'>MODULE</span> Graph<span class='modula2-Symbol def-Symbol'>;</span>
- 4: <span class='modula2-Keyword def-Keyword'>IMPORT</span> Lib<span class='modula2-Symbol def-Symbol'>,</span> <span class='modula2-Keyword def-Keyword'>SYSTEM</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 4: <span class='modula2-Keyword def-Keyword'>IMPORT</span> Lib<span class='modula2-Symbol def-Symbol'>,</span> <span class='def-InterfaceKeyword def-Keyword'>SYSTEM</span><span class='modula2-Symbol def-Symbol'>;</span>
5:
6: <span class='modula2-Keyword def-Keyword'>TYPE</span>
7: tinyint <span class='modula2-Symbol def-Symbol'>=</span> <span class='modula2-Symbol def-Symbol'>[</span><span class='modula2-Number def-Number'>0..7</span><span class='modula2-Symbol def-Symbol'>]</span><span class='modula2-Symbol def-Symbol'>;</span>
@@ -18,70 +18,70 @@
17: EGAScreen <span class='modula2-Symbol def-Symbol'>[</span><span class='modula2-Number def-Number'>0A000H</span><span class='modula2-Symbol def-Symbol'>:</span><span class='modula2-Number def-Number'>0</span><span class='modula2-Symbol def-Symbol'>]</span> <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>ARRAY</span><span class='modula2-Symbol def-Symbol'>[</span><span class='modula2-Number def-Number'>0..0</span><span class='modula2-Symbol def-Symbol'>]</span> <span class='modula2-Keyword def-Keyword'>OF</span> bs<span class='modula2-Symbol def-Symbol'>;</span>
18:
19:
- 20: <span class='def-Comment def-Syntax'>(* == CGA specific routines == *)</span>
+ 20: <span class='modula2-Comment def-Comment def-Syntax'>(* == CGA specific routines == *)</span>
21:
22:
23: <span class='modula2-Keyword def-Keyword'>PROCEDURE</span> CGAGraphMode<span class='modula2-Symbol def-Symbol'>;</span>
- 24: <span class='modula2-Keyword def-Keyword'>VAR</span> r <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>SYSTEM</span><span class='modula2-Number def-Number'>.</span>Registers<span class='modula2-Symbol def-Symbol'>;</span>
+ 24: <span class='modula2-Keyword def-Keyword'>VAR</span> r <span class='modula2-Symbol def-Symbol'>:</span> <span class='def-InterfaceKeyword def-Keyword'>SYSTEM</span><span class='modula2-Number def-Number'>.</span>Registers<span class='modula2-Symbol def-Symbol'>;</span>
25: <span class='modula2-Symbol def-Symbol'>BEGIN</span>
26: r<span class='modula2-Number def-Number'>.</span>AX <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Number def-Number'>5</span><span class='modula2-Symbol def-Symbol'>;</span>
27: Lib<span class='modula2-Number def-Number'>.</span>Intr<span class='modula2-Symbol def-Symbol'>(</span> r<span class='modula2-Symbol def-Symbol'>,</span><span class='modula2-Number def-Number'>10H</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
28: <span class='modula2-Symbol def-Symbol'>END</span> CGAGraphMode<span class='modula2-Symbol def-Symbol'>;</span>
29:
30: <span class='modula2-Keyword def-Keyword'>PROCEDURE</span> CGATextMode<span class='modula2-Symbol def-Symbol'>;</span>
- 31: <span class='modula2-Keyword def-Keyword'>VAR</span> r <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>SYSTEM</span><span class='modula2-Number def-Number'>.</span>Registers<span class='modula2-Symbol def-Symbol'>;</span>
+ 31: <span class='modula2-Keyword def-Keyword'>VAR</span> r <span class='modula2-Symbol def-Symbol'>:</span> <span class='def-InterfaceKeyword def-Keyword'>SYSTEM</span><span class='modula2-Number def-Number'>.</span>Registers<span class='modula2-Symbol def-Symbol'>;</span>
32: <span class='modula2-Symbol def-Symbol'>BEGIN</span>
33: r<span class='modula2-Number def-Number'>.</span>AX <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Number def-Number'>3</span><span class='modula2-Symbol def-Symbol'>;</span>
34: Lib<span class='modula2-Number def-Number'>.</span>Intr<span class='modula2-Symbol def-Symbol'>(</span> r<span class='modula2-Symbol def-Symbol'>,</span><span class='modula2-Number def-Number'>10H</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
35: <span class='modula2-Symbol def-Symbol'>END</span> CGATextMode<span class='modula2-Symbol def-Symbol'>;</span>
36:
- 37: <span class='modula2-Keyword def-Keyword'>PROCEDURE</span> CGAPlot<span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>,</span>y<span class='modula2-Symbol def-Symbol'>:</span><span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>c<span class='modula2-Symbol def-Symbol'>:</span><span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 37: <span class='modula2-Keyword def-Keyword'>PROCEDURE</span> CGAPlot<span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>,</span>y<span class='modula2-Symbol def-Symbol'>:</span><span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>c<span class='modula2-Symbol def-Symbol'>:</span><span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
38: <span class='modula2-Keyword def-Keyword'>VAR</span>
- 39: off <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
- 40: seg <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
- 41: tmp <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 39: off <span class='modula2-Symbol def-Symbol'>:</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 40: seg <span class='modula2-Symbol def-Symbol'>:</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 41: tmp <span class='modula2-Symbol def-Symbol'>:</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
42: <span class='modula2-Symbol def-Symbol'>BEGIN</span>
43: <span class='modula2-Symbol def-Symbol'>IF</span> <span class='modula2-Symbol def-Symbol'>(</span>x <span class='modula2-Symbol def-Symbol'>>=</span> CGAWidth<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Keyword def-Keyword'>OR</span> <span class='modula2-Symbol def-Symbol'>(</span>y <span class='modula2-Symbol def-Symbol'>>=</span> CGADepth<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Keyword def-Keyword'>THEN</span> <span class='modula2-Keyword def-Keyword'>RETURN</span> <span class='modula2-Symbol def-Symbol'>END</span><span class='modula2-Symbol def-Symbol'>;</span>
44: off <span class='modula2-Symbol def-Symbol'>:=</span> x <span class='modula2-Symbol def-Symbol'>></span><span class='modula2-Symbol def-Symbol'>></span> <span class='modula2-Number def-Number'>2</span><span class='modula2-Symbol def-Symbol'>;</span>
45: <span class='modula2-Symbol def-Symbol'>IF</span> ODD<span class='modula2-Symbol def-Symbol'>(</span>y<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Keyword def-Keyword'>THEN</span> INC<span class='modula2-Symbol def-Symbol'>(</span> off<span class='modula2-Symbol def-Symbol'>,</span> <span class='modula2-Number def-Number'>2000H</span> <span class='modula2-Symbol def-Symbol'>-</span> <span class='modula2-Number def-Number'>40</span> <span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>END</span><span class='modula2-Symbol def-Symbol'>;</span>
46: INC<span class='modula2-Symbol def-Symbol'>(</span> y<span class='modula2-Symbol def-Symbol'>,</span> y <span class='modula2-Symbol def-Symbol'><</span><span class='modula2-Symbol def-Symbol'><</span> <span class='modula2-Number def-Number'>2</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
47: INC<span class='modula2-Symbol def-Symbol'>(</span> off<span class='modula2-Symbol def-Symbol'>,</span> y <span class='modula2-Symbol def-Symbol'><</span><span class='modula2-Symbol def-Symbol'><</span> <span class='modula2-Number def-Number'>3</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
- 48: x <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Number def-Number'>3</span> <span class='modula2-Symbol def-Symbol'>-</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>(</span> BITSET<span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>*</span> BITSET<span class='modula2-Symbol def-Symbol'>(</span><span class='modula2-Number def-Number'>3</span><span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 48: x <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Number def-Number'>3</span> <span class='modula2-Symbol def-Symbol'>-</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>(</span> <span class='def-TypeKeyword def-Keyword'>BITSET</span><span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>*</span> <span class='def-TypeKeyword def-Keyword'>BITSET</span><span class='modula2-Symbol def-Symbol'>(</span><span class='modula2-Number def-Number'>3</span><span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
49: x <span class='modula2-Symbol def-Symbol'>:=</span> x <span class='modula2-Symbol def-Symbol'><</span><span class='modula2-Symbol def-Symbol'><</span> <span class='modula2-Number def-Number'>1</span><span class='modula2-Symbol def-Symbol'>;</span>
50: tmp <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Number def-Number'>0B800H</span><span class='modula2-Symbol def-Symbol'>;</span> seg <span class='modula2-Symbol def-Symbol'>:=</span> tmp<span class='modula2-Symbol def-Symbol'>;</span>
51: <span class='modula2-Symbol def-Symbol'>[</span>seg<span class='modula2-Symbol def-Symbol'>:</span>off bp<span class='modula2-Symbol def-Symbol'>]</span><span class='modula2-Symbol def-Symbol'>^</span> <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Symbol def-Symbol'>(</span> <span class='modula2-Symbol def-Symbol'>[</span>seg<span class='modula2-Symbol def-Symbol'>:</span>off bp<span class='modula2-Symbol def-Symbol'>]</span><span class='modula2-Symbol def-Symbol'>^</span> <span class='modula2-Symbol def-Symbol'>-</span> bs<span class='modula2-Symbol def-Symbol'>(</span><span class='modula2-Number def-Number'>3</span><span class='modula2-Symbol def-Symbol'><</span><span class='modula2-Symbol def-Symbol'><</span>x<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>+</span> bs<span class='modula2-Symbol def-Symbol'>(</span>c<span class='modula2-Symbol def-Symbol'><</span><span class='modula2-Symbol def-Symbol'><</span>x<span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
52: <span class='modula2-Symbol def-Symbol'>END</span> CGAPlot<span class='modula2-Symbol def-Symbol'>;</span>
53:
- 54: <span class='modula2-Keyword def-Keyword'>PROCEDURE</span> CGAPoint<span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>,</span>y<span class='modula2-Symbol def-Symbol'>:</span><span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 54: <span class='modula2-Keyword def-Keyword'>PROCEDURE</span> CGAPoint<span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>,</span>y<span class='modula2-Symbol def-Symbol'>:</span><span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>:</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
55: <span class='modula2-Keyword def-Keyword'>VAR</span>
- 56: off <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
- 57: seg <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
- 58: tmp <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 56: off <span class='modula2-Symbol def-Symbol'>:</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 57: seg <span class='modula2-Symbol def-Symbol'>:</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 58: tmp <span class='modula2-Symbol def-Symbol'>:</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
59: <span class='modula2-Symbol def-Symbol'>BEGIN</span>
- 60: <span class='modula2-Symbol def-Symbol'>IF</span> <span class='modula2-Symbol def-Symbol'>(</span>x <span class='modula2-Symbol def-Symbol'>>=</span> CGAWidth<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Keyword def-Keyword'>OR</span> <span class='modula2-Symbol def-Symbol'>(</span>y <span class='modula2-Symbol def-Symbol'>>=</span> CGADepth<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Keyword def-Keyword'>THEN</span> <span class='modula2-Keyword def-Keyword'>RETURN</span> MAX<span class='modula2-Symbol def-Symbol'>(</span><span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>END</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 60: <span class='modula2-Symbol def-Symbol'>IF</span> <span class='modula2-Symbol def-Symbol'>(</span>x <span class='modula2-Symbol def-Symbol'>>=</span> CGAWidth<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Keyword def-Keyword'>OR</span> <span class='modula2-Symbol def-Symbol'>(</span>y <span class='modula2-Symbol def-Symbol'>>=</span> CGADepth<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Keyword def-Keyword'>THEN</span> <span class='modula2-Keyword def-Keyword'>RETURN</span> MAX<span class='modula2-Symbol def-Symbol'>(</span><span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>END</span><span class='modula2-Symbol def-Symbol'>;</span>
61: off <span class='modula2-Symbol def-Symbol'>:=</span> x <span class='modula2-Symbol def-Symbol'>></span><span class='modula2-Symbol def-Symbol'>></span> <span class='modula2-Number def-Number'>2</span><span class='modula2-Symbol def-Symbol'>;</span>
62: <span class='modula2-Symbol def-Symbol'>IF</span> ODD<span class='modula2-Symbol def-Symbol'>(</span>y<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Keyword def-Keyword'>THEN</span> INC<span class='modula2-Symbol def-Symbol'>(</span> off<span class='modula2-Symbol def-Symbol'>,</span> <span class='modula2-Number def-Number'>2000H</span> <span class='modula2-Symbol def-Symbol'>-</span> <span class='modula2-Number def-Number'>40</span> <span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>END</span><span class='modula2-Symbol def-Symbol'>;</span>
63: INC<span class='modula2-Symbol def-Symbol'>(</span> y<span class='modula2-Symbol def-Symbol'>,</span> y <span class='modula2-Symbol def-Symbol'><</span><span class='modula2-Symbol def-Symbol'><</span> <span class='modula2-Number def-Number'>2</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
64: INC<span class='modula2-Symbol def-Symbol'>(</span> off<span class='modula2-Symbol def-Symbol'>,</span> y <span class='modula2-Symbol def-Symbol'><</span><span class='modula2-Symbol def-Symbol'><</span> <span class='modula2-Number def-Number'>3</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
- 65: x <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Number def-Number'>3</span> <span class='modula2-Symbol def-Symbol'>-</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>(</span> BITSET<span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>*</span> BITSET<span class='modula2-Symbol def-Symbol'>(</span><span class='modula2-Number def-Number'>3</span><span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 65: x <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Number def-Number'>3</span> <span class='modula2-Symbol def-Symbol'>-</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>(</span> <span class='def-TypeKeyword def-Keyword'>BITSET</span><span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>*</span> <span class='def-TypeKeyword def-Keyword'>BITSET</span><span class='modula2-Symbol def-Symbol'>(</span><span class='modula2-Number def-Number'>3</span><span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
66: x <span class='modula2-Symbol def-Symbol'>:=</span> x <span class='modula2-Symbol def-Symbol'><</span><span class='modula2-Symbol def-Symbol'><</span> <span class='modula2-Number def-Number'>1</span><span class='modula2-Symbol def-Symbol'>;</span>
67: tmp <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Number def-Number'>0B800H</span><span class='modula2-Symbol def-Symbol'>;</span> seg <span class='modula2-Symbol def-Symbol'>:=</span> tmp<span class='modula2-Symbol def-Symbol'>;</span>
- 68: <span class='modula2-Keyword def-Keyword'>RETURN</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>(</span> <span class='modula2-Symbol def-Symbol'>[</span>seg<span class='modula2-Symbol def-Symbol'>:</span>off bp<span class='modula2-Symbol def-Symbol'>]</span><span class='modula2-Symbol def-Symbol'>^</span> <span class='modula2-Symbol def-Symbol'>*</span> bs<span class='modula2-Symbol def-Symbol'>(</span><span class='modula2-Number def-Number'>3</span><span class='modula2-Symbol def-Symbol'><</span><span class='modula2-Symbol def-Symbol'><</span>x<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>></span><span class='modula2-Symbol def-Symbol'>></span> x<span class='modula2-Symbol def-Symbol'>;</span>
+ 68: <span class='modula2-Keyword def-Keyword'>RETURN</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>(</span> <span class='modula2-Symbol def-Symbol'>[</span>seg<span class='modula2-Symbol def-Symbol'>:</span>off bp<span class='modula2-Symbol def-Symbol'>]</span><span class='modula2-Symbol def-Symbol'>^</span> <span class='modula2-Symbol def-Symbol'>*</span> bs<span class='modula2-Symbol def-Symbol'>(</span><span class='modula2-Number def-Number'>3</span><span class='modula2-Symbol def-Symbol'><</span><span class='modula2-Symbol def-Symbol'><</span>x<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>></span><span class='modula2-Symbol def-Symbol'>></span> x<span class='modula2-Symbol def-Symbol'>;</span>
69: <span class='modula2-Symbol def-Symbol'>END</span> CGAPoint<span class='modula2-Symbol def-Symbol'>;</span>
70:
- 71: <span class='modula2-Keyword def-Keyword'>PROCEDURE</span> CGAHLine <span class='modula2-Symbol def-Symbol'>(</span> x<span class='modula2-Symbol def-Symbol'>,</span>y<span class='modula2-Symbol def-Symbol'>,</span>x2 <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span> c<span class='modula2-Symbol def-Symbol'>:</span><span class='modula2-Keyword def-Keyword'>CARDINAL</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 71: <span class='modula2-Keyword def-Keyword'>PROCEDURE</span> CGAHLine <span class='modula2-Symbol def-Symbol'>(</span> x<span class='modula2-Symbol def-Symbol'>,</span>y<span class='modula2-Symbol def-Symbol'>,</span>x2 <span class='modula2-Symbol def-Symbol'>:</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span> c<span class='modula2-Symbol def-Symbol'>:</span><span class='def-TypeKeyword def-Keyword'>CARDINAL</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
72: <span class='modula2-Keyword def-Keyword'>VAR</span>
- 73: off <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
- 74: seg <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
- 75: tmp <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
- 76: n <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 73: off <span class='modula2-Symbol def-Symbol'>:</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 74: seg <span class='modula2-Symbol def-Symbol'>:</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 75: tmp <span class='modula2-Symbol def-Symbol'>:</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 76: n <span class='modula2-Symbol def-Symbol'>:</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>;</span>
77: w <span class='modula2-Symbol def-Symbol'>:</span> bs<span class='modula2-Symbol def-Symbol'>;</span>
78: mask <span class='modula2-Symbol def-Symbol'>:</span> bs<span class='modula2-Symbol def-Symbol'>;</span>
79: fillc<span class='modula2-Symbol def-Symbol'>:</span> SHORTCARD<span class='modula2-Symbol def-Symbol'>;</span>
80: <span class='modula2-Symbol def-Symbol'>BEGIN</span>
81: <span class='modula2-Symbol def-Symbol'>IF</span> y <span class='modula2-Symbol def-Symbol'>></span> CGADepth<span class='modula2-Symbol def-Symbol'>-</span><span class='modula2-Number def-Number'>1</span> <span class='modula2-Keyword def-Keyword'>THEN</span> <span class='modula2-Keyword def-Keyword'>RETURN</span> <span class='modula2-Symbol def-Symbol'>END</span><span class='modula2-Symbol def-Symbol'>;</span>
- 82: <span class='modula2-Symbol def-Symbol'>IF</span> <span class='modula2-Keyword def-Keyword'>INTEGER</span><span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>>=</span> <span class='modula2-Keyword def-Keyword'>INTEGER</span><span class='modula2-Symbol def-Symbol'>(</span>CGAWidth<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Keyword def-Keyword'>THEN</span> <span class='modula2-Keyword def-Keyword'>RETURN</span> <span class='modula2-Symbol def-Symbol'>END</span><span class='modula2-Symbol def-Symbol'>;</span>
- 83: <span class='modula2-Symbol def-Symbol'>IF</span> <span class='modula2-Keyword def-Keyword'>INTEGER</span><span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'><</span> <span class='modula2-Number def-Number'>0</span> <span class='modula2-Keyword def-Keyword'>THEN</span> x <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Number def-Number'>0</span><span class='modula2-Symbol def-Symbol'>;</span> <span class='modula2-Symbol def-Symbol'>END</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 82: <span class='modula2-Symbol def-Symbol'>IF</span> <span class='def-TypeKeyword def-Keyword'>INTEGER</span><span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>>=</span> <span class='def-TypeKeyword def-Keyword'>INTEGER</span><span class='modula2-Symbol def-Symbol'>(</span>CGAWidth<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Keyword def-Keyword'>THEN</span> <span class='modula2-Keyword def-Keyword'>RETURN</span> <span class='modula2-Symbol def-Symbol'>END</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 83: <span class='modula2-Symbol def-Symbol'>IF</span> <span class='def-TypeKeyword def-Keyword'>INTEGER</span><span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'><</span> <span class='modula2-Number def-Number'>0</span> <span class='modula2-Keyword def-Keyword'>THEN</span> x <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Number def-Number'>0</span><span class='modula2-Symbol def-Symbol'>;</span> <span class='modula2-Symbol def-Symbol'>END</span><span class='modula2-Symbol def-Symbol'>;</span>
84: <span class='modula2-Symbol def-Symbol'>IF</span> x2 <span class='modula2-Symbol def-Symbol'>>=</span> CGAWidth <span class='modula2-Keyword def-Keyword'>THEN</span> x2 <span class='modula2-Symbol def-Symbol'>:=</span> CGAWidth<span class='modula2-Symbol def-Symbol'>-</span><span class='modula2-Number def-Number'>1</span> <span class='modula2-Symbol def-Symbol'>END</span><span class='modula2-Symbol def-Symbol'>;</span>
85:
86: n <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Symbol def-Symbol'>(</span> x2 <span class='modula2-Symbol def-Symbol'>-</span> x <span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>+</span> <span class='modula2-Number def-Number'>1</span><span class='modula2-Symbol def-Symbol'>;</span>
@@ -93,7 +93,7 @@
92: c <span class='modula2-Symbol def-Symbol'>:=</span> c <span class='modula2-Symbol def-Symbol'>+</span> c <span class='modula2-Symbol def-Symbol'>*</span> <span class='modula2-Number def-Number'>16</span><span class='modula2-Symbol def-Symbol'>;</span>
93: INC<span class='modula2-Symbol def-Symbol'>(</span> y<span class='modula2-Symbol def-Symbol'>,</span> y <span class='modula2-Symbol def-Symbol'><</span><span class='modula2-Symbol def-Symbol'><</span> <span class='modula2-Number def-Number'>2</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
94: INC<span class='modula2-Symbol def-Symbol'>(</span> off<span class='modula2-Symbol def-Symbol'>,</span> y <span class='modula2-Symbol def-Symbol'><</span><span class='modula2-Symbol def-Symbol'><</span> <span class='modula2-Number def-Number'>3</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
- 95: x <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Number def-Number'>3</span> <span class='modula2-Symbol def-Symbol'>-</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>(</span> BITSET<span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>*</span> BITSET<span class='modula2-Symbol def-Symbol'>(</span><span class='modula2-Number def-Number'>3</span><span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
+ 95: x <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Number def-Number'>3</span> <span class='modula2-Symbol def-Symbol'>-</span> <span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>(</span> <span class='def-TypeKeyword def-Keyword'>BITSET</span><span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>*</span> <span class='def-TypeKeyword def-Keyword'>BITSET</span><span class='modula2-Symbol def-Symbol'>(</span><span class='modula2-Number def-Number'>3</span><span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
96: x <span class='modula2-Symbol def-Symbol'>:=</span> x <span class='modula2-Symbol def-Symbol'><</span><span class='modula2-Symbol def-Symbol'><</span> <span class='modula2-Number def-Number'>1</span><span class='modula2-Symbol def-Symbol'>;</span>
97: tmp <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Number def-Number'>0B800H</span><span class='modula2-Symbol def-Symbol'>;</span> seg <span class='modula2-Symbol def-Symbol'>:=</span> tmp<span class='modula2-Symbol def-Symbol'>;</span>
98:
@@ -103,7 +103,7 @@
102: w <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Symbol def-Symbol'>(</span> w <span class='modula2-Symbol def-Symbol'>-</span> mask <span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Symbol def-Symbol'>+</span> bs<span class='modula2-Symbol def-Symbol'>(</span>c<span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>*</span>mask<span class='modula2-Symbol def-Symbol'>;</span>
103: DEC<span class='modula2-Symbol def-Symbol'>(</span>n<span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
104: DEC<span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>,</span><span class='modula2-Number def-Number'>2</span><span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
-105: <span class='modula2-Symbol def-Symbol'>UNTIL</span> <span class='modula2-Symbol def-Symbol'>(</span>n<span class='modula2-Symbol def-Symbol'>=</span><span class='modula2-Number def-Number'>0</span><span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Keyword def-Keyword'>OR</span> <span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>=</span><span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>(</span><span class='modula2-Symbol def-Symbol'>-</span><span class='modula2-Number def-Number'>2</span><span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
+105: <span class='modula2-Symbol def-Symbol'>UNTIL</span> <span class='modula2-Symbol def-Symbol'>(</span>n<span class='modula2-Symbol def-Symbol'>=</span><span class='modula2-Number def-Number'>0</span><span class='modula2-Symbol def-Symbol'>)</span> <span class='modula2-Keyword def-Keyword'>OR</span> <span class='modula2-Symbol def-Symbol'>(</span>x<span class='modula2-Symbol def-Symbol'>=</span><span class='def-TypeKeyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>(</span><span class='modula2-Symbol def-Symbol'>-</span><span class='modula2-Number def-Number'>2</span><span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
106: <span class='modula2-Symbol def-Symbol'>[</span>seg<span class='modula2-Symbol def-Symbol'>:</span>off bp<span class='modula2-Symbol def-Symbol'>]</span><span class='modula2-Symbol def-Symbol'>^</span> <span class='modula2-Symbol def-Symbol'>:=</span> w<span class='modula2-Symbol def-Symbol'>;</span>
107:
108: INC<span class='modula2-Symbol def-Symbol'>(</span>off<span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
@@ -133,41 +133,41 @@
132: HLine <span class='modula2-Symbol def-Symbol'>:=</span> CGAHLine <span class='modula2-Symbol def-Symbol'>;</span>
133: <span class='modula2-Symbol def-Symbol'>END</span> InitCGA <span class='modula2-Symbol def-Symbol'>;</span>
134:
-135: <span class='def-Comment def-Syntax'>(* == EGA/VGA specific routines == *)</span>
+135: <span class='modula2-Comment def-Comment def-Syntax'>(* == EGA/VGA specific routines == *)</span>
136:
-137: <span class='modula2-Keyword def-Keyword'>PROCEDURE</span> EGAGraphMode<span class='modula2-Symbol def-Symbol'>;</span> <span class='def-Comment def-Syntax'>(* Also VGA *)</span>
-138: <span class='modula2-Keyword def-Keyword'>VAR</span> r <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>SYSTEM</span><span class='modula2-Number def-Number'>.</span>Registers<span class='modula2-Symbol def-Symbol'>;</span>
+137: <span class='modula2-Keyword def-Keyword'>PROCEDURE</span> EGAGraphMode<span class='modula2-Symbol def-Symbol'>;</span> <span class='modula2-Comment def-Comment def-Syntax'>(* Also VGA *)</span>
+138: <span class='modula2-Keyword def-Keyword'>VAR</span> r <span class='modula2-Symbol def-Symbol'>:</span> <span class='def-InterfaceKeyword def-Keyword'>SYSTEM</span><span class='modula2-Number def-Number'>.</span>Registers<span class='modula2-Symbol def-Symbol'>;</span>
139: <span class='modula2-Symbol def-Symbol'>BEGIN</span>
140: <span class='modula2-Symbol def-Symbol'>IF</span> Depth<span class='modula2-Symbol def-Symbol'>=</span><span class='modula2-Number def-Number'>480</span> <span class='modula2-Keyword def-Keyword'>THEN</span> r<span class='modula2-Number def-Number'>.</span>AX <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Number def-Number'>12H</span> <span class='modula2-Keyword def-Keyword'>ELSE</span> r<span class='modula2-Number def-Number'>.</span>AX <span class='modula2-Symbol def-Symbol'>:=</span> <span class='modula2-Number def-Number'>10H</span> <span class='modula2-Symbol def-Symbol'>END</span> <span class='modula2-Symbol def-Symbol'>;</span>
141: Lib<span class='modula2-Number def-Number'>.</span>Intr<span class='modula2-Symbol def-Symbol'>(</span> r<span class='modula2-Symbol def-Symbol'>,</span><span class='modula2-Number def-Number'>10H</span> <span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span>
142: <span class='modula2-Symbol def-Symbol'>END</span> EGAGraphMode<span class='modula2-Symbol def-Symbol'>;</span>
143:
144:
-145: <span class='modula2-Keyword def-Keyword'>PROCEDURE</span> EGAPlot<span class='modula2-Symbol def-Symbol'>(</span> x<span class='modula2-Symbol def-Symbol'>,</span>y<span class='modula2-Symbol def-Symbol'>,</span>c <span class='modula2-Symbol def-Symbol'>:</span> <span class='modula2-Keyword def-Keyword'>CARDINAL</span><span class='modula2-Symbol def-Symbol'>)</span><span class='modula2-Symbol def-Symbol'>;</span> <span class='def-Comment def-Syntax'>(* Also VGA *)</span>
+145: <span class='modula2-K...
[truncated message content] |
