paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 22:49:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-res: support octal numbers

Browse Source 
Reintegrate fpcres-rc branch by Martok

git-svn-id: trunk@46382 -
This commit is contained in:
svenbarth 2020-08-12 19:05:44 +00:00
parent b88adc8e64
commit 3a65c1912b
3 changed files with 544 additions and 503 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1043
packages/fcl-res/src/rclex.inc
View File

File diff suppressed because it is too large Load Diff

2
packages/fcl-res/src/rclex.l
View File

@ -59,6 +59,7 @@ end;
%} %}
%x INCOMLINE INCOMMENT INSTRING INSTRINGL %x INCOMLINE INCOMMENT INSTRING INSTRINGL
O [0-7]
D [0-9] D [0-9]
H [0-9a-fA-F] H [0-9a-fA-F]
IDENT [a-zA-Z_]([a-zA-Z0-9_])* IDENT [a-zA-Z_]([a-zA-Z0-9_])*
@ -76,6 +77,7 @@ IDENT [a-zA-Z_]([a-zA-Z0-9_])*
{D}+L? return(_NUMBER); {D}+L? return(_NUMBER);
0x{H}+L? return(_NUMBER); 0x{H}+L? return(_NUMBER);
0o{O}+L? return(_NUMBER);
L\" begin start(INSTRINGL); strbuf_begin(); end; L\" begin start(INSTRINGL); strbuf_begin(); end;
\" begin start(INSTRING); strbuf_begin(); end; \" begin start(INSTRING); strbuf_begin(); end;
<INSTRING,INSTRINGL>\"\" strbuf_append('"'); <INSTRING,INSTRINGL>\"\" strbuf_append('"');

2
packages/fcl-res/src/rcparserfn.inc
View File

@ -120,6 +120,8 @@ begin
Exit(0); Exit(0);
if Copy(s, 1, 2) = '0x' then if Copy(s, 1, 2) = '0x' then
Exit(StrToInt('$' + Copy(s, 3, Maxint))); Exit(StrToInt('$' + Copy(s, 3, Maxint)));
if Copy(s, 1, 2) = '0o' then
Exit(StrToInt('&' + Copy(s, 3, Maxint)));
if Copy(s, 1, 1) = '0' then if Copy(s, 1, 1) = '0' then
Exit(StrToInt('&' + Copy(s, 2, Maxint))); Exit(StrToInt('&' + Copy(s, 2, Maxint)));
Result:= StrToInt(s); Result:= StrToInt(s);