mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-09 22:29:21 +02:00
Merged revisions 2283 via svnmerge from
http://svn.freepascal.org/svn/fpc/trunk r2283 (florian) + >< support for fpdoc from Vincent Snijders git-svn-id: branches/fixes_2_0@2284 -
This commit is contained in:
parent
51cc613711
commit
919eb5fa4a
@ -40,30 +40,31 @@ type
|
||||
tkNumber,
|
||||
tkChar,
|
||||
// Simple (one-character) tokens
|
||||
tkBraceOpen, // '('
|
||||
tkBraceClose, // ')'
|
||||
tkMul, // '*'
|
||||
tkPlus, // '+'
|
||||
tkComma, // ','
|
||||
tkMinus, // '-'
|
||||
tkDot, // '.'
|
||||
tkDivision, // '/'
|
||||
tkColon, // ':'
|
||||
tkSemicolon, // ';'
|
||||
tkLessThan, // '<'
|
||||
tkEqual, // '='
|
||||
tkGreaterThan, // '>'
|
||||
tkAt, // '@'
|
||||
tkSquaredBraceOpen, // '['
|
||||
tkSquaredBraceClose,// ']'
|
||||
tkCaret, // '^'
|
||||
tkBraceOpen, // '('
|
||||
tkBraceClose, // ')'
|
||||
tkMul, // '*'
|
||||
tkPlus, // '+'
|
||||
tkComma, // ','
|
||||
tkMinus, // '-'
|
||||
tkDot, // '.'
|
||||
tkDivision, // '/'
|
||||
tkColon, // ':'
|
||||
tkSemicolon, // ';'
|
||||
tkLessThan, // '<'
|
||||
tkEqual, // '='
|
||||
tkGreaterThan, // '>'
|
||||
tkAt, // '@'
|
||||
tkSquaredBraceOpen, // '['
|
||||
tkSquaredBraceClose, // ']'
|
||||
tkCaret, // '^'
|
||||
// Two-character tokens
|
||||
tkDotDot, // '..'
|
||||
tkAssign, // ':='
|
||||
tkNotEqual, // '<>'
|
||||
tkLessEqualThan, // '<='
|
||||
tkGreaterEqualThan, // '>='
|
||||
tkPower, // '**'
|
||||
tkDotDot, // '..'
|
||||
tkAssign, // ':='
|
||||
tkNotEqual, // '<>'
|
||||
tkLessEqualThan, // '<='
|
||||
tkGreaterEqualThan, // '>='
|
||||
tkPower, // '**'
|
||||
tkSymmetricalDifference, // '><'
|
||||
// Reserved words
|
||||
tkabsolute,
|
||||
tkand,
|
||||
@ -248,6 +249,7 @@ const
|
||||
'<=',
|
||||
'>=',
|
||||
'**',
|
||||
'><',
|
||||
// Reserved words
|
||||
'absolute',
|
||||
'and',
|
||||
@ -796,6 +798,10 @@ begin
|
||||
begin
|
||||
Inc(TokenStr);
|
||||
Result := tkGreaterEqualThan;
|
||||
end else if TokenStr[0] = '<' then
|
||||
begin
|
||||
Inc(TokenStr);
|
||||
Result := tkSymmetricalDifference;
|
||||
end else
|
||||
Result := tkGreaterThan;
|
||||
end;
|
||||
|
@ -339,7 +339,9 @@ begin
|
||||
else if s = '>' then
|
||||
s := 'greater'
|
||||
else if s = '>=' then
|
||||
s := 'greaterthan';
|
||||
s := 'greaterthan'
|
||||
else if s = '><' then
|
||||
s := 'symmetricdifference';
|
||||
Result := Result + s + '-';
|
||||
s := '';
|
||||
i := 1;
|
||||
|
Loading…
Reference in New Issue
Block a user