From 64df3503f31f160a752b2ec5c75e6b88cc3566e7 Mon Sep 17 00:00:00 2001 From: lacak Date: Tue, 15 Oct 2013 13:00:58 +0000 Subject: [PATCH] fcl-db: dbase: rename new TLargeIntegerConstant to TLargeIntConstant to align naming with existing identifiers like etLargeInt and TLargeIntVariable git-svn-id: trunk@25791 - --- packages/fcl-db/src/dbase/dbf_prscore.pas | 4 ++-- packages/fcl-db/src/dbase/dbf_prsdef.pas | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/fcl-db/src/dbase/dbf_prscore.pas b/packages/fcl-db/src/dbase/dbf_prscore.pas index 0c5c817d55..a4be997c89 100644 --- a/packages/fcl-db/src/dbase/dbf_prscore.pas +++ b/packages/fcl-db/src/dbase/dbf_prscore.pas @@ -497,10 +497,10 @@ begin etFloat: ExprWord := TFloatConstant.CreateAsDouble(EmptyStr, PDouble(FExpResult)^); etInteger: ExprWord := TIntegerConstant.Create(PInteger(FExpResult)^); {$ifdef SUPPORT_INT64} - etLargeInt:ExprWord := TLargeIntegerConstant.Create(PInt64(FExpResult)^); + etLargeInt:ExprWord := TLargeIntConstant.Create(PInt64(FExpResult)^); {$endif} etString: ExprWord := TStringConstant.Create(FExpResult); - else raise EparserException.CreateFmt('No support for resulttype %d. Please fix the TDBF code.',[ResultType]); + else raise EParserException.CreateFmt('No support for resulttype %d. Please fix the TDBF code.',[ResultType]); end; // fill in structure diff --git a/packages/fcl-db/src/dbase/dbf_prsdef.pas b/packages/fcl-db/src/dbase/dbf_prsdef.pas index 467c1cbdfd..c8a89dd918 100644 --- a/packages/fcl-db/src/dbase/dbf_prsdef.pas +++ b/packages/fcl-db/src/dbase/dbf_prsdef.pas @@ -201,9 +201,7 @@ type end; {$ifdef SUPPORT_INT64} - { TLargeIntegerConstant } - - TLargeIntegerConstant = class(TConstant) + TLargeIntConstant = class(TConstant) private FValue: Int64; public @@ -647,16 +645,16 @@ begin end; {$ifdef SUPPORT_INT64} -{ TLargeIntegerConstant } +{ TLargeIntConstant } -constructor TLargeIntegerConstant.Create(AValue: Int64); +constructor TLargeIntConstant.Create(AValue: Int64); begin inherited Create(IntToStr(AValue), etLargeInt, _LargeIntVariable); FValue := AValue; end; -function TLargeIntegerConstant.AsPointer: PChar; +function TLargeIntConstant.AsPointer: PChar; begin Result := PChar(@FValue); end;