paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-28 22:20:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

FpDebug: fix constant char 'a' as array index. Amend Precedence for [n..m]

Browse Source
This commit is contained in:
Martin 2023-06-18 16:03:12 +02:00
parent a839afef06
commit aa389e7e47
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/fpdebug/fppascalparser.pas
View File

@ -620,9 +620,9 @@ const
PRECEDENCE_BIT_SHIFT = 12; // << >> shr shr PRECEDENCE_BIT_SHIFT = 12; // << >> shr shr
PRECEDENCE_PLUS_MINUS = 13; // a + b PRECEDENCE_PLUS_MINUS = 13; // a + b
PRECEDENCE_OR = 13; // a OR b // XOR PRECEDENCE_OR = 13; // a OR b // XOR
PRECEDENCE_ARRAY_SLICE= 18; // array[5..9] // array slice
PRECEDENCE_IN = 19; // enum IN set // officially the same as PRECEDENCE_COMPARE PRECEDENCE_IN = 19; // enum IN set // officially the same as PRECEDENCE_COMPARE
PRECEDENCE_COMPARE = 20; // a <> b // a=b PRECEDENCE_COMPARE = 20; // a <> b // a=b
PRECEDENCE_ARRAY_SLICE= 30; // array[5..9] // array slice
type type
@ -2595,8 +2595,10 @@ end;
function TFpPascalExpressionPartConstantText.DoGetResultValue: TFpValue; function TFpPascalExpressionPartConstantText.DoGetResultValue: TFpValue;
begin begin
//s := GetText; if Length(FValue) = 1 then
Result := TFpValueConstString.Create(FValue); Result := TFpValueConstChar.Create(FValue[1])
else
Result := TFpValueConstString.Create(FValue);
{$IFDEF WITH_REFCOUNT_DEBUG}Result.DbgRenameReference(nil, 'DoGetResultValue'){$ENDIF}; {$IFDEF WITH_REFCOUNT_DEBUG}Result.DbgRenameReference(nil, 'DoGetResultValue'){$ENDIF};
end; end;
@ -2978,7 +2980,6 @@ var
end; end;
if not FValid then if not FValid then
exit; exit;
// If Length(str) = 1 then // char
AddPart(TFpPascalExpressionPartConstantText); AddPart(TFpPascalExpressionPartConstantText);
TFpPascalExpressionPartConstantText(NewPart).FValue := str; TFpPascalExpressionPartConstantText(NewPart).FValue := str;
end; end;

6
components/lazdebuggers/lazdebuggerfp/test/testwatches.pas
View File

@ -3461,12 +3461,12 @@ begin
t.Add('Const-Expr: ansistring ', '''abc''''DE''', weAnsiStr('abcDE')).IgnKind; t.Add('Const-Expr: ansistring ', '''abc''''DE''', weAnsiStr('abcDE')).IgnKind;
t.Add('Const-Expr: ansistring ', '''abc''#32''DE''', weAnsiStr('abc DE')).IgnKind; t.Add('Const-Expr: ansistring ', '''abc''#32''DE''', weAnsiStr('abc DE')).IgnKind;
t.Add('Const-Expr: ansistring ', '#32''abc''', weAnsiStr(' abc')).IgnKind; t.Add('Const-Expr: ansistring ', '#32''abc''', weAnsiStr(' abc')).IgnKind;
t.Add('Const-Expr: ansistring ', '#49', weAnsiStr('1')).IgnKind;
t.Add('Const-Expr: ansistring ', '#49#50', weAnsiStr('12')).IgnKind; t.Add('Const-Expr: ansistring ', '#49#50', weAnsiStr('12')).IgnKind;
t.Add('Const-Expr: ansistring ', '#$30#$31', weAnsiStr('01')).IgnKind; t.Add('Const-Expr: ansistring ', '#$30#$31', weAnsiStr('01')).IgnKind;
t.Add('Const-Expr: ansistring ', '#&61#&62', weAnsiStr('12')).IgnKind; t.Add('Const-Expr: ansistring ', '#&61#&62', weAnsiStr('12')).IgnKind;
t.Add('Const-Expr: ansistring ', '#%110001', weAnsiStr('1')).IgnKind; t.Add('Const-Expr: ansistring ', '#49', weChar('1')).IgnKind;
t.Add('Const-Expr: ansistring ', '#%00110001', weAnsiStr('1')).IgnKind; t.Add('Const-Expr: ansistring ', '#%110001', weChar('1')).IgnKind;
t.Add('Const-Expr: ansistring ', '#%00110001', weChar('1')).IgnKind;
t.Add('Const-Expr: ansistring ', '''a', weAnsiStr('1')).IgnKind^.AddFlag(ehExpectError); t.Add('Const-Expr: ansistring ', '''a', weAnsiStr('1')).IgnKind^.AddFlag(ehExpectError);
t.Add('Const-Expr: ansistring ', '''', weAnsiStr('1')).IgnKind^.AddFlag(ehExpectError); t.Add('Const-Expr: ansistring ', '''', weAnsiStr('1')).IgnKind^.AddFlag(ehExpectError);