From 9e3fe580b5f626316c65be71e4ca72297a8a9cec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= <druzus@poczta.onet.pl>
Date: Fri, 8 Jan 2016 12:13:52 +0100
Subject: [PATCH] 2016-01-08 12:13 UTC+0100 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * contrib/hbfoxpro/hbfoxpro.ch     + added new
 PP rules suggested by Jeff Stone for THIS., .NULL. and CD

  * contrib/hbfoxpro/hbfoxpro.hbx
  * contrib/hbfoxpro/misc.prg
  * contrib/hbfoxpro/miscfunc.c
    + added new functions Id(), Program() and LineNo()
    + added SYS( 1 ), SYS( 11 ), SYS( 2003 )
    ! fixed SYS( 10 ) to return date as character string
---
 ChangeLog.txt                 | 11 +++++++++++
 contrib/hbfoxpro/hbfoxpro.ch  |  5 ++++-
 contrib/hbfoxpro/hbfoxpro.hbx |  3 +++
 contrib/hbfoxpro/misc.prg     | 21 ++++++++++++++++-----
 contrib/hbfoxpro/miscfunc.c   |  2 ++
 5 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a9995c648e..696dd336e8 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,17 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2016-01-08 12:13 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * contrib/hbfoxpro/hbfoxpro.ch
+    + added new PP rules suggested by Jeff Stone for THIS., .NULL. and CD
+
+  * contrib/hbfoxpro/hbfoxpro.hbx
+  * contrib/hbfoxpro/misc.prg
+  * contrib/hbfoxpro/miscfunc.c
+    + added new functions Id(), Program() and LineNo()
+    + added SYS( 1 ), SYS( 11 ), SYS( 2003 )
+    ! fixed SYS( 10 ) to return date as character string
+
 2016-01-07 12:16 UTC-0800 Pritpal Bedi (bedipritpal/at/hotmail.com)
   * contrib/gtwvg/wvgcore.c 
   * contrib/gtwvg/wvgcuig.c
diff --git a/contrib/hbfoxpro/hbfoxpro.ch b/contrib/hbfoxpro/hbfoxpro.ch
index 111d491005..71d069934e 100644
--- a/contrib/hbfoxpro/hbfoxpro.ch
+++ b/contrib/hbfoxpro/hbfoxpro.ch
@@ -53,7 +53,10 @@
 
 /* messages in FP */
 #xtranslate .<!msg!> => :<msg>
+#translate THIS. => Self:
 
+/* Harbour does not support NULL */
+#xtranslate .NULL. => NIL
 
 /* array declarations */
 #xtranslate __FP_DIM( <exp> ) => <exp>
@@ -118,6 +121,6 @@
 #command EJECT PAGE => __Eject()
 #command FLUSH      => DbCommitAll()
 #command REGIONAL [<defs,...>] => LOCAL <defs>
-
+#command CD <(path)> => hb_cwd( <(path)> )
 
 #endif /* HBFOXPRO_CH_ */
diff --git a/contrib/hbfoxpro/hbfoxpro.hbx b/contrib/hbfoxpro/hbfoxpro.hbx
index ff752e76ce..8b29644ced 100644
--- a/contrib/hbfoxpro/hbfoxpro.hbx
+++ b/contrib/hbfoxpro/hbfoxpro.hbx
@@ -26,12 +26,15 @@ DYNAMIC Filter
 DYNAMIC fox_At
 DYNAMIC fox___DynCall
 DYNAMIC FSize
+DYNAMIC Id
 DYNAMIC InsMode
 DYNAMIC Key
+DYNAMIC LineNo
 DYNAMIC NDX
 DYNAMIC Occurs
 DYNAMIC Parameters
 DYNAMIC PrintStatus
+DYNAMIC Program
 DYNAMIC Relation
 DYNAMIC SCols
 DYNAMIC SRows
diff --git a/contrib/hbfoxpro/misc.prg b/contrib/hbfoxpro/misc.prg
index a4bc7e2fe2..7accaea1d8 100644
--- a/contrib/hbfoxpro/misc.prg
+++ b/contrib/hbfoxpro/misc.prg
@@ -54,7 +54,9 @@ FUNCTION Sys( nValue, xPar1 )
 
    SWITCH nValue
    CASE 0
-      RETURN NetName() + " # " + hb_UserName()
+      RETURN Id()
+   CASE 1
+      RETURN hb_ntos( Date() - CToD( "" ) )
    CASE 2
       RETURN hb_ntos( Seconds() )
    CASE 5
@@ -62,8 +64,11 @@ FUNCTION Sys( nValue, xPar1 )
    CASE 6
       RETURN Set( _SET_PRINTFILE )
    CASE 10
-      hb_default( @xPar1, 0 )
-      RETURN CToD( "" ) + xPar1
+      RETURN DToC( CToD( "" ) + hb_defaultValue( xPar1, 0 ) )
+   CASE 11
+      RETURN hb_ntos( iif( HB_ISDATETIME( xPar1 ), xPar1, ;
+                           iif( HB_ISSTRING( xPar1 ), CToD( xPar1 ), ;
+                           Date() ) ) - CToD( "" ) )
    CASE 100
       RETURN iif( Set( _SET_CONSOLE ), "ON", "OFF" )
    CASE 101
@@ -71,19 +76,25 @@ FUNCTION Sys( nValue, xPar1 )
    CASE 102
       RETURN iif( Set( _SET_PRINTER ), "ON", "OFF" )
    CASE 2002
-      hb_default( @xPar1, SC_NONE )
-      RETURN SetCursor( xPar1 )
+      RETURN SetCursor( hb_defaultValue( xPar1, SC_NONE ) )
+   CASE 2003
+      RETURN CurDir()
    CASE 2011
       RETURN iif( ! dbInfo( DBOI_SHARED ),     "Exclusive", ;
              iif( dbInfo( DBI_ISFLOCK ),       "File locked", ;
              iif( dbRecordInfo( DBRI_LOCKED ), "Record locked", ;
                                                "Not locked" ) ) )
+   CASE 2020
+      RETURN hb_DiskSpace( Set( _SET_DEFAULT ) )
    OTHERWISE
       /* Throw RTE? */
    ENDSWITCH
 
    RETURN NIL
 
+FUNCTION Id()
+   RETURN NetName() + " # " + hb_UserName()
+
 STATIC FUNCTION AFillNested( aValue, xVal )
 
    LOCAL item
diff --git a/contrib/hbfoxpro/miscfunc.c b/contrib/hbfoxpro/miscfunc.c
index 5bb5e359ce..4b65258b1a 100644
--- a/contrib/hbfoxpro/miscfunc.c
+++ b/contrib/hbfoxpro/miscfunc.c
@@ -55,3 +55,5 @@ HB_FUNC_TRANSLATE( SCOLS, MAXCOL )
 HB_FUNC_TRANSLATE( VARREAD, READVAR )
 HB_FUNC_TRANSLATE( PRINTSTATUS, ISPRINTER )
 HB_FUNC_TRANSLATE( KEY, INDEXKEY )
+HB_FUNC_TRANSLATE( PROGRAM, PROCNAME )
+HB_FUNC_TRANSLATE( LINENO, PROCLINE )