From 8c86bbf0a36a15d7c97b3c61782b0977e33a1149 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Sat, 24 Mar 2018 17:08:06 +0000
Subject: [PATCH] * Moved formatdatetime to conversion category

git-svn-id: trunk@38622 -
---
 packages/fcl-base/src/fpexprpars.pp     | 2 +-
 packages/fcl-base/tests/testexprpars.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/fcl-base/src/fpexprpars.pp b/packages/fcl-base/src/fpexprpars.pp
index 3f8e13960f..32c254edd1 100644
--- a/packages/fcl-base/src/fpexprpars.pp
+++ b/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
diff --git a/packages/fcl-base/tests/testexprpars.pp b/packages/fcl-base/tests/testexprpars.pp
index a7097d8dcc..e46a3a85c1 100644
--- a/packages/fcl-base/tests/testexprpars.pp
+++ b/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);