Index: lib/src/prism/components/prism-pascal.js |
diff --git a/lib/src/prism/components/prism-pascal.js b/lib/src/prism/components/prism-pascal.js |
index 47164fe8252af70567062bd2df8b88ffd8a86200..90e01347e7dad667330e7013ca139c64e6a1ccb4 100644 |
--- a/lib/src/prism/components/prism-pascal.js |
+++ b/lib/src/prism/components/prism-pascal.js |
@@ -10,30 +10,26 @@ Prism.languages.pascal = { |
/\{[\s\S]+?\}/, |
/\/\/.*/ |
], |
- 'string': [ |
- /(?:'(?:''|[^'\n])*'|#[&$%]?[a-f\d]+)+/i, |
- // Char |
- /\^[a-z]/i |
- ], |
+ 'string': /(?:'(?:''|[^'\r\n])*'|#[&$%]?[a-f\d]+)+|\^[a-z]/i, |
'keyword': [ |
{ |
// Turbo Pascal |
- pattern: /(^|(?!&)[\s\S])\b(?:absolute|array|asm|begin|case|const|constructor|destructor|do|downto|else|end|file|for|function|goto|if|implementation|inherited|inline|interface|label|nil|object|of|operator|packed|procedure|program|record|reintroduce|repeat|self|set|string|then|to|type|unit|until|uses|var|while|with)\b/i, |
+ pattern: /(^|[^&])\b(?:absolute|array|asm|begin|case|const|constructor|destructor|do|downto|else|end|file|for|function|goto|if|implementation|inherited|inline|interface|label|nil|object|of|operator|packed|procedure|program|record|reintroduce|repeat|self|set|string|then|to|type|unit|until|uses|var|while|with)\b/i, |
lookbehind: true |
}, |
{ |
// Free Pascal |
- pattern: /(^|(?!&)[\s\S])\b(?:dispose|exit|false|new|true)\b/i, |
+ pattern: /(^|[^&])\b(?:dispose|exit|false|new|true)\b/i, |
lookbehind: true |
}, |
{ |
// Object Pascal |
- pattern: /(^|(?!&)[\s\S])\b(?:class|dispinterface|except|exports|finalization|finally|initialization|inline|library|on|out|packed|property|raise|resourcestring|threadvar|try)\b/i, |
+ pattern: /(^|[^&])\b(?:class|dispinterface|except|exports|finalization|finally|initialization|inline|library|on|out|packed|property|raise|resourcestring|threadvar|try)\b/i, |
lookbehind: true |
}, |
{ |
// Modifiers |
- pattern: /(^|(?!&)[\s\S])\b(?:absolute|abstract|alias|assembler|bitpacked|break|cdecl|continue|cppdecl|cvar|default|deprecated|dynamic|enumerator|experimental|export|external|far|far16|forward|generic|helper|implements|index|interrupt|iochecks|local|message|name|near|nodefault|noreturn|nostackframe|oldfpccall|otherwise|overload|override|pascal|platform|private|protected|public|published|read|register|reintroduce|result|safecall|saveregisters|softfloat|specialize|static|stdcall|stored|strict|unaligned|unimplemented|varargs|virtual|write)\b/i, |
+ pattern: /(^|[^&])\b(?:absolute|abstract|alias|assembler|bitpacked|break|cdecl|continue|cppdecl|cvar|default|deprecated|dynamic|enumerator|experimental|export|external|far|far16|forward|generic|helper|implements|index|interrupt|iochecks|local|message|name|near|nodefault|noreturn|nostackframe|oldfpccall|otherwise|overload|override|pascal|platform|private|protected|public|published|read|register|reintroduce|result|safecall|saveregisters|softfloat|specialize|static|stdcall|stored|strict|unaligned|unimplemented|varargs|virtual|write)\b/i, |
lookbehind: true |
} |
], |
@@ -44,9 +40,9 @@ Prism.languages.pascal = { |
/([+-]|\b)\d+(?:\.\d+)?(?:e[+-]?\d+)?/i |
], |
'operator': [ |
- /\.\.|\*\*|:=|[<>]{2}|[<>+\-*\/]=?|[@^=]/i, |
+ /\.\.|\*\*|:=|<[<=>]?|>[>=]?|[+\-*\/]=?|[@^=]/i, |
{ |
- pattern: /(^|(?!&)[\s\S])\b(?:and|as|div|exclude|in|include|is|mod|not|or|shl|shr|xor)\b/, |
+ pattern: /(^|[^&])\b(?:and|as|div|exclude|in|include|is|mod|not|or|shl|shr|xor)\b/, |
lookbehind: true |
} |
], |