Update of /cvsroot/jvcl/dev/RALib/interpreter/Source In directory usw-pr-cvs1:/tmp/cvs-serv23338/RALib/interpreter/Source Modified Files: JvIReg.pas JvInterpreter.pas JvInterpreterConst.pas JvInterpreterFm.pas JvInterpreterParser.pas JvInterpreter_Classes.pas JvInterpreter_ComCtrls.pas JvInterpreter_Contnrs.pas JvInterpreter_Controls.pas JvInterpreter_DBTables.pas JvInterpreter_Db.pas JvInterpreter_DbCtrls.pas JvInterpreter_DbGrids.pas JvInterpreter_Dialogs.pas JvInterpreter_ExtCtrls.pas JvInterpreter_Forms.pas JvInterpreter_Graphics.pas JvInterpreter_Grids.pas JvInterpreter_JvEditor.pas JvInterpreter_JvInterpreter.pas JvInterpreter_JvRegAuto.pas JvInterpreter_JvUtils.pas JvInterpreter_Menus.pas JvInterpreter_Quickrpt.pas JvInterpreter_StdCtrls.pas JvInterpreter_SysUtils.pas JvInterpreter_System.pas JvInterpreter_Types.pas JvInterpreter_Windows.pas JvInterpreter_all.pas JvInterpreter_httpapp.pas Log Message: Index: JvIReg.pas =================================================================== RCS file: /cvsroot/jvcl/dev/RALib/interpreter/Source/JvIReg.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvIReg.pas 8 Jul 2002 05:33:41 -0000 1.1 --- JvIReg.pas 16 Aug 2002 09:37:41 -0000 1.2 *************** *** 12,19 **** The Initial Developers of the Original Code are: Andrei Prygounkov <a.p...@gm...> ! Copyright (c) 1999, 2002 Andrei Prygounkov All Rights Reserved. ! Contributor(s): Last Modified: 2002-07-04 --- 12,19 ---- The Initial Developers of the Original Code are: Andrei Prygounkov <a.p...@gm...> ! Copyright (c) 1999, 2002 Andrei Prygounkov All Rights Reserved. ! Contributor(s): Last Modified: 2002-07-04 *************** *** 26,32 **** Known Issues: -----------------------------------------------------------------------------} - {$A+,B-,C+,D+,E-,F-,G+,H+,I+,J+,K-,L+,M-,N+,O+,P+,Q-,R-,S-,T-,U-,V+,W-,X+,Y+,Z1} ! {$I JEDI.INC} // Enable new property editor for integer types --- 26,31 ---- Known Issues: -----------------------------------------------------------------------------} ! {$I JVCL.INC} // Enable new property editor for integer types *************** *** 43,146 **** implementation ! uses SysUtils, Classes, TypInfo, JvInterpreter, ! {$IFDEF COMPLIB_VCL} JvInterpreterFm, ! {$ENDIF COMPLIB_VCL} ! {$IFDEF Delphi6_Up} ! DesignIntf, DesignEditors ! {$ELSE} DsgnIntf ! {$ENDIF Delphi6_Up} ! ; {$R ..\..\images\rai.dcr} const ! {$IFDEF MSWINDOWS} ! RALibTabName = 'Jv Interpreter'; ! {$ENDIF} ! {$IFDEF LINUX} ! RALibTabName = 'Jv Interpreter'; ! {$ENDIF} ! {$IFDEF JvInterpreter_INTEGERPROPERTY} type ! TRAIntegerProperty = class(TIntegerProperty) private ! Component : TPersistent; ! JvInterpreterP : TJvInterpreterProgram; procedure JvInterpreterPGetValue(Sender: TObject; Identifer: string; var Value: Variant; Args: TArgs; var Done: Boolean); public ! procedure SetValue(const Value : string); override; ! {$IFDEF JvInterpreter_INTEGERPROPERTY_DBLCLICK} procedure Edit; override; ! {$ENDIF JvInterpreter_INTEGERPROPERTY_DBLCLICK} end; ! {$ENDIF JvInterpreter_INTEGERPROPERTY} procedure Register; begin ! {JvInterpreter unit} RegisterComponents(RALibTabName, [TJvInterpreterProgram]); ! {$IFDEF COMPLIB_VCL} RegisterComponents(RALibTabName, [TJvInterpreterFm]); ! {$ENDIF COMPLIB_VCL} ! {$IFDEF JvInterpreter_INTEGERPROPERTY} ! RegisterPropertyEditor(TypeInfo(integer), TObject, '', TRAIntegerProperty); ! RegisterPropertyEditor(TypeInfo(cardinal), TObject, '', TRAIntegerProperty); ! RegisterPropertyEditor(TypeInfo(longint), TObject, '', TRAIntegerProperty); ! RegisterPropertyEditor(TypeInfo(smallint), TObject, '', TRAIntegerProperty); ! RegisterPropertyEditor(TypeInfo(shortint), TObject, '', TRAIntegerProperty); ! RegisterPropertyEditor(TypeInfo(word), TObject, '', TRAIntegerProperty); ! RegisterPropertyEditor(TypeInfo(byte), TObject, '', TRAIntegerProperty); ! {$ENDIF JvInterpreter_INTEGERPROPERTY} end; {$IFDEF JvInterpreter_INTEGERPROPERTY} ! { TRAIntegerProperty } type THackJvInterpreterProgram = class(TJvInterpreterProgram); ! procedure TRAIntegerProperty.JvInterpreterPGetValue(Sender: TObject; Identifer: string; ! var Value: Variant; Args: TArgs; var Done: Boolean); var Com: TComponent; begin if (Component is TComponent) and (Args.Obj = nil) then - begin - Com := (Component as TComponent).Owner.FindComponent(Identifer); - if Com <> nil then begin ! Value := O2V(Com); ! Done := True; ! end else ! begin ! Args.Obj := Component; ! Args.ObjTyp := varObject; ! try ! Done := THackJvInterpreterProgram(JvInterpreterP).GetValue(Identifer, Value, Args); ! finally ! Args.Obj := nil; ! Args.ObjTyp := 0; ! end; ! end; ! end; ! end; { GetValue } ! procedure TRAIntegerProperty.SetValue(const Value: string); ! function Calc : longint; begin if JvInterpreterP = nil then ! begin ! JvInterpreterP := TJvInterpreterProgram.Create(nil); ! JvInterpreterP.OnGetValue := JvInterpreterPGetValue; ! end; JvInterpreterP.Source := Value; JvInterpreterP.Run; --- 42,149 ---- implementation ! uses SysUtils, ! Classes, ! TypInfo, JvInterpreter, ! {$IFDEF COMPLIB_VCL} JvInterpreterFm, ! {$ENDIF COMPLIB_VCL} ! {$IFDEF COMPILER6_UP} ! DesignIntf, ! DesignEditors ! {$ELSE} DsgnIntf ! {$ENDIF COMPILER6_UP} ! ; {$R ..\..\images\rai.dcr} const ! {$IFDEF MSWINDOWS} ! RALibTabName = 'JVCL-RA'; ! {$ENDIF} ! {$IFDEF LINUX} ! RALibTabName = 'JVCL-RA'; ! {$ENDIF} ! {$IFDEF JvInterpreter_INTEGERPROPERTY} type ! TJvIntegerProperty = class(TIntegerProperty) private ! Component: TPersistent; ! JvInterpreterP: TJvInterpreterProgram; procedure JvInterpreterPGetValue(Sender: TObject; Identifer: string; var Value: Variant; Args: TArgs; var Done: Boolean); public ! procedure SetValue(const Value: string); override; ! {$IFDEF JvInterpreter_INTEGERPROPERTY_DBLCLICK} procedure Edit; override; ! {$ENDIF JvInterpreter_INTEGERPROPERTY_DBLCLICK} end; ! {$ENDIF JvInterpreter_INTEGERPROPERTY} procedure Register; begin ! {JvInterpreter unit} RegisterComponents(RALibTabName, [TJvInterpreterProgram]); ! {$IFDEF COMPLIB_VCL} RegisterComponents(RALibTabName, [TJvInterpreterFm]); ! {$ENDIF COMPLIB_VCL} ! {$IFDEF JvInterpreter_INTEGERPROPERTY} ! RegisterPropertyEditor(TypeInfo(integer), TObject, '', TJvIntegerProperty); ! RegisterPropertyEditor(TypeInfo(cardinal), TObject, '', TJvIntegerProperty); ! RegisterPropertyEditor(TypeInfo(longint), TObject, '', TJvIntegerProperty); ! RegisterPropertyEditor(TypeInfo(smallint), TObject, '', TJvIntegerProperty); ! RegisterPropertyEditor(TypeInfo(shortint), TObject, '', TJvIntegerProperty); ! RegisterPropertyEditor(TypeInfo(word), TObject, '', TJvIntegerProperty); ! RegisterPropertyEditor(TypeInfo(byte), TObject, '', TJvIntegerProperty); ! {$ENDIF JvInterpreter_INTEGERPROPERTY} end; {$IFDEF JvInterpreter_INTEGERPROPERTY} ! { TJvIntegerProperty } type THackJvInterpreterProgram = class(TJvInterpreterProgram); ! procedure TJvIntegerProperty.JvInterpreterPGetValue(Sender: TObject; Identifer: string; ! var Value: Variant; Args: TArgs; var Done: Boolean); var Com: TComponent; begin if (Component is TComponent) and (Args.Obj = nil) then begin ! Com := (Component as TComponent).Owner.FindComponent(Identifer); ! if Com <> nil then ! begin ! Value := O2V(Com); ! Done := True; ! end ! else ! begin ! Args.Obj := Component; ! Args.ObjTyp := varObject; ! try ! Done := THackJvInterpreterProgram(JvInterpreterP).GetValue(Identifer, Value, Args); ! finally ! Args.Obj := nil; ! Args.ObjTyp := 0; ! end; ! end; ! end; ! end; { GetValue } ! procedure TJvIntegerProperty.SetValue(const Value: string); ! function Calc: longint; begin if JvInterpreterP = nil then ! begin ! JvInterpreterP := TJvInterpreterProgram.Create(nil); ! JvInterpreterP.OnGetValue := JvInterpreterPGetValue; ! end; JvInterpreterP.Source := Value; JvInterpreterP.Run; *************** *** 149,201 **** var ! Int : longint; ! PropInf : PPropInfo; ! i : integer; begin try ! { if Value is a simple integer we do not need to run JvInterpreter } Int := StrToInt(Value); SetOrdValue(Int); except ! { and now we really need do this } for i := 0 to PropCount - 1 do ! begin ! Component := GetComponent(i) as TPersistent; ! Int := Calc; ! PropInf := TypInfo.GetPropInfo(Component.ClassInfo, GetName); ! if PropInf <> nil then ! SetOrdProp(Component, PropInf, Int); ! Modified; ! end; end; end; {$IFDEF JvInterpreter_INTEGERPROPERTY_DBLCLICK} ! procedure TRAIntegerProperty.Edit; var ! Int, P : longint; ! PropInf : PPropInfo; ! i : integer; ! Component : TPersistent; begin for i := 0 to PropCount - 1 do - begin - Component := GetComponent(i) as TPersistent; - PropInf := TypInfo.GetPropInfo(Component.ClassInfo, GetName); - if PropInf <> nil then begin ! Int := GetOrdProp(Component, PropInf); ! {$R-} ! if KeyPressed(VK_CONTROL) then P := 10 else P := 1; ! if KeyPressed(VK_SHIFT) then dec(Int, P) else inc(Int, P); ! {$R+} ! SetOrdProp(Component, PropInf, Int); ! Modified; end; - end; end; {$ENDIF JvInterpreter_INTEGERPROPERTY_DBLCLICK} {$ENDIF JvInterpreter_INTEGERPROPERTY} - end. --- 152,211 ---- var ! Int: longint; ! PropInf: PPropInfo; ! i: integer; begin try ! { if Value is a simple integer we do not need to run JvInterpreter } Int := StrToInt(Value); SetOrdValue(Int); except ! { and now we really need do this } for i := 0 to PropCount - 1 do ! begin ! Component := GetComponent(i) as TPersistent; ! Int := Calc; ! PropInf := TypInfo.GetPropInfo(Component.ClassInfo, GetName); ! if PropInf <> nil then ! SetOrdProp(Component, PropInf, Int); ! Modified; ! end; end; end; {$IFDEF JvInterpreter_INTEGERPROPERTY_DBLCLICK} ! ! procedure TJvIntegerProperty.Edit; var ! Int, P: longint; ! PropInf: PPropInfo; ! i: integer; ! Component: TPersistent; begin for i := 0 to PropCount - 1 do begin ! Component := GetComponent(i) as TPersistent; ! PropInf := TypInfo.GetPropInfo(Component.ClassInfo, GetName); ! if PropInf <> nil then ! begin ! Int := GetOrdProp(Component, PropInf); ! {$R-} ! if KeyPressed(VK_CONTROL) then ! P := 10 ! else ! P := 1; ! if KeyPressed(VK_SHIFT) then ! dec(Int, P) ! else ! inc(Int, P); ! {$R+} ! SetOrdProp(Component, PropInf, Int); ! Modified; ! end; end; end; {$ENDIF JvInterpreter_INTEGERPROPERTY_DBLCLICK} {$ENDIF JvInterpreter_INTEGERPROPERTY} end. + Index: JvInterpreter.pas =================================================================== RCS file: /cvsroot/jvcl/dev/RALib/interpreter/Source/JvInterpreter.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvInterpreter.pas 8 Jul 2002 05:33:41 -0000 1.1 --- JvInterpreter.pas 16 Aug 2002 09:37:41 -0000 1.2 *************** *** 27,33 **** Known Issues: -----------------------------------------------------------------------------} - {$A+,B-,C+,D+,E-,F-,G+,H+,I+,J+,K-,L+,M-,N+,O+,P+,Q-,R-,S-,T-,U-,V+,W-,X+,Y+,Z1} ! {$I JEDI.INC} { history (JVCL Library versions): --- 27,33 ---- Known Issues: -----------------------------------------------------------------------------} ! ! {$I JVCL.INC} { history (JVCL Library versions): *************** *** 161,167 **** uses SysUtils, Classes, JvInterpreterParser ! {$IFDEF Delphi6_Up} , Variants ! {$ENDIF Delphi6_Up} {$IFDEF MSWINDOWS} , Windows --- 161,167 ---- uses SysUtils, Classes, JvInterpreterParser ! {$IFDEF COMPILER6_UP} , Variants ! {$ENDIF COMPILER6_UP} {$IFDEF MSWINDOWS} , Windows *************** *** 936,949 **** uses TypInfo, JvInterpreterConst ! {$IFNDEF Delphi3_Up} , Ole2 { IUnknown in Delphi 2 } {$ENDIF} {$IFDEF JvInterpreter_OLEAUTO} , OleConst ! {$IFDEF Delphi3_Up} , ActiveX, ComObj {$ELSE} , OleAuto ! {$ENDIF Delphi3_Up} {$ENDIF JvInterpreter_OLEAUTO} ; --- 936,949 ---- uses TypInfo, JvInterpreterConst ! {$IFNDEF COMPILER3_UP} , Ole2 { IUnknown in Delphi 2 } {$ENDIF} {$IFDEF JvInterpreter_OLEAUTO} , OleConst ! {$IFDEF COMPILER3_UP} , ActiveX, ComObj {$ELSE} , OleAuto ! {$ENDIF COMPILER3_UP} {$ENDIF JvInterpreter_OLEAUTO} ; *************** *** 1059,1065 **** ! {$IFDEF Delphi2} ! { TStringStream - reduced implementation from Delphi 3 classes.pas } ! TStringStream = class(TStream) private FDataString: string; --- 1059,1065 ---- ! {$IFDEF COMPILER2} ! { TJvStringStream - reduced implementation from Delphi 3 classes.pas } ! TJvStringStream = class(TStream) private FDataString: string; *************** *** 1076,1080 **** PDouble = ^Double; PSmallInt = ^SmallInt; ! {$ENDIF Delphi2} {$IFDEF COMPLIB_CLX} --- 1076,1080 ---- PDouble = ^Double; PSmallInt = ^SmallInt; ! {$ENDIF COMPILER2} {$IFDEF COMPLIB_CLX} *************** *** 1338,1344 **** ! {$IFNDEF Delphi3_Up} ! constructor TStringStream.Create(const AString: string); begin inherited Create; --- 1338,1344 ---- ! {$IFNDEF COMPILER3_UP} ! constructor TJvStringStream .Create(const AString: string); begin inherited Create; *************** *** 1346,1350 **** end; ! function TStringStream.Read(var Buffer; Count: Longint): Longint; begin Result := Length(FDataString) - FPosition; --- 1346,1350 ---- end; ! function TJvStringStream .Read(var Buffer; Count: Longint): Longint; begin Result := Length(FDataString) - FPosition; *************** *** 1354,1358 **** end; ! function TStringStream.Write(const Buffer; Count: Longint): Longint; begin Result := Count; --- 1354,1358 ---- end; ! function TJvStringStream .Write(const Buffer; Count: Longint): Longint; begin Result := Count; *************** *** 1362,1366 **** end; ! function TStringStream.Seek(Offset: Longint; Origin: Word): Longint; begin case Origin of --- 1362,1366 ---- end; ! function TJvStringStream .Seek(Offset: Longint; Origin: Word): Longint; begin case Origin of *************** *** 1372,1376 **** end; ! procedure TStringStream.SetSize(NewSize: Longint); begin SetLength(FDataString, NewSize); --- 1372,1376 ---- end; ! procedure TJvStringStream .SetSize(NewSize: Longint); begin SetLength(FDataString, NewSize); *************** *** 1379,1383 **** {$ENDIF} ! {$IFNDEF Delphi3_Up} function AnsiStrIComp(S1, S2: PChar): Integer; begin --- 1379,1383 ---- {$ENDIF} ! {$IFNDEF COMPILER3_UP} function AnsiStrIComp(S1, S2: PChar): Integer; begin *************** *** 1391,1397 **** S1, MaxLen, S2, MaxLen) - 2; end; ! {$ENDIF Delphi3_Up} ! {************* Some code from RAUtils unit **************} function SubStr(const S : string; const index : integer; const Separator : string) : string; {Âûðåçàåò ïîäñòðîêó. Ïîäñòðîêè ðàçäåëÿþòñÿ ñèìâîëîì Sep} --- 1391,1397 ---- S1, MaxLen, S2, MaxLen) - 2; end; ! {$ENDIF COMPILER3_UP} ! {************* Some code from JvUtils unit **************} function SubStr(const S : string; const index : integer; const Separator : string) : string; {Âûðåçàåò ïîäñòðîêó. Ïîäñòðîêè ðàçäåëÿþòñÿ ñèìâîëîì Sep} *************** *** 1443,1447 **** {$ENDIF COMPLIB_CLX} end; { Cmp } ! {################## from RAUtils unit ##################} {************* Some code from RAStream unit **************} --- 1443,1447 ---- {$ENDIF COMPLIB_CLX} end; { Cmp } ! {################## from JvUtils unit ##################} {************* Some code from RAStream unit **************} *************** *** 1519,1527 **** {************* Some code from Delphi's OleAuto unit **************} const ! {$IFDEF Delphi3_Up} { Maximum number of dispatch arguments } MaxDispArgs = 64; ! {$ENDIF Delphi3_Up} { Special variant type codes } --- 1519,1527 ---- {************* Some code from Delphi's OleAuto unit **************} const ! {$IFDEF COMPILER3_UP} { Maximum number of dispatch arguments } MaxDispArgs = 64; ! {$ENDIF COMPILER3_UP} { Special variant type codes } *************** *** 1564,1572 **** LOCALE_SYSTEM_DEFAULT, DispIDs); if R <> 0 then ! {$IFDEF Delphi3_Up} raise EOleError.CreateFmt(SNoMethod, [Names]); {$ELSE} raise EOleError.CreateResFmt(SNoMethod, [Names]); ! {$ENDIF Delphi3_Up} end; --- 1564,1572 ---- LOCALE_SYSTEM_DEFAULT, DispIDs); if R <> 0 then ! {$IFDEF COMPILER3_UP} raise EOleError.CreateFmt(SNoMethod, [Names]); {$ELSE} raise EOleError.CreateResFmt(SNoMethod, [Names]); ! {$ENDIF COMPILER3_UP} end; *************** *** 1580,1588 **** GetIDsOfNames(IDispatch(Dispatch), Names, CallDesc^.NamedArgCount + 1, @DispIDs); if Result <> nil then VarClear(Result^); ! {$IFDEF Delphi3_Up} DispatchInvoke(IDispatch(Dispatch), CallDesc, @DispIDs, @ParamTypes, Result); {$ELSE} DispInvoke(Dispatch, CallDesc, @DispIDs, @ParamTypes, Result); ! {$ENDIF Delphi3_Up} end; {################## from OleAuto unit ##################} --- 1580,1588 ---- GetIDsOfNames(IDispatch(Dispatch), Names, CallDesc^.NamedArgCount + 1, @DispIDs); if Result <> nil then VarClear(Result^); ! {$IFDEF COMPILER3_UP} DispatchInvoke(IDispatch(Dispatch), CallDesc, @DispIDs, @ParamTypes, Result); {$ELSE} DispInvoke(Dispatch, CallDesc, @DispIDs, @ParamTypes, Result); ! {$ENDIF COMPILER3_UP} end; {################## from OleAuto unit ##################} *************** *** 2030,2034 **** destructor TJvInterpreterVarList.Destroy; begin ! {$IFNDEF Delphi4_Up} Clear; {$ENDIF} --- 2030,2034 ---- destructor TJvInterpreterVarList.Destroy; begin ! {$IFNDEF COMPILER4_UP} Clear; {$ENDIF} *************** *** 3868,3872 **** tkFloat: Value := GetFloatProp(Args.Obj, PropInf); ! tkString, tkLString{$IFDEF Delphi3_Up}, tkWString{$ENDIF Delphi3_Up}: Value := GetStrProp(Args.Obj, PropInf); tkClass: --- 3868,3872 ---- tkFloat: Value := GetFloatProp(Args.Obj, PropInf); ! tkString, tkLString{$IFDEF COMPILER3_UP}, tkWString{$ENDIF COMPILER3_UP}: Value := GetStrProp(Args.Obj, PropInf); tkClass: *************** *** 3905,3909 **** tkFloat: SetFloatProp(Args.Obj, PropInf, Value); ! tkString, tkLString{$IFDEF Delphi3_Up}, tkWString{$ENDIF Delphi3_Up}: SetStrProp(Args.Obj, PropInf, VarToStr(Value)); tkClass: --- 3905,3909 ---- tkFloat: SetFloatProp(Args.Obj, PropInf, Value); ! tkString, tkLString{$IFDEF COMPILER3_UP}, tkWString{$ENDIF COMPILER3_UP}: SetStrProp(Args.Obj, PropInf, VarToStr(Value)); tkClass: *************** *** 4053,4057 **** inherited Create(AOwner); Parser := TJvInterpreterParser.Create; ! FPStream := TStringStream.Create(''); FArgs := TArgs.Create; FAdapter := CreateAdapter; --- 4053,4057 ---- inherited Create(AOwner); Parser := TJvInterpreterParser.Create; ! FPStream := TStringStream .Create(''); FArgs := TArgs.Create; FAdapter := CreateAdapter; *************** *** 4190,4197 **** procedure TJvInterpreterExpression.Parse; begin ! {$IFNDEF Delphi2} FPStream.Size := 0; {$ELSE} ! (FPStream as TStringStream).SetSize(0); {$ENDIF} FPStream.Position := 0; --- 4190,4197 ---- procedure TJvInterpreterExpression.Parse; begin ! {$IFNDEF COMPILER2} FPStream.Size := 0; {$ELSE} ! (FPStream as TJvStringStream ).SetSize(0); {$ENDIF} FPStream.Position := 0; Index: JvInterpreterConst.pas =================================================================== RCS file: /cvsroot/jvcl/dev/RALib/interpreter/Source/JvInterpreterConst.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvInterpreterConst.pas 8 Jul 2002 05:33:41 -0000 1.1 --- JvInterpreterConst.pas 16 Aug 2002 09:37:41 -0000 1.2 *************** *** 26,32 **** Known Issues: -----------------------------------------------------------------------------} - {$A+,B-,C+,D+,E-,F-,G+,H+,I+,J+,K-,L+,M-,N+,O+,P+,Q-,R-,S-,T-,U-,V+,W-,X+,Y+,Z1} ! {$I JEDI.INC} unit JvInterpreterConst; --- 26,32 ---- Known Issues: -----------------------------------------------------------------------------} ! ! {$I JVCL.INC} unit JvInterpreterConst; Index: JvInterpreterFm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/RALib/interpreter/Source/JvInterpreterFm.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvInterpreterFm.pas 8 Jul 2002 05:33:41 -0000 1.1 --- JvInterpreterFm.pas 16 Aug 2002 09:37:41 -0000 1.2 *************** *** 27,33 **** Known Issues: -----------------------------------------------------------------------------} - {$A+,B-,C+,D+,E-,F-,G+,H+,I+,J+,K-,L+,M-,N+,O+,P+,Q-,R-,S-,T-,U-,V+,W-,X+,Y+,Z1} ! {$I JEDI.INC} { history (JVCL Library versions): --- 27,33 ---- Known Issues: -----------------------------------------------------------------------------} ! ! {$I JVCL.INC} { history (JVCL Library versions): *************** *** 84,92 **** procedure ReadState(Reader: TReader); override; public ! {$IFDEF Delphi4_Up} constructor CreateNew(AOwner: TComponent; Dummy: Integer = 0); override; {$ELSE} constructor CreateNew(AOwner: TComponent; Dummy: Integer); ! {$ENDIF Delphi4_Up} destructor Destroy; override; property JvInterpreterFm: TJvInterpreterFm read FJvInterpreterFm write FJvInterpreterFm; --- 84,92 ---- procedure ReadState(Reader: TReader); override; public ! {$IFDEF COMPILER4_UP} constructor CreateNew(AOwner: TComponent; Dummy: Integer = 0); override; {$ELSE} constructor CreateNew(AOwner: TComponent; Dummy: Integer); ! {$ENDIF COMPILER4_UP} destructor Destroy; override; property JvInterpreterFm: TJvInterpreterFm read FJvInterpreterFm write FJvInterpreterFm; *************** *** 207,215 **** end; ! {$IFDEF Delphi4_Up} constructor TJvInterpreterForm.CreateNew(AOwner: TComponent; Dummy: Integer = 0); {$ELSE} constructor TJvInterpreterForm.CreateNew(AOwner: TComponent; Dummy: Integer); ! {$ENDIF Delphi4_Up} begin FMethodList := TList.Create; --- 207,215 ---- end; ! {$IFDEF COMPILER4_UP} constructor TJvInterpreterForm.CreateNew(AOwner: TComponent; Dummy: Integer = 0); {$ELSE} constructor TJvInterpreterForm.CreateNew(AOwner: TComponent; Dummy: Integer); ! {$ENDIF COMPILER4_UP} begin FMethodList := TList.Create; *************** *** 291,299 **** var JvInterpreterReader: TJvInterpreterReader; ! {$IFDEF Delphi5_Up} TmpStream: TMemoryStream; ! {$ENDIF Delphi5_Up} begin ! {$IFDEF Delphi5_Up} if TestStreamFormat(Stream) = sofText then begin --- 291,299 ---- var JvInterpreterReader: TJvInterpreterReader; ! {$IFDEF COMPILER5_UP} TmpStream: TMemoryStream; ! {$ENDIF COMPILER5_UP} begin ! {$IFDEF COMPILER5_UP} if TestStreamFormat(Stream) = sofText then begin *************** *** 304,308 **** Stream.Position := 0; end; ! {$ENDIF Delphi5_Up} Stream.ReadResHeader; --- 304,308 ---- Stream.Position := 0; end; ! {$ENDIF COMPILER5_UP} Stream.ReadResHeader; *************** *** 338,346 **** Source := S; Compile; ! {$IFDEF Delphi4_Up} FForm := TJvInterpreterForm.CreateNew(Application); {$ELSE} FForm := TJvInterpreterForm.CreateNew(Application, 0); ! {$ENDIF Delphi4_Up} FForm.FUnitName := UnitName; LoadForm(FForm); --- 338,346 ---- Source := S; Compile; ! {$IFDEF COMPILER4_UP} FForm := TJvInterpreterForm.CreateNew(Application); {$ELSE} FForm := TJvInterpreterForm.CreateNew(Application, 0); ! {$ENDIF COMPILER4_UP} FForm.FUnitName := UnitName; LoadForm(FForm); *************** *** 489,497 **** if JvInterpreterSrcClass <> nil then begin ! {$IFDEF Delphi4_Up} JvInterpreterForm := TJvInterpreterForm.CreateNew(Application); {$ELSE} JvInterpreterForm := TJvInterpreterForm.CreateNew(Application, 0); ! {$ENDIF Delphi4_Up} JvInterpreterForm.FClassIdentifer := Identifer; Value := O2V(JvInterpreterForm); --- 489,497 ---- if JvInterpreterSrcClass <> nil then begin ! {$IFDEF COMPILER4_UP} JvInterpreterForm := TJvInterpreterForm.CreateNew(Application); {$ELSE} JvInterpreterForm := TJvInterpreterForm.CreateNew(Application, 0); ! {$ENDIF COMPILER4_UP} JvInterpreterForm.FClassIdentifer := Identifer; Value := O2V(JvInterpreterForm); Index: JvInterpreterParser.pas =================================================================== RCS file: /cvsroot/jvcl/dev/RALib/interpreter/Source/JvInterpreterParser.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvInterpreterParser.pas 8 Jul 2002 05:33:41 -0000 1.1 --- JvInterpreterParser.pas 16 Aug 2002 09:37:41 -0000 1.2 *************** *** 26,32 **** Known Issues: -----------------------------------------------------------------------------} - {$A+,B-,C+,D+,E-,F-,G+,H+,I+,J+,K-,L+,M-,N+,O+,P+,Q-,R-,S-,T-,U-,V+,W-,X+,Y+,Z1} ! {$I JEDI.INC} unit JvInterpreterParser; --- 26,32 ---- Known Issues: -----------------------------------------------------------------------------} ! ! {$I JVCL.INC} unit JvInterpreterParser; Index: JvInterpreter_Classes.pas =================================================================== RCS file: /cvsroot/jvcl/dev/RALib/interpreter/Source/JvInterpreter_Classes.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvInterpreter_Classes.pas 8 Jul 2002 05:33:41 -0000 1.1 --- JvInterpreter_Classes.pas 16 Aug 2002 09:37:41 -0000 1.2 *************** *** 26,32 **** Known Issues: -----------------------------------------------------------------------------} - {$A+,B-,C+,D+,E-,F-,G+,H+,I+,J+,K-,L+,M-,N+,O+,P+,Q-,R-,S-,T-,U-,V+,W-,X+,Y+,Z1} ! {$I JEDI.INC} unit JvInterpreter_Classes; --- 26,32 ---- Known Issues: -----------------------------------------------------------------------------} ! ! {$I JVCL.INC} unit JvInterpreter_Classes; *************** *** 184,188 **** end; ! {$IFDEF Delphi3_Up} { function GetNamePath: string; } procedure TPersistent_GetNamePath(var Value: Variant; Args: TArgs); --- 184,188 ---- end; ! {$IFDEF COMPILER3_UP} { function GetNamePath: string; } procedure TPersistent_GetNamePath(var Value: Variant; Args: TArgs); *************** *** 190,194 **** Value := TPersistent(Args.Obj).GetNamePath; end; ! {$ENDIF Delphi3_Up} { TCollectionItem } --- 190,194 ---- Value := TPersistent(Args.Obj).GetNamePath; end; ! {$ENDIF COMPILER3_UP} { TCollectionItem } *************** *** 212,216 **** end; ! {$IFDEF Delphi3_Up} { property Read ID: Integer } procedure TCollectionItem_Read_ID(var Value: Variant; Args: TArgs); --- 212,216 ---- end; ! {$IFDEF COMPILER3_UP} { property Read ID: Integer } procedure TCollectionItem_Read_ID(var Value: Variant; Args: TArgs); *************** *** 218,222 **** Value := TCollectionItem(Args.Obj).ID; end; ! {$ENDIF Delphi3_Up} { property Read Index: Integer } --- 218,222 ---- Value := TCollectionItem(Args.Obj).ID; end; ! {$ENDIF COMPILER3_UP} { property Read Index: Integer } *************** *** 232,236 **** end; ! {$IFDEF Delphi3_Up} { property Read DisplayName: string } procedure TCollectionItem_Read_DisplayName(var Value: Variant; Args: TArgs); --- 232,236 ---- end; ! {$IFDEF COMPILER3_UP} { property Read DisplayName: string } procedure TCollectionItem_Read_DisplayName(var Value: Variant; Args: TArgs); *************** *** 244,248 **** TCollectionItem(Args.Obj).DisplayName := Value; end; ! {$ENDIF Delphi3_Up} { TCollection } --- 244,248 ---- TCollectionItem(Args.Obj).DisplayName := Value; end; ! {$ENDIF COMPILER3_UP} { TCollection } *************** *** 284,288 **** end; ! {$IFDEF Delphi3_Up} { function FindItemID(ID: Integer): TCollectionItem; } procedure TCollection_FindItemID(var Value: Variant; Args: TArgs); --- 284,288 ---- end; ! {$IFDEF COMPILER3_UP} { function FindItemID(ID: Integer): TCollectionItem; } procedure TCollection_FindItemID(var Value: Variant; Args: TArgs); *************** *** 290,294 **** Value := O2V(TCollection(Args.Obj).FindItemID(Args.Values[0])); end; ! {$ENDIF Delphi3_Up} { property Read Count: Integer } --- 290,294 ---- Value := O2V(TCollection(Args.Obj).FindItemID(Args.Values[0])); end; ! {$ENDIF COMPILER3_UP} { property Read Count: Integer } *************** *** 298,302 **** end; ! {$IFDEF Delphi3_Up} { property Read ItemClass: TCollectionItemClass } procedure TCollection_Read_ItemClass(var Value: Variant; Args: TArgs); --- 298,302 ---- end; ! {$IFDEF COMPILER3_UP} { property Read ItemClass: TCollectionItemClass } procedure TCollection_Read_ItemClass(var Value: Variant; Args: TArgs); *************** *** 304,308 **** Value := O2V(TObject(TCollection(Args.Obj).ItemClass)); end; ! {$ENDIF Delphi3_Up} { property Read Items[Integer]: TCollectionItem } --- 304,308 ---- Value := O2V(TObject(TCollection(Args.Obj).ItemClass)); end; ! {$ENDIF COMPILER3_UP} { property Read Items[Integer]: TCollectionItem } *************** *** 446,450 **** end; ! {$IFDEF Delphi3_Up} { property Read Capacity: Integer } procedure TStrings_Read_Capacity(var Value: Variant; Args: TArgs); --- 446,450 ---- end; ! {$IFDEF COMPILER3_UP} { property Read Capacity: Integer } procedure TStrings_Read_Capacity(var Value: Variant; Args: TArgs); *************** *** 458,462 **** TStrings(Args.Obj).Capacity := Value; end; ! {$ENDIF Delphi3_Up} { property Read CommaText: string } --- 458,462 ---- TStrings(Args.Obj).Capacity := Value; end; ! {$ENDIF COMPILER3_UP} { property Read CommaText: string } *************** *** 532,536 **** end; ! {$IFDEF Delphi3_Up} { property Read StringsAdapter: IStringsAdapter } procedure TStrings_Read_StringsAdapter(var Value: Variant; Args: TArgs); --- 532,536 ---- end; ! {$IFDEF COMPILER3_UP} { property Read StringsAdapter: IStringsAdapter } procedure TStrings_Read_StringsAdapter(var Value: Variant; Args: TArgs); *************** *** 545,549 **** NotImplemented('TStrings.StringsAdapter'); end; ! {$ENDIF Delphi3_Up} { TStringList } --- 545,549 ---- NotImplemented('TStrings.StringsAdapter'); end; ! {$ENDIF COMPILER3_UP} { TStringList } *************** *** 725,729 **** end; ! {$IFDEF Delphi3_Up} { property Write Size(Value: Longint) } procedure TStream_Write_Size(const Value: Variant; Args: TArgs); --- 725,729 ---- end; ! {$IFDEF COMPILER3_UP} { property Write Size(Value: Longint) } procedure TStream_Write_Size(const Value: Variant; Args: TArgs); *************** *** 731,735 **** TStream(Args.Obj).Size := Value; end; ! {$ENDIF Delphi3_Up} { TFileStream } --- 731,735 ---- TStream(Args.Obj).Size := Value; end; ! {$ENDIF COMPILER3_UP} { TFileStream } *************** *** 755,765 **** end; ! { TStringStream } ! {$IFDEF Delphi3_Up} { constructor Create(AString: string) } procedure TStringStream_Create(var Value: Variant; Args: TArgs); begin ! Value := O2V(TStringStream.Create(Args.Values[0])); end; --- 755,765 ---- end; ! { TJvStringStream } ! {$IFDEF COMPILER3_UP} { constructor Create(AString: string) } procedure TStringStream_Create(var Value: Variant; Args: TArgs); begin ! Value := O2V(TStringStream .Create(Args.Values[0])); end; *************** *** 767,771 **** procedure TStringStream_Read(var Value: Variant; Args: TArgs); begin ! Value := TStringStream(Args.Obj).Read(Args.Values[0], Args.Values[1]); end; --- 767,771 ---- procedure TStringStream_Read(var Value: Variant; Args: TArgs); begin ! Value := TStringStream (Args.Obj).Read(Args.Values[0], Args.Values[1]); end; *************** *** 773,777 **** procedure TStringStream_ReadString(var Value: Variant; Args: TArgs); begin ! Value := TStringStream(Args.Obj).ReadString(Args.Values[0]); end; --- 773,777 ---- procedure TStringStream_ReadString(var Value: Variant; Args: TArgs); begin ! Value := TStringStream (Args.Obj).ReadString(Args.Values[0]); end; *************** *** 779,783 **** procedure TStringStream_Seek(var Value: Variant; Args: TArgs); begin ! Value := TStringStream(Args.Obj).Seek(Args.Values[0], Args.Values[1]); end; --- 779,783 ---- procedure TStringStream_Seek(var Value: Variant; Args: TArgs); begin ! Value := TStringStream (Args.Obj).Seek(Args.Values[0], Args.Values[1]); end; *************** *** 785,789 **** procedure TStringStream_Write(var Value: Variant; Args: TArgs); begin ! Value := TStringStream(Args.Obj).Write(Args.Values[0], Args.Values[1]); end; --- 785,789 ---- procedure TStringStream_Write(var Value: Variant; Args: TArgs); begin ! Value := TStringStream (Args.Obj).Write(Args.Values[0], Args.Values[1]); end; *************** *** 791,795 **** procedure TStringStream_WriteString(var Value: Variant; Args: TArgs); begin ! TStringStream(Args.Obj).WriteString(Args.Values[0]); end; --- 791,795 ---- procedure TStringStream_WriteString(var Value: Variant; Args: TArgs); begin ! TStringStream (Args.Obj).WriteString(Args.Values[0]); end; *************** *** 797,803 **** procedure TStringStream_Read_DataString(var Value: Variant; Args: TArgs); begin ! Value := TStringStream(Args.Obj).DataString; end; ! {$ENDIF Delphi3_Up} { TComponent } --- 797,803 ---- procedure TStringStream_Read_DataString(var Value: Variant; Args: TArgs); begin ! Value := TStringStream (Args.Obj).DataString; end; ! {$ENDIF COMPILER3_UP} { TComponent } *************** *** 833,837 **** end; ! {$IFDEF Delphi3_Up} { procedure FreeOnRelease; } procedure TComponent_FreeOnRelease(var Value: Variant; Args: TArgs); --- 833,837 ---- end; ! {$IFDEF COMPILER3_UP} { procedure FreeOnRelease; } procedure TComponent_FreeOnRelease(var Value: Variant; Args: TArgs); *************** *** 839,843 **** TComponent(Args.Obj).FreeOnRelease; end; ! {$ENDIF Delphi3_Up} { function GetParentComponent: TComponent; } --- 839,843 ---- TComponent(Args.Obj).FreeOnRelease; end; ! {$ENDIF COMPILER3_UP} { function GetParentComponent: TComponent; } *************** *** 865,869 **** end; ! {$IFDEF Delphi3_Up} { function SafeCallException(ExceptObject: TObject; ExceptAddr: Pointer): Integer; } procedure TComponent_SafeCallException(var Value: Variant; Args: TArgs); --- 865,869 ---- end; ! {$IFDEF COMPILER3_UP} { function SafeCallException(ExceptObject: TObject; ExceptAddr: Pointer): Integer; } procedure TComponent_SafeCallException(var Value: Variant; Args: TArgs); *************** *** 877,881 **** Value := TComponent(Args.Obj).ComObject; end; ! {$ENDIF Delphi3_Up} { property Read Components[Integer]: TComponent } --- 877,881 ---- Value := TComponent(Args.Obj).ComObject; end; ! {$ENDIF COMPILER3_UP} { property Read Components[Integer]: TComponent } *************** *** 935,939 **** end; ! {$IFDEF Delphi3_Up} { property Read VCLComObject: Pointer } procedure TComponent_Read_VCLComObject(var Value: Variant; Args: TArgs); --- 935,939 ---- end; ! {$IFDEF COMPILER3_UP} { property Read VCLComObject: Pointer } procedure TComponent_Read_VCLComObject(var Value: Variant; Args: TArgs); *************** *** 947,951 **** TComponent(Args.Obj).VCLComObject := V2P(Value); end; ! {$ENDIF Delphi3_Up} { property Read Name: TComponentName } --- 947,951 ---- TComponent(Args.Obj).VCLComObject := V2P(Value); end; ! {$ENDIF COMPILER3_UP} { property Read Name: TComponentName } *************** *** 1037,1043 **** AddClass('Classes', TPersistent, 'TPersistent'); AddGet(TPersistent, 'Assign', TPersistent_Assign, 1, [varEmpty], varEmpty); ! {$IFDEF Delphi3_Up} AddGet(TPersistent, 'GetNamePath', TPersistent_GetNamePath, 0, [0], varEmpty); ! {$ENDIF Delphi3_Up} { TCollectionItem } AddClass('Classes', TCollectionItem, 'TCollectionItem'); --- 1037,1043 ---- AddClass('Classes', TPersistent, 'TPersistent'); AddGet(TPersistent, 'Assign', TPersistent_Assign, 1, [varEmpty], varEmpty); ! {$IFDEF COMPILER3_UP} AddGet(TPersistent, 'GetNamePath', TPersistent_GetNamePath, 0, [0], varEmpty); ! {$ENDIF COMPILER3_UP} { TCollectionItem } AddClass('Classes', TCollectionItem, 'TCollectionItem'); *************** *** 1045,1057 **** AddGet(TCollectionItem, 'Collection', TCollectionItem_Read_Collection, 0, [0], varEmpty); AddSet(TCollectionItem, 'Collection', TCollectionItem_Write_Collection, 0, [0]); ! {$IFDEF Delphi3_Up} AddGet(TCollectionItem, 'ID', TCollectionItem_Read_ID, 0, [0], varEmpty); ! {$ENDIF Delphi3_Up} AddGet(TCollectionItem, 'Index', TCollectionItem_Read_Index, 0, [0], varEmpty); AddSet(TCollectionItem, 'Index', TCollectionItem_Write_Index, 0, [0]); ! {$IFDEF Delphi3_Up} AddGet(TCollectionItem, 'DisplayName', TCollectionItem_Read_DisplayName, 0, [0], varEmpty); AddSet(TCollectionItem, 'DisplayName', TCollectionItem_Write_DisplayName, 0, [0]); ! {$ENDIF Delphi3_Up} { TCollection } AddClass('Classes', TCollection, 'TCollection'); --- 1045,1057 ---- AddGet(TCollectionItem, 'Collection', TCollectionItem_Read_Collection, 0, [0], varEmpty); AddSet(TCollectionItem, 'Collection', TCollectionItem_Write_Collection, 0, [0]); ! {$IFDEF COMPILER3_UP} AddGet(TCollectionItem, 'ID', TCollectionItem_Read_ID, 0, [0], varEmpty); ! {$ENDIF COMPILER3_UP} AddGet(TCollectionItem, 'Index', TCollectionItem_Read_Index, 0, [0], varEmpty); AddSet(TCollectionItem, 'Index', TCollectionItem_Write_Index, 0, [0]); ! {$IFDEF COMPILER3_UP} AddGet(TCollectionItem, 'DisplayName', TCollectionItem_Read_DisplayName, 0, [0], varEmpty); AddSet(TCollectionItem, 'DisplayName', TCollectionItem_Write_DisplayName, 0, [0]); ! {$ENDIF COMPILER3_UP} { TCollection } AddClass('Classes', TCollection, 'TCollection'); *************** *** 1062,1072 **** AddGet(TCollection, 'Clear', TCollection_Clear, 0, [0], varEmpty); AddGet(TCollection, 'EndUpdate', TCollection_EndUpdate, 0, [0], varEmpty); ! {$IFDEF Delphi3_Up} AddGet(TCollection, 'FindItemID', TCollection_FindItemID, 1, [varEmpty], varEmpty); ! {$ENDIF Delphi3_Up} AddGet(TCollection, 'Count', TCollection_Read_Count, 0, [0], varEmpty); ! {$IFDEF Delphi3_Up} AddGet(TCollection, 'ItemClass', TCollection_Read_ItemClass, 0, [0], varEmpty); ! {$ENDIF Delphi3_Up} AddIGet(TCollection, 'Items', TCollection_Read_Items, 1, [0], varEmpty); AddIDGet(TCollection, TCollection_Read_Items, 1, [0], varEmpty); --- 1062,1072 ---- AddGet(TCollection, 'Clear', TCollection_Clear, 0, [0], varEmpty); AddGet(TCollection, 'EndUpdate', TCollection_EndUpdate, 0, [0], varEmpty); ! {$IFDEF COMPILER3_UP} AddGet(TCollection, 'FindItemID', TCollection_FindItemID, 1, [varEmpty], varEmpty); ! {$ENDIF COMPILER3_UP} AddGet(TCollection, 'Count', TCollection_Read_Count, 0, [0], varEmpty); ! {$IFDEF COMPILER3_UP} AddGet(TCollection, 'ItemClass', TCollection_Read_ItemClass, 0, [0], varEmpty); ! {$ENDIF COMPILER3_UP} AddIGet(TCollection, 'Items', TCollection_Read_Items, 1, [0], varEmpty); AddIDGet(TCollection, TCollection_Read_Items, 1, [0], varEmpty); *************** *** 1096,1103 **** AddGet(TStrings, 'SaveToFile', TStrings_SaveToFile, 1, [varEmpty], varEmpty); AddGet(TStrings, 'SaveToStream', TStrings_SaveToStream, 1, [varEmpty], varEmpty); ! {$IFDEF Delphi3_Up} AddGet(TStrings, 'Capacity', TStrings_Read_Capacity, 0, [0], varEmpty); AddSet(TStrings, 'Capacity', TStrings_Write_Capacity, 0, [0]); ! {$ENDIF Delphi3_Up} AddGet(TStrings, 'CommaText', TStrings_Read_CommaText, 0, [0], varEmpty); AddSet(TStrings, 'CommaText', TStrings_Write_CommaText, 0, [0]); --- 1096,1103 ---- AddGet(TStrings, 'SaveToFile', TStrings_SaveToFile, 1, [varEmpty], varEmpty); AddGet(TStrings, 'SaveToStream', TStrings_SaveToStream, 1, [varEmpty], varEmpty); ! {$IFDEF COMPILER3_UP} AddGet(TStrings, 'Capacity', TStrings_Read_Capacity, 0, [0], varEmpty); AddSet(TStrings, 'Capacity', TStrings_Write_Capacity, 0, [0]); ! {$ENDIF COMPILER3_UP} AddGet(TStrings, 'CommaText', TStrings_Read_CommaText, 0, [0], varEmpty); AddSet(TStrings, 'CommaText', TStrings_Write_CommaText, 0, [0]); *************** *** 1114,1121 **** AddGet(TStrings, 'Text', TStrings_Read_Text, 0, [0], varEmpty); AddSet(TStrings, 'Text', TStrings_Write_Text, 0, [0]); ! {$IFDEF Delphi3_Up} AddGet(TStrings, 'StringsAdapter', TStrings_Read_StringsAdapter, 0, [0], varEmpty); AddSet(TStrings, 'StringsAdapter', TStrings_Write_StringsAdapter, 0, [0]); ! {$ENDIF Delphi3_Up} { TDuplicates } AddConst('Classes', 'dupIgnore', Integer(dupIgnore)); --- 1114,1121 ---- AddGet(TStrings, 'Text', TStrings_Read_Text, 0, [0], varEmpty); AddSet(TStrings, 'Text', TStrings_Write_Text, 0, [0]); ! {$IFDEF COMPILER3_UP} AddGet(TStrings, 'StringsAdapter', TStrings_Read_StringsAdapter, 0, [0], varEmpty); AddSet(TStrings, 'StringsAdapter', TStrings_Write_StringsAdapter, 0, [0]); ! {$ENDIF COMPILER3_UP} { TDuplicates } AddConst('Classes', 'dupIgnore', Integer(dupIgnore)); *************** *** 1155,1161 **** AddSet(TStream, 'Position', TStream_Write_Position, 0, [0]); AddGet(TStream, 'Size', TStream_Read_Size, 0, [0], varEmpty); ! {$IFDEF Delphi3_Up} AddSet(TStream, 'Size', TStream_Write_Size, 0, [0]); ! {$ENDIF Delphi3_Up} { TFileStream } AddClass('Classes', TFileStream, 'TFileStream'); --- 1155,1161 ---- AddSet(TStream, 'Position', TStream_Write_Position, 0, [0]); AddGet(TStream, 'Size', TStream_Read_Size, 0, [0], varEmpty); ! {$IFDEF COMPILER3_UP} AddSet(TStream, 'Size', TStream_Write_Size, 0, [0]); ! {$ENDIF COMPILER3_UP} { TFileStream } AddClass('Classes', TFileStream, 'TFileStream'); *************** *** 1164,1177 **** AddClass('Classes', TMemoryStream, 'TMemoryStream'); AddGet(TMemoryStream, 'Create', TMemoryStream_Create, 0, [0], varEmpty); ! {$IFDEF Delphi3_Up} ! { TStringStream } ! AddClass('Classes', TStringStream, 'TStringStream'); ! AddGet(TStringStream, 'Create', TStringStream_Create, 1, [varEmpty], varEmpty); ! AddGet(TStringStream, 'Read', TStringStream_Read, 2, [varByRef, varEmpty], varEmpty); ! AddGet(TStringStream, 'ReadString', TStringStream_ReadString, 1, [varEmpty], varEmpty); ! AddGet(TStringStream, 'Seek', TStringStream_Seek, 2, [varEmpty, varEmpty], varEmpty); ! AddGet(TStringStream, 'Write', TStringStream_Write, 2, [varEmpty, varEmpty], varEmpty); ! AddGet(TStringStream, 'WriteString', TStringStream_WriteString, 1, [varEmpty], varEmpty); ! AddGet(TStringStream, 'DataString', TStringStream_Read_DataString, 0, [0], varEmpty); {$ENDIF} { TComponentState } --- 1164,1177 ---- AddClass('Classes', TMemoryStream, 'TMemoryStream'); AddGet(TMemoryStream, 'Create', TMemoryStream_Create, 0, [0], varEmpty); ! {$IFDEF COMPILER3_UP} ! { TJvStringStream } ! AddClass('Classes', TStringStream , 'TStringStream '); ! AddGet(TStringStream , 'Create', TStringStream_Create, 1, [varEmpty], varEmpty); ! AddGet(TStringStream , 'Read', TStringStream_Read, 2, [varByRef, varEmpty], varEmpty); ! AddGet(TStringStream , 'ReadString', TStringStream_ReadString, 1, [varEmpty], varEmpty); ! AddGet(TStringStream , 'Seek', TStringStream_Seek, 2, [varEmpty, varEmpty], varEmpty); ! AddGet(TStringStream , 'Write', TStringStream_Write, 2, [varEmpty, varEmpty], varEmpty); ! AddGet(TStringStream , 'WriteString', TStringStream_WriteString, 1, [varEmpty], varEmpty); ! AddGet(TStringStream , 'DataString', TStringStream_Read_DataString, 0, [0], varEmpty); {$ENDIF} { TComponentState } *************** *** 1194,1208 **** AddGet(TComponent, 'FindComponent', TComponent_FindComponent, 1, [varEmpty], varEmpty); AddGet(TComponent, 'FreeNotification', TComponent_FreeNotification, 1, [varEmpty], varEmpty); ! {$IFDEF Delphi3_Up} AddGet(TComponent, 'FreeOnRelease', TComponent_FreeOnRelease, 0, [0], varEmpty); ! {$ENDIF Delphi3_Up} AddGet(TComponent, 'GetParentComponent', TComponent_GetParentComponent, 0, [0], varEmpty); AddGet(TComponent, 'HasParent', TComponent_HasParent, 0, [0], varEmpty); AddGet(TComponent, 'InsertComponent', TComponent_InsertComponent, 1, [varEmpty], varEmpty); AddGet(TComponent, 'RemoveComponent', TComponent_RemoveComponent, 1, [varEmpty], varEmpty); ! {$IFDEF Delphi3_Up} AddGet(TComponent, 'SafeCallException', TComponent_SafeCallException, 2, [varEmpty, varEmpty], varEmpty); AddGet(TComponent, 'ComObject', TComponent_Read_ComObject, 0, [0], varEmpty); ! {$ENDIF Delphi3_Up} AddIGet(TComponent, 'Components', TComponent_Read_Components, 1, [0], varEmpty); AddGet(TComponent, 'ComponentCount', TComponent_Read_ComponentCount, 0, [0], varEmpty); --- 1194,1208 ---- AddGet(TComponent, 'FindComponent', TComponent_FindComponent, 1, [varEmpty], varEmpty); AddGet(TComponent, 'FreeNotification', TComponent_FreeNotification, 1, [varEmpty], varEmpty); ! {$IFDEF COMPILER3_UP} AddGet(TComponent, 'FreeOnRelease', TComponent_FreeOnRelease, 0, [0], varEmpty); ! {$ENDIF COMPILER3_UP} AddGet(TComponent, 'GetParentComponent', TComponent_GetParentComponent, 0, [0], varEmpty); AddGet(TComponent, 'HasParent', TComponent_HasParent, 0, [0], varEmpty); AddGet(TComponent, 'InsertComponent', TComponent_InsertComponent, 1, [varEmpty], varEmpty); AddGet(TComponent, 'RemoveComponent', TComponent_RemoveComponent, 1, [varEmpty], varEmpty); ! {$IFDEF COMPILER3_UP} AddGet(TComponent, 'SafeCallException', TComponent_SafeCallException, 2, [varEmpty, varEmpty], varEmpty); AddGet(TComponent, 'ComObject', TComponent_Read_ComObject, 0, [0], varEmpty); ! {$ENDIF COMPILER3_UP} AddIGet(TComponent, 'Components', TComponent_Read_Components, 1, [0], varEmpty); AddGet(TComponent, 'ComponentCount', TComponent_Read_ComponentCount, 0, [0], varEmpty); *************** *** 1214,1221 **** AddSet(TComponent, 'DesignInfo', TComponent_Write_DesignInfo, 0, [0]); AddGet(TComponent, 'Owner', TComponent_Read_Owner, 0, [0], varEmpty); ! {$IFDEF Delphi3_Up} AddGet(TComponent, 'VCLComObject', TComponent_Read_VCLComObject, 0, [0], varEmpty); AddSet(TComponent, 'VCLComObject', TComponent_Write_VCLComObject, 0, [0]); ! {$ENDIF Delphi3_Up} AddGet(TComponent, 'Name', TComponent_Read_Name, 0, [0], varEmpty); AddSet(TComponent, 'Name', TComponent_Write_Name, 0, [0]); --- 1214,1221 ---- AddSet(TComponent, 'DesignInfo', TComponent_Write_DesignInfo, 0, [0]); AddGet(TComponent, 'Owner', TComponent_Read_Owner, 0, [0], varEmpty); ! {$IFDEF COMPILER3_UP} AddGet(TComponent, 'VCLComObject', TComponent_Read_VCLComObject, 0, [0], varEmpty); AddSet(TComponent, 'VCLComObject', TComponent_Write_VCLComObject, 0, [0]); ! {$ENDIF COMPILER3_UP} AddGet(TComponent, 'Name', TComponent_Read_Name, 0, [0], varEmpty); AddSet(TComponent, 'Name', TComponent_Write_Name, 0, [0]); Index: JvInterpreter_ComCtrls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/RALib/interpreter/Source/JvInterpreter_ComCtrls.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvInterpreter_ComCtrls.pas 8 Jul 2002 05:33:41 -0000 1.1 --- JvInterpreter_ComCtrls.pas 16 Aug 2002 09:37:41 -0000 1.2 *************** *** 26,32 **** Known Issues: -----------------------------------------------------------------------------} - {$A+,B-,C+,D+,E-,F-,G+,H+,I+,J+,K-,L+,M-,N+,O+,P+,Q-,R-,S-,T-,U-,V+,W-,X+,Y+,Z1} ! {$I JEDI.INC} unit JvInterpreter_ComCtrls; --- 26,32 ---- Known Issues: -----------------------------------------------------------------------------} ! ! {$I JVCL.INC} unit JvInterpreter_ComCtrls; *************** *** 906,910 **** end; ! {$IFDEF Delphi3_Up} { property Read Charset: TFontCharset } procedure TTextAttributes_Read_Charset(var Value: Variant; Args: TArgs); --- 906,910 ---- end; ! {$IFDEF COMPILER3_UP} { property Read Charset: TFontCharset } procedure TTextAttributes_Read_Charset(var Value: Variant; Args: TArgs); *************** *** 918,922 **** TTextAttributes(Args.Obj).Charset := Value; end; ! {$ENDIF Delphi3_Up} { property Read Color: TColor } --- 918,922 ---- TTextAttributes(Args.Obj).Charset := Value; end; ! {$ENDIF COMPILER3_UP} { property Read Color: TColor } *************** *** 1320,1324 **** end; ! {$IFDEF Delphi3_Up} { property Read Checked: Boolean } procedure TListItem_Read_Checked(var Value: Variant; Args: TArgs); --- 1320,1324 ---- end; ! {$IFDEF COMPILER3_UP} { property Read Checked: Boolean } procedure TListItem_Read_Checked(var Value: Variant; Args: TArgs); *************** *** 1332,1336 **** TListItem(Args.Obj).Checked := Value; end; ! {$ENDIF Delphi3_Up} { property Read Cut: Boolean } --- 1332,1336 ---- TListItem(Args.Obj).Checked := Value; end; ! {$ENDIF COMPILER3_UP} { property Read Cut: Boolean } *************** *** 1638,1642 **** end; ! {$IFDEF Delphi3_Up} { property Read Checkboxes: Boolean } procedure TCustomListView_Read_Checkboxes(var Value: Variant; Args: TArgs); --- 1638,1642 ---- end; ! {$IFDEF COMPILER3_UP} { property Read Checkboxes: Boolean } procedure TCustomListView_Read_Checkboxes(var Value: Variant; Args: TArgs); *************** *** 1650,1654 **** TCustomListView(Args.Obj).Checkboxes := Value; end; ! {$ENDIF Delphi3_Up} { property Read Column[Integer]: TListColumn } --- 1650,1654 ---- TCustomListView(Args.Obj).Checkboxes := Value; end; ! {$ENDIF COMPILER3_UP} { property Read Column[Integer]: TListColumn } *************** *** 1670,1674 **** end; ! {$IFDEF Delphi3_Up} { property Read GridLines: Boolean } procedure TCustomListView_Read_GridLines(var Value: Variant; Args: TArgs); --- 1670,1674 ---- end; ! {$IFDEF COMPILER3_UP} { property Read GridLines: Boolean } procedure TCustomListView_Read_GridLines(var Value: Variant; Args: TArgs); *************** *** 1694,1698 **** TCustomListView(Args.Obj).HotTrack := Value; end; ! {$ENDIF Delphi3_Up} { property Read ItemFocused: TListItem } --- 1694,1698 ---- TCustomListView(Args.Obj).HotTrack := Value; end; ! {$ENDIF COMPILER3_UP} { property Read ItemFocused: TListItem } *************** *** 1708,1712 **** end; ! {$IFDEF Delphi3_Up} { property Read RowSelect: Boolean } procedure TCustomListView_Read_RowSelect(var Value: Variant; Args: TArgs); --- 1708,1712 ---- end; ! {$IFDEF COMPILER3_UP} { property Read RowSelect: Boolean } procedure TCustomListView_Read_RowSelect(var Value: Variant; Args: TArgs); *************** *** 1720,1724 **** TCustomListView(Args.Obj).RowSelect := Value; end; ! {$ENDIF Delphi3_Up} { property Read SelCount: Integer } --- 1720,1724 ---- TCustomListView(Args.Obj).RowSelect := Value; end; ! {$ENDIF COMPILER3_UP} { property Read SelCount: Integer } *************** *** 1792,1796 **** end; ! {$IFDEF Delphi3_Up} { TAnimate } --- 1792,1796 ---- end; ! {$IFDEF COMPILER3_UP} { TAnimate } *************** *** 1890,1894 **** TAnimate(Args.Obj).ResName := Value; end; ! {$ENDIF Delphi3_Up} --- 1890,1894 ---- TAnimate(Args.Obj).ResName := Value; end; ! {$ENDIF COMPILER3_UP} *************** *** 2068,2076 **** with JvInterpreterAdapter do begin ! {$IFDEF Delphi3_Up} { TTabPosition } AddConst('ComCtrls', 'tpTop', tpTop); AddConst('ComCtrls', 'tpBottom', tpBottom); ! {$ENDIF Delphi3_Up} { TCustomTabControl } AddClass('ComCtrls', TCustomTabControl, 'TCustomTabControl'); --- 2068,2076 ---- with JvInterpreterAdapter do begin ! {$IFDEF COMPILER3_UP} { TTabPosition } AddConst('ComCtrls', 'tpTop', tpTop); AddConst('ComCtrls', 'tpBottom', tpBottom); ! {$ENDIF COMPILER3_UP} { TCustomTabControl } AddClass('ComCtrls', TCustomTabControl, 'TCustomTabControl'); *************** *** 2316,2323 **** AddGet(TTextAttributes, 'Create', TTextAttributes_Create, 2, [varEmpty, varEmpty], varEmpty); AddGet(TTextAttributes, 'Assign', TTextAttributes_Assign, 1, [varEmpty], varEmpty); ! {$IFDEF Delphi3_Up} AddGet(TTextAttributes, 'Charset', TTextAttributes_Read_Charset, 0, [0], varEmpty); AddSet(TTextAttributes, 'Charset', TTextAttributes_Write_Charset, 0, [0]); ! {$ENDIF Delphi3_Up} AddGet(TTextAttributes, 'Color', TTextAttributes_Read_Color, 0, [0], varEmpty); AddSet(TTextAttributes, 'Color', TTextAttributes_Write_Color, 0, [0]); --- 2316,2323 ---- AddGet(TTextAttributes, 'Create', TTextAttributes_Create, 2, [varEmpty, varEmpty], varEmpty); AddGet(TTextAttributes, 'Assign', TTextAttributes_Assign, 1, [varEmpty], varEmpty); ! {$IFDEF COMPILER3_UP} AddGet(TTextAttributes, 'Charset', TTextAttributes_Read_Charset, 0, [0], varEmpty); AddSet(TTextAttributes, 'Charset', TTextAttributes_Write_Charset, 0, [0]); ! {$ENDIF COMPILER3_UP} AddGet(TTextAttributes, 'Color', TTextAttributes_Read_Color, 0, [0], varEmpty); AddSet(TTextAttributes, 'Color', TTextAttributes_Write_Color, 0, [0]); *************** *** 2438,2445 **** AddGet(TListItem, 'Caption', TListItem_Read_Caption, 0, [0], varEmpty); AddSet(TListItem, 'Caption', TListItem_Write_Caption, 0, [0]); ! {$IFDEF Delphi3_Up} AddGet(TListItem, 'Checked', TListItem_Read_Checked, 0, [0], varEmpty); AddSet(TListItem, 'Checked', TListItem_Write_Checked, 0, [0]); ! {$ENDIF Delphi3_Up} AddGet(TListItem, 'Cut', TListItem_Read_Cut, 0, [0], varEmpty); AddSet(TListItem, 'Cut', TListItem_Write_Cut, 0, [0]); --- 2438,2445 ---- AddGet(TListItem, 'Caption', TListItem_Read_Caption, 0, [0], varEmpty); AddSet(TListItem, 'Caption', TListItem_Write_Caption, 0, [0]); ! {$IFDEF COMPILER3_UP} AddGet(TListItem, 'Checked', TListItem_Read_Checked, 0, [0], varEmpty); AddSet(TListItem, 'Checked', TListItem_Write_Checked, 0, [0]); ! {$ENDIF COMPILER3_UP} AddGet(TListItem, 'Cut', TListItem_Read_Cut, 0, [0], varEmpty); AddSet(TListItem, 'Cut', TListItem_Write_Cut, 0, [0]); *************** *** 2527,2549 **** AddGet(TCustomListView, 'IsEditing', TCustomListView_IsEditing, 0, [0], varEmpty); AddGet(TCustomListView, 'Scroll', TCustomListView_Scroll, 2, [varEmpty, varEmpty], varEmpty); ! {$IFDEF Delphi3_Up} AddGet(TCustomListView, 'Checkboxes', TCustomListView_Read_Checkboxes, 0, [0], varEmpty); AddSet(TCustomListView, 'Checkboxes', TCustomListView_Write_Checkboxes, 0, [0]); ! {$ENDIF Delphi3_Up} AddGet(TCustomListView, 'Column', TCustomListView_Read_Column, 1, [0], varEmpty); AddGet(TCustomListView, 'DropTarget', TCustomListView_Read_DropTarget, 0, [0], varEmpty); AddSet(TCustomListView, 'DropTarget', TCustomListView_Write_DropTarget, 0, [0]); ! {$IFDEF Delphi3_Up} AddGet(TCustomListView, 'GridLines', TCustomListView_Read_GridLines, 0, [0], varEmpty); AddSet(TCustomListView, 'GridLines', TCustomListView_Write_GridLines, 0, [0]); AddGet(TCustomListView, 'HotTrack', TCustomListView_Read_HotTrack, 0, [0], varEmpty); AddSet(TCustomListView, 'HotTrack', TCustomListView_Write_HotTrack, 0, [0]); ! {$ENDIF Delphi3_Up} AddGet(TCustomListView, 'ItemFocused', TCustomListView_Read_ItemFocused, 0, [0], varEmpty); AddSet(TCustomListView, 'ItemFocused', TCustomListView_Write_ItemFocused, 0, [0]); ! {$IFDEF Delphi3_Up} AddGet(TCustomListView, 'RowSelect', TCustomListView_Read_RowSelect, 0, [0], varEmpty); AddSet(TCustomListView, 'RowSelect', TCustomListView_Write_RowSelect, 0, [0]); ! {$ENDIF Delphi3_Up} AddGet(TCustomListView, 'SelCount', TCustomListView_Read_SelCount, 0, [0], varEmpty); AddGet(TCustomListView, 'Selected', TCustomListView_Read_Selected, 0, [0], varEmpty); --- 2527,2549 ---- AddGet(TCustomListView, 'IsEditing', TCustomListView_IsEditing, 0, [0], varEmpty); AddGet(TCustomListView, 'Scroll', TCustomListView_Scroll, 2, [varEmpty, varEmpty], varEmpty); ! {$IFDEF COMPILER3_UP} AddGet(TCustomListView, 'Checkboxes', TCustomListView_Read_Checkboxes, 0, [0], varEmpty); AddSet(TCustomListView, 'Checkboxes', TCustomListView_Write_Checkboxes, 0, [0]); ! {$ENDIF COMPILER3_UP} AddGet(TCustomListView, 'Column', TCustomListView_Read_Column, 1, [0], varEmpty); AddGet(TCustomListView, 'DropTarget', TCustomListView_Read_DropTarget, 0, [0], varEmpty); AddSet(TCustomListView, 'DropTarget', TCustomListView_Write_DropTarget, 0, [0]); ! {$IFDEF COMPILER3_UP} AddGet(TCustomListView, 'GridLines', TCustomListView_Read_GridLines, 0, [0], varEmpty); AddSet(TCustomListView, 'GridLines', TCustomListView_Write_GridLines, 0, [0]); AddGet(TCustomListView, 'HotTrack', TCustomListView_Read_HotTrack, 0, [0], varEmpty); AddSet(TCustomListView, 'HotTrack', TCustomListView_Write_HotTrack, 0, [0]); ! {$ENDIF COMPILER3_UP} AddGet(TCustomListView, 'ItemFocused', TCustomListView_Read_ItemFocused, 0, [0], varEmpty); AddSet(TCustomListView, 'ItemFocused', TCustomListView_Write_ItemFocused, 0, [0]); ! {$IFDEF COMPILER3_UP} AddGet(TCustomListView, 'RowSelect', TCustomListView_Read_RowSelect, 0, [0], varEmpty); AddSet(TCustomListView, 'RowSelect', TCustomListView_Write_RowSelect, 0, [0]); ! {$ENDIF COMPILER3_UP} AddGet(TCustomListView, 'SelCount', TCustomListView_Read_SelCount, 0, [0], varEmpty); AddGet(TCustomListView, 'Selected', TCustomListView_Read_Selected, 0, [0], varEmpty); *************** *** 2559,2563 **** AddClass('ComCtrls', TListView, 'TListView'); AddGet(TListView, 'Create', TListView_Create, 1, [varEmpty], varEmpty); ! {$IFDEF Delphi3_Up} { TCommonAVI } AddConst('ComCtrls', 'aviNone', aviNone); --- 2559,2563 ---- AddClass('ComCtrls', TListView, 'TListView'); AddGet(TListView, 'Create', TListView_Create, 1, [varEmpty], varEmpty); ! {$IFDEF COMPILER3_UP} { TCommonAVI } AddConst('ComCtrls', 'aviNone', aviNone); *************** *** 2588,2592 **** AddGet(TAnimate, 'ResName', TAnimate_Read_ResName, 0, [0], varEmpty); AddSet(TAnimate, 'ResName', TAnimate_Write_ResName, 0, [0]); ! {$ENDIF Delphi3_Up} AddHandler('ComCtrls', 'TTabChangingEvent', TJvInterpreterComCtrlsEvent, @TJvInterpreterComCtrlsEvent.TabChangingEvent); --- 2588,2592 ---- AddGet(TAnimate, 'ResName', TAnimate_Read_ResName, 0, [0], varEmpty); AddSet(TAnimate, 'ResName', TAnimate_Write_ResName, 0, [0]); ! {$ENDIF COMPILER3_UP} AddHandler('ComCtrls', 'TTabChangingEvent', TJvInterpreterComCtrlsEvent, @TJvInterpreterComC... [truncated message content] |