Browse Source

* Moved formatdatetime to conversion category

git-svn-id: trunk@38622 -
michael 7 years ago
parent
commit
8c86bbf0a3
2 changed files with 2 additions and 2 deletions
  1. 1 1
      packages/fcl-base/src/fpexprpars.pp
  2. 1 1
      packages/fcl-base/tests/testexprpars.pp

+ 1 - 1
packages/fcl-base/src/fpexprpars.pp

@@ -4376,7 +4376,6 @@ begin
       AddFunction(bcDateTime,'shortmonthname','S','I',@BuiltinShortMonthName);
       AddFunction(bcDateTime,'longdayname','S','I',@BuiltinLongDayName);
       AddFunction(bcDateTime,'longmonthname','S','I',@BuiltinLongMonthName);
-      AddFunction(bcDateTime,'formatdatetime','S','SD',@BuiltinFormatDateTime);
       end;
     if bcBoolean in Categories then
       begin
@@ -4409,6 +4408,7 @@ begin
       AddFunction(bcConversion,'strtodatetime','D','S',@BuiltInStrToDateTime);
       AddFunction(bcConversion,'strtodatetimedef','D','SD',@BuiltInStrToDateTimeDef);
       AddFunction(bcConversion,'formatfloat','S','SF',@BuiltInFormatFloat);
+      AddFunction(bcDateTime,'formatdatetime','S','SD',@BuiltinFormatDateTime);
       end;
     if bcAggregate in Categories then
       begin

+ 1 - 1
packages/fcl-base/tests/testexprpars.pp

@@ -6033,7 +6033,6 @@ begin
   AssertFunction('shortmonthname','S','I',bcDateTime);
   AssertFunction('longdayname','S','I',bcDateTime);
   AssertFunction('longmonthname','S','I',bcDateTime);
-  AssertFunction('formatdatetime','S','SD',bcDateTime);
   AssertFunction('shl','I','II',bcBoolean);
   AssertFunction('shr','I','II',bcBoolean);
   AssertFunction('IFS','S','BSS',bcBoolean);
@@ -6058,6 +6057,7 @@ begin
   AssertFunction('strtodatetime','D','S',bcConversion);
   AssertFunction('strtodatetimedef','D','SD',bcConversion);
   AssertFunction('formatfloat','S','SF',bcConversion);
+  AssertFunction('formatdatetime','S','SD',bcConversion);
   AssertFunction('sum','F','F',bcAggregate);
   AssertFunction('count','I','',bcAggregate);
   AssertFunction('avg','F','F',bcAggregate);