Update of /cvsroot/geshi/geshi-src/geshi/languages/delphi
In directory
sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21666/geshi/languag
es/delphi
Modified Files:
delphi.php common.php asm.php
Log Message:
Use the bug #73 features for delphi language.
Index: asm.php
============================================================
=======
RCS file:
/cvsroot/geshi/geshi-src/geshi/languages/delphi/asm.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** asm.php 14 May 2006 01:30:18 -0000 1.2
--- asm.php 14 May 2006 09:21:48 -0000 1.3
***************
*** 41,47 ****
$context->setComplexFlag(GESHI_COMPLEX_TOKENISE);
! $context->addChild('delphi/delphi/preprocessor',
'code');
!
$context->addChild('delphi/delphi/single_comment');
!
$context->addChild('delphi/delphi/multi_comment');
//Assembler Directives
--- 41,47 ----
$context->setComplexFlag(GESHI_COMPLEX_TOKENISE);
! $context->addChild('delphi/delphi/preprocessor',
'code', 'preprocessor');
!
$context->addChild('delphi/delphi/single_comment',
'', 'single_comment');
! $context->addChild('delphi/delphi/multi_comment',
'', 'multi_comment');
//Assembler Directives
Index: delphi.php
============================================================
=======
RCS file:
/cvsroot/geshi/geshi-src/geshi/languages/delphi/delphi.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** delphi.php 14 May 2006 01:30:17 -0000 1.11
--- delphi.php 14 May 2006 09:21:48 -0000 1.12
***************
*** 138,144 ****
geshi_delphi_common($context);
! $context->addChild('preprocessor', 'code');
! // Commented out: ASM is now a child language of its
own
! //$context->addChild('asm', 'code');
$context->addChild('extern', 'code'); // NOTE:
to be aliased as delphi/delphi
$context->addChild('property', 'code');
--- 138,142 ----
geshi_delphi_common($context);
! $context->addChild('preprocessor', 'code',
'preprocessor');
$context->addChild('extern', 'code'); // NOTE:
to be aliased as delphi/delphi
$context->addChild('property', 'code');
***************
*** 343,361 ****
//$this->_styler->useThemes('boride');
! function geshi_delphi_delphi_single_string(&$context)
! {
! geshi_delphi_single_string($context);
! }
!
! function geshi_delphi_delphi_single_comment(&$context)
! {
! geshi_delphi_single_comment($context);
! }
!
! function geshi_delphi_delphi_multi_comment(&$context)
! {
! geshi_delphi_multi_comment($context);
! }
!
function geshi_delphi_delphi_preprocessor(&$context)
{
--- 341,345 ----
//$this->_styler->useThemes('boride');
! /*
function geshi_delphi_delphi_preprocessor(&$context)
{
***************
*** 367,370 ****
--- 351,355 ----
geshi_delphi_single_string($context);
}
+ */
function geshi_delphi_delphi_extern (&$context)
***************
*** 373,380 ****
$context->addDelimiters('REGEX#(^|(?=\b))external((?=\
b)|$)#im', ';');
! $context->addChild('delphi/delphi/preprocessor',
'code');
!
$context->addChild('delphi/delphi/multi_comment');
!
$context->addChild('delphi/delphi/single_comment');
! $context->addChild('delphi/delphi/single_string',
'string');
$context->addChild('delphi/delphi/exports_brackets',
'code');
--- 358,365 ----
$context->addDelimiters('REGEX#(^|(?=\b))external((?=\
b)|$)#im', ';');
! $context->addChild('delphi/delphi/preprocessor',
'code', 'preprocessor');
! $context->addChild('delphi/delphi/multi_comment',
'', 'multi_comment');
!
$context->addChild('delphi/delphi/single_comment',
'', 'single_comment');
! $context->addChild('delphi/delphi/single_string',
'string', 'single_string');
$context->addChild('delphi/delphi/exports_brackets',
'code');
***************
*** 416,422 ****
$context->addDelimiters('(', ')');
! $context->addChild('delphi/delphi/preprocessor',
'code');
!
$context->addChild('delphi/delphi/single_comment');
!
$context->addChild('delphi/delphi/multi_comment');
//$this->_startName = 'brksym'; // highlight
starter as if it was a brksym
--- 401,407 ----
$context->addDelimiters('(', ')');
! $context->addChild('delphi/delphi/preprocessor',
'code', 'preprocessor');
!
$context->addChild('delphi/delphi/single_comment',
'', 'single_comment');
! $context->addChild('delphi/delphi/multi_comment',
'', 'multi_comment');
//$this->_startName = 'brksym'; // highlight
starter as if it was a brksym
***************
*** 458,464 ****
$context->addDelimiters('property', ';');
! $context->addChild('delphi/delphi/preprocessor',
'code');
!
$context->addChild('delphi/delphi/single_comment');
!
$context->addChild('delphi/delphi/multi_comment');
$context->addChild('property_index', 'code');
--- 443,449 ----
$context->addDelimiters('property', ';');
! $context->addChild('delphi/delphi/preprocessor',
'code', 'preprocessor');
!
$context->addChild('delphi/delphi/single_comment',
'', 'single_comment');
! $context->addChild('delphi/delphi/multi_comment',
'', 'multi_comment');
$context->addChild('property_index', 'code');
***************
*** 499,505 ****
$context->addDelimiters('[', ']');
! $context->addChild('delphi/delphi/preprocessor',
'code');
!
$context->addChild('delphi/delphi/single_comment');
!
$context->addChild('delphi/delphi/multi_comment');
//$this->_startName = 'brksym'; // highlight
starter as if it was a keyword
--- 484,490 ----
$context->addDelimiters('[', ']');
! $context->addChild('delphi/delphi/preprocessor',
'code', 'preprocessor');
!
$context->addChild('delphi/delphi/single_comment',
'', 'single_comment');
! $context->addChild('delphi/delphi/multi_comment',
'', 'multi_comment');
//$this->_startName = 'brksym'; // highlight
starter as if it was a keyword
Index: common.php
============================================================
=======
RCS file:
/cvsroot/geshi/geshi-src/geshi/languages/delphi/common.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** common.php 14 May 2006 02:18:34 -0000 1.3
--- common.php 14 May 2006 09:21:48 -0000 1.4
***************
*** 38,44 ****
function geshi_delphi_common(&$context)
{
! $context->addChild('single_comment');
! $context->addChild('multi_comment');
! $context->addChild('single_string', 'string');
}
--- 38,44 ----
function geshi_delphi_common(&$context)
{
! $context->addChild('single_comment', '',
'single_comment');
! $context->addChild('multi_comment', '',
'multi_comment');
! $context->addChild('single_string', 'string',
'single_string');
}
***************
*** 124,128 ****
$context->useStandardIntegers();
! $context->addChild('single_string', 'string');
$context->addKeywordGroup(array(
--- 124,128 ----
$context->useStandardIntegers();
! $context->addChild('single_string', 'string',
'single_string');
$context->addKeywordGroup(array(
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web
services, security?
Get stuff done quickly with pre-integrated technology to
make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on
Apache Geronimo
http://sel.as-us.falkag.net/
sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
geshi-cvs mailing list
geshi-cvs lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geshi-cvs
|