pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Type Library Editor, FPC 3.1.1+ support.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5947 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2017-06-19 17:28:02 +00:00
parent aa308d6bd2
commit 8c8c9480dd
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wst/trunk/type_lib_edtr/edit_helper.pas
View File

@ -9,16 +9,15 @@
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
}
}
{$INCLUDE wst_global.inc}
unit edit_helper;
{$mode objfpc}{$H+}
interface
uses
Classes, SysUtils,
pastree, pascal_parser_intf;
pastree, pscanner, pascal_parser_intf;
type
@ -464,7 +463,11 @@ begin
end;
end;
end;
{$IFDEF WST_TCLASS_MEMBERS}
locList := TPasClassType(AType).Members;
{$ELSE WST_TCLASS_MEMBERS}
locList := TPasClassType(AType).ClassVars;
{$ENDIF WST_TCLASS_MEMBERS}
for i := 0 to locList.Count-1 do begin
locElement := TPasElement(locList[i]);
if locElement.InheritsFrom(TPasVariable) then begin

11
wst/trunk/type_lib_edtr/uprocedit.pas
View File

@ -9,17 +9,16 @@
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
}
}
{$INCLUDE wst_global.inc}
unit uprocedit;
{$mode objfpc}{$H+}
interface
uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ComCtrls,
ExtCtrls, StdCtrls, ActnList, Menus,
pastree, pascal_parser_intf,
pastree, PScanner, pascal_parser_intf,
edit_helper, Buttons;
type
@ -272,7 +271,11 @@ procedure TfProcEdit.SaveToObject();
try
newObj := TPasFunction(FSymbolTable.CreateElement(TPasFunction,FObject.Name,prt,visPublic,'',0));
prt.Members.Add(newObj);
{$IFDEF WST_TPASSOURCEPOS}
newObjType := FSymbolTable.CreateFunctionType('','result',newObj,False,Default(TPasSourcePos));
{$ELSE WST_TPASSOURCEPOS}
newObjType := FSymbolTable.CreateFunctionType('','result',newObj,False,'',0);
{$ENDIF WST_TPASSOURCEPOS}
newObj.ProcType := newObjType;
CopyArgs(FObject.ProcType,newObjType);
newObjType.ResultEl.ResultType := edtResultType.Items.Objects[edtResultType.ItemIndex] as TPasType;

3
wst/trunk/wst_global.inc
View File

@ -57,7 +57,8 @@
{$DEFINE WST_TKPOINTER}
{$IFEND}
{$IF Defined(FPC_FULLVERSION) and (FPC_FULLVERSION >= 30101) }
{$DEFINE WST_TPASSOURCEPOS}
{$DEFINE WST_TPASSOURCEPOS}
{$DEFINE WST_TCLASS_MEMBERS}
{$IFEND}
{$ENDIF}