paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-20 19:09:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

o update by Michael Denisenko for case <string> of

Browse Source 
* memory management fixed
  * idention fixed

git-svn-id: trunk@13712 -
This commit is contained in:
florian 2009-09-14 21:44:11 +00:00
parent da7fdf76d5
commit 02eeb3dad6
2 changed files with 58 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/ncon.pas
View File

@ -277,7 +277,11 @@ implementation
if is_wide then
begin
if (tstringconstnode(p).cst_type in [cst_widestring, cst_unicodestring]) then
get_string_value := tstringconstnode(p).value_str
begin
initwidestring(pWideStringVal);
copywidestring(pcompilerwidestring(tstringconstnode(p).value_str), pWideStringVal);
get_string_value := TConstString(pWideStringVal);
end
else
{ if string must be wide, but actually was parsed as usual }
begin
@ -297,7 +301,12 @@ implementation
get_string_value := pCharVal;
end
else
get_string_value := tstringconstnode(p).value_str;
begin
getmem(pCharVal, tstringconstnode(p).len + 1);
strcopy(pCharVal, tstringconstnode(p).value_str);
pCharVal[tstringconstnode(p).len] := #0;
get_string_value := pCharVal;
end;
end;
end;
end

6
compiler/pstatmnt.pas
View File

@ -231,11 +231,13 @@ implementation
((not caseofstring) and (not is_subequal(casedef, p.resultdef))) then
CGMessage(parser_e_case_mismatch);
if caseofstring then begin
if caseofstring then
begin
sl1:=get_string_value(p, is_wide_or_unicode_string(casedef));
casenode.addlabel(blockid,sl1,sl1,st2cst[tstringdef(casedef).stringtype]);
end
else begin
else
begin
hl1:=get_ordinal_value(p);
if not casedeferror then
testrange(casedef,hl1,false);