paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-02 05:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

DBG improved expression parsing, array[1]+array[2]

Browse Source 
git-svn-id: trunk@36200 -
This commit is contained in:
martin 2012-03-21 23:11:01 +00:00
parent d79ff1435a
commit cfae3de029
3 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
debugger/gdbtypeinfo.pp
View File

@ -1085,7 +1085,7 @@ begin
if AIdx < 0 then exit;
for i := 0 to AIdx do begin
IdxPart := IndexPart[i];
IdxPart := TGDBExpressionPartArrayIdx(Parts[i + 1]);
PTResult := IdxPart.ArrayPTypeResult;
if PCastCnt > 0 then dec(PCastCnt);
@ -1361,7 +1361,7 @@ const
// include "." (dots). currently there is no need to break expressions like "foo.bar"
// Include "^" (deref)
// do NOT include "@", it is applied after []() resolution
WordChar = [' ', #9, 'a'..'z', 'A'..'Z', '0'..'9', '_', '.', '^'];
WordChar = ['a'..'z', 'A'..'Z', '0'..'9', '_', '#', '$', '%', '&', '^', '.'];
var
CurPtr, EndPtr: PChar;
CurPartPtr: PChar;
@ -1372,11 +1372,26 @@ var
end;
procedure ScanToWordEnd;
var
c: Char;
f: Boolean;
begin
// include "." (dots). currently there is no need to break expressions like "foo.bar"
// Include "^" (deref)
while (CurPtr < EndPtr) and (CurPtr^ in WordChar)
do inc(CurPtr);
while (CurPtr < EndPtr) do begin
c := CurPtr^;
if (c in WordChar) then begin
inc(CurPtr);
end
else if (c in [' ', #9]) then begin
f := ((CurPtr-1)^ in ['.', '^']);
SkipSpaces;
if not(f or ((CurPtr < EndPtr) and (CurPtr^ in ['.', '^'])) ) then
break;
end
else
break;
end;
end;
procedure ScanToWordStart;
@ -1480,7 +1495,6 @@ begin
if CurPtr = EndPtr then exit; // no fixup needed
CurPtr := AText;
CurArray := nil;
CurList:= TGDBExpressionPartList.Create;
while CurPtr < EndPtr do begin
@ -1497,16 +1511,15 @@ begin
else
if CurPtr^ in WordChar
then begin
if CurArray <> nil then CurArray.NeedTypeCast := True;
CurArray := nil;
CurPartPtr := CurPtr;
ScanToWordEnd;
CurList.Add(TGDBExpression.CreateSimple(CurPartPtr, CurPtr - CurPartPtr));
if CurPtr^ in WordChar then // 2 words => named operator (and/or)
AddExpPart(CurList);
end
else
if (CurList.PartCount > 0) and (CurPtr^ = '[')
then begin
if CurArray <> nil then CurArray.NeedTypeCast := True;
CurArray := TGDBExpressionPartArray.Create(MoveListToCopy(CurList));
CurList.Add(CurArray);
while (CurPtr^ = '[') do begin
@ -1515,12 +1528,12 @@ begin
CurArray.AddIndex(TGDBExpressionPartArrayIdx.Create(CurPartPtr, CurPtr - CurPartPtr));
SkipSpaces;
end;
if (CurPtr < EndPtr ) and (CurPtr^ in ['.', '^', '(']) then
CurArray.NeedTypeCast := True;
end
else
if (CurList.PartCount > 0) and (CurPtr^ = '(')
then begin
if CurArray <> nil then CurArray.NeedTypeCast := True;
CurArray := nil;
CurCast := TGDBExpressionPartCastCall.Create(MoveListToCopy(CurList));
CurList.Add(CurCast);
CurPartPtr := CurPtr;
@ -1528,7 +1541,6 @@ begin
CurCast.AddBrackets(TGDBExpressionPartBracketed.Create(CurPartPtr, CurPtr - CurPartPtr));
end
else begin
CurArray := nil;
CurPartPtr := CurPtr;
ScanToWordStart;
CurList.Add(TGDBExpression.CreateSimple(CurPartPtr, CurPtr - CurPartPtr));

15
debugger/test/Gdbmi/testgdbtype.pas
View File

@ -611,13 +611,13 @@ procedure TTestGdbType.TestExpressionBreaker;
FreeAndNil(b);
r := nil;
b := TGDBExpression.Create(e);
v := b.NeedValidation(r);
debugln('##### '+e);
DumpGExp(b);
AssertEquals(e+' as text', e, b.Text);
v := b.NeedValidation(r);
if r <> nil then DumpReq(r);
debugln;
AssertEquals(e+' as text', e, b.Text);
end;
procedure ContinueExpr(b: TGDBExpression; out r: PGDBPTypeRequest; out v: Boolean);
begin
@ -797,6 +797,17 @@ begin
n := 'Cast(foo^.bar[1][foo[2]]+Call[x()]((f+1)^))+bar(1).z.x[1](m)(n)';
InitExpr(n, b, r, v);
n := 'abc[1,2,3].x[1]';
InitExpr(n, b, r, v);
n := 'abc[1,2,3].x and abc[1,2][3].y';
InitExpr(n, b, r, v);
n := '1+abc[1,2,3].x and b . cc [ 1 , 2 or x ]';
InitExpr(n, b, r, v);
b.Free;
end;

11
debugger/test/Gdbmi/testwatches.pas
View File

@ -1309,10 +1309,13 @@ begin
//TDynStatArrayPRec2 = array of array [3..5] of ^TRecForArray2;
(* Array in expression*)
//Add(v+'ArgTDynArrayTRec1[0].a+'+v+'ArgTDynArrayTRec1[1].a', wdfDefault, '^181$', skSimple, M_Int, [fTpMtch] );
//Add(v+'ArgTDynArrayTRec1[0].a+'+'ArgTDynArrayTRec1[1].a', wdfDefault, '^181$', skSimple, M_Int, [fTpMtch] );
//Add('ArgTDynArrayTRec1[0].a+'+v+'ArgTDynArrayTRec1[1].a', wdfDefault, '^181$', skSimple, M_Int, [fTpMtch] );
//Add(v+'ArgTDynArrayTRec1[0].a+'+v+'ArgTDynArrayTRec1[1].a', wdfDefault, '^181$', skSimple, M_Int, [fTpMtch] );
Add(v+'ArgTDynArrayTRec1[0].a+'+v+'ArgTDynArrayTRec1[1].a', wdfDefault, '^181$', skSimple, M_Int+'|long', [fTpMtch] );
Add(v+'ArgTDynArrayTRec1[0].a+'+'ArgTDynArrayTRec1[1].a', wdfDefault, '^181$', skSimple, M_Int+'|long', [fTpMtch] );
Add('ArgTDynArrayTRec1[0].a+'+v+'ArgTDynArrayTRec1[1].a', wdfDefault, '^181$', skSimple, M_Int+'|long', [fTpMtch] );
Add(v+'ArgTDynArrayTRec1[0].a and '+v+'ArgTDynArrayTRec1[1].a', wdfDefault, '^90$', skSimple, M_Int+'|long', [fTpMtch] );
Add(v+'ArgTDynDynArrayTRec1[1][1].a+'+v+'ArgTDynArrayPRec1[1]^.a', wdfDefault, '^177$', skSimple, M_Int+'|long', [fTpMtch] );
Add(v+'ArgTDynArrayPRec1[1]^.a+'+v+'ArgTDynDynArrayTRec1[1][1].a', wdfDefault, '^177$', skSimple, M_Int+'|long', [fTpMtch] );
{%endregion DYN ARRAY (norm)}