فهرست منبع

fcl-passrc: resolver TGuidString = type string

git-svn-id: trunk@39432 -
Mattias Gaertner 7 سال پیش
والد
کامیت
dd32f877ed
3فایلهای تغییر یافته به همراه5 افزوده شده و 4 حذف شده
  1. 2 1
      packages/fcl-passrc/src/pasresolver.pp
  2. 1 1
      packages/fcl-passrc/tests/tcresolver.pas
  3. 2 2
      packages/pastojs/tests/tcmodules.pas

+ 2 - 1
packages/fcl-passrc/src/pasresolver.pp

@@ -19864,7 +19864,8 @@ begin
       TypeEl:=nil;
     while TypeEl<>nil do
       begin
-      if TypeEl.ClassType=TPasAliasType then
+      if (TypeEl.ClassType=TPasAliasType)
+          or (TypeEl.ClassType=TPasTypeAliasType) then
         begin
         if SameText(TypeEl.Name,'TGUIDString') then
           exit(true);

+ 1 - 1
packages/fcl-passrc/tests/tcresolver.pas

@@ -11628,7 +11628,7 @@ begin
   '  TObject = class end;',
   '  TGUID = record D1,D2,D3,D4: word; end;',
   '  TAliasGUID = TGUID;',
-  '  TGUIDString = string;',
+  '  TGUIDString = type string;',
   '  TAliasGUIDString = TGUIDString;',
   'procedure {#A}DoIt(const g: TAliasGUID); overload;',
   'begin end;',

+ 2 - 2
packages/pastojs/tests/tcmodules.pas

@@ -16246,7 +16246,7 @@ begin
   '  TObject = class end;',
   '  TGUID = record D1, D2, D3, D4: word; end;',
   '  TAliasGUID = TGUID;',
-  '  TGUIDString = string;',
+  '  TGUIDString = type string;',
   '  TAliasGUIDString = TGUIDString;',
   'procedure DoConstGUIDIt(const g: TAliasGUID); overload;',
   'begin end;',
@@ -16389,7 +16389,7 @@ begin
   '  end;',
   '  TGUID = record D1, D2, D3, D4: word; end;',
   '  TAliasGUID = TGUID;',
-  '  TGUIDString = string;',
+  '  TGUIDString = type string;',
   '  TAliasGUIDString = TGUIDString;',
   '  TObject = class',
   '    function GetG: TAliasGUID; virtual; abstract;',