|
@@ -6832,20 +6832,22 @@ function TPas2JSResolver.IsTGUID(TypeEl: TPasRecordType): boolean;
|
|
|
var
|
|
|
Members: TFPList;
|
|
|
El: TPasElement;
|
|
|
+ MemberIndex, i: Integer;
|
|
|
begin
|
|
|
Result:=false;
|
|
|
if not SameText(TypeEl.Name,'TGUID') then exit;
|
|
|
Members:=TypeEl.Members;
|
|
|
- if Members.Count<4 then exit;
|
|
|
- El:=TPasElement(Members[0]);
|
|
|
- if not SameText(El.Name,'D1') then exit;
|
|
|
- El:=TPasElement(Members[1]);
|
|
|
- if not SameText(El.Name,'D2') then exit;
|
|
|
- El:=TPasElement(Members[2]);
|
|
|
- if not SameText(El.Name,'D3') then exit;
|
|
|
- El:=TPasElement(Members[3]);
|
|
|
- if not SameText(El.Name,'D4') then exit;
|
|
|
- Result:=true;
|
|
|
+ i:=1;
|
|
|
+ for MemberIndex:=0 to Members.Count-1 do
|
|
|
+ begin
|
|
|
+ El:=TPasElement(Members[MemberIndex]);
|
|
|
+ if (El.ClassType<>TPasVariable) then continue;
|
|
|
+ if SameText(El.Name,'D'+IntToStr(i)) then
|
|
|
+ begin
|
|
|
+ if i=4 then exit(true);
|
|
|
+ inc(i);
|
|
|
+ end;
|
|
|
+ end;
|
|
|
end;
|
|
|
|
|
|
function TPas2JSResolver.GetAssignGUIDString(TypeEl: TPasRecordType;
|