fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-11-11 00:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* include/std.ch
     * Removed HB_EXTENSION guard from around SET commands 
       implementing Harbour _SET_* extensions. The reason: 
       _SET_* extensions are not marked as extensions (and 
       it would be nearly impossibly to do so), so it's more 
       consistent to behave the same way for their command 
       counterparts.

   * utils/hbpp/hbpplib.c
     ! Removed HB_EXTENSION guard from around __PP*() functions 
       which are Harbour undocumented ones, so they don't need to 
       be guarded. We're also in sync with hbextern.ch now.

   * utils/hbtest/rt_stra.prg
     ! Removed HB_EXTENSION guard from around hb_ValToStr() calls, 
       because this function is no longer marked as HB_EXTENSION.

   * contrib/hgf/os2pm/tmenu.prg
   * contrib/hgf/os2pm/tmenuitm.prg
   * contrib/hgf/gtk/shared.ch
   * contrib/hgf/gtk/dispatch.c
   * contrib/hgf/gtk/creamenu.c
   * contrib/hgf/gtk/msginfo.c
   * contrib/hgf/gtk/creabutt.c
   * contrib/hgf/gtk/general.c
   * contrib/hgf/gtk/creawin.c
   * contrib/hgf/gtk/harbgtk.h
   * contrib/hgf/gtk/menuitem.prg
   * contrib/hgf/win32/button.prg
   * contrib/hgf/win32/edit.prg
   * contrib/hgf/win32/form.prg
   * contrib/hgf/win32/menu.prg
   * contrib/hgf/win32/menuitem.prg
   * contrib/hgf/win32/winctrl.prg
   * contrib/hgf/tests/bld_b32.bat
   * contrib/hgf/tests/form2.prg
   * contrib/hgf/tests/form3.prg
   * contrib/hgf/tests/form3.hbf
   * contrib/hgf/tests/form3res.prg
   * contrib/hgf/tests/formtext.prg
   * contrib/hgf/tests/testctrl.prg
   * contrib/hgf/tests/testform.prg
     ! Fixed bld_b32.bat to link properly.
     ! Changed HBMenuItem CLASS to HGFMenuItem() to not collide with 
       Harbour class HBMenuItem() (C53 compatibility class).
     ; The above reported by Petr Chornyj.
     ! Added CRLF at the end of each source file where there was none.
     ! Fixed version headers.
     ; TOFIX1: HBPersistent():LoadFromFile() has a bug where it doesn't 
               load the last line if it doesn't end with newline.
     ; TOFIX2: HBPersistent() uses At() "dirty" extension.

   * contrib/odbc/test/odbcdemo.prg
   - contrib/odbc/test/browodbc.prg
   * contrib/odbc/test/odbccall.prg
   * contrib/odbc/test/testodbc.prg
   * contrib/odbc/common.mak
   + contrib/odbc/browodbc.prg
     ! Moved back browodbc.prg to /contrib/odbc (since it was not a test, 
       just missing from the non-GNU make files)
       Reported by Petr Chornyj.
     ! Added browodbc.prg to non-GNU makefile.
     ! Added version headers.
This commit is contained in:
Viktor Szakats
2007-11-10 23:48:48 +00:00
parent 6e47dd35f5
commit 0ebb791450
34 changed files with 170 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
harbour/ChangeLog
View File

@@ -8,6 +8,71 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2007-11-11 00:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* include/std.ch
* Removed HB_EXTENSION guard from around SET commands
implementing Harbour _SET_* extensions. The reason:
_SET_* extensions are not marked as extensions (and
it would be nearly impossibly to do so), so it's more
consistent to behave the same way for their command
counterparts.
* utils/hbpp/hbpplib.c
! Removed HB_EXTENSION guard from around __PP*() functions
which are Harbour undocumented ones, so they don't need to
be guarded. We're also in sync with hbextern.ch now.
* utils/hbtest/rt_stra.prg
! Removed HB_EXTENSION guard from around hb_ValToStr() calls,
because this function is no longer marked as HB_EXTENSION.
* contrib/hgf/os2pm/tmenu.prg
* contrib/hgf/os2pm/tmenuitm.prg
* contrib/hgf/gtk/shared.ch
* contrib/hgf/gtk/dispatch.c
* contrib/hgf/gtk/creamenu.c
* contrib/hgf/gtk/msginfo.c
* contrib/hgf/gtk/creabutt.c
* contrib/hgf/gtk/general.c
* contrib/hgf/gtk/creawin.c
* contrib/hgf/gtk/harbgtk.h
* contrib/hgf/gtk/menuitem.prg
* contrib/hgf/win32/button.prg
* contrib/hgf/win32/edit.prg
* contrib/hgf/win32/form.prg
* contrib/hgf/win32/menu.prg
* contrib/hgf/win32/menuitem.prg
* contrib/hgf/win32/winctrl.prg
* contrib/hgf/tests/bld_b32.bat
* contrib/hgf/tests/form2.prg
* contrib/hgf/tests/form3.prg
* contrib/hgf/tests/form3.hbf
* contrib/hgf/tests/form3res.prg
* contrib/hgf/tests/formtext.prg
* contrib/hgf/tests/testctrl.prg
* contrib/hgf/tests/testform.prg
! Fixed bld_b32.bat to link properly.
! Changed HBMenuItem CLASS to HGFMenuItem() to not collide with
Harbour class HBMenuItem() (C53 compatibility class).
; The above reported by Petr Chornyj.
! Added CRLF at the end of each source file where there was none.
! Fixed version headers.
; TOFIX1: HBPersistent():LoadFromFile() has a bug where it doesn't
load the last line if it doesn't end with newline.
; TOFIX2: HBPersistent() uses At() "dirty" extension.
* contrib/odbc/test/odbcdemo.prg
- contrib/odbc/test/browodbc.prg
* contrib/odbc/test/odbccall.prg
* contrib/odbc/test/testodbc.prg
* contrib/odbc/common.mak
+ contrib/odbc/browodbc.prg
! Moved back browodbc.prg to /contrib/odbc (since it was not a test,
just missing from the non-GNU make files)
Reported by Petr Chornyj.
! Added browodbc.prg to non-GNU makefile.
! Added version headers.
2007-11-10 18:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* Makefile
- samples
@@ -304,7 +369,7 @@
2007-11-09 15:20 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* source/compiler/hbcomp.c
! Changed error messaged to go to stderr on non-Unix
! Changed error messages to go to stderr on non-Unix
platforms too. With this change the Harbour compiler
uses the same output on non-Unix platforms as on Unixes.
With Przemek's previous and now this change, the
@@ -327,9 +392,6 @@
* contrib/libct/ctstrfil.c
! Fixed MSVC warnings.
* contrib/libct/make_b32.bat
* contrib/libct/make_vc.bat
* contrib/htmllib/Makefile.bc
* Changed to not generate .ppo output on build.

2
harbour/contrib/hgf/gtk/creabutt.c
View File

@@ -1,5 +1,5 @@
/*
* $"Id"$
* $Id$
*/
/*

2
harbour/contrib/hgf/gtk/creamenu.c
View File

@@ -1,5 +1,5 @@
/*
* $"Id"$
* $Id$
*/
/*

2
harbour/contrib/hgf/gtk/creawin.c
View File

@@ -1,5 +1,5 @@
/*
* $"Id"$
* $Id$
*/
/*

2
harbour/contrib/hgf/gtk/dispatch.c
View File

@@ -1,5 +1,5 @@
/*
* $"Id"$
* $Id$
*/
/*

2
harbour/contrib/hgf/gtk/general.c
View File

@@ -1,5 +1,5 @@
/*
* $"Id"$
* $Id$
*/
/*

2
harbour/contrib/hgf/gtk/harbgtk.h
View File

@@ -1,5 +1,5 @@
/*
* $"Id"$
* $Id$
*/
/*

10
harbour/contrib/hgf/gtk/menuitem.prg
View File

@@ -5,7 +5,7 @@
/*
* Harbour Project source code:
* Harbour GUI framework for Gtk
* Class HBMenuItem
* Class HGFMenuItem
*
* Copyright 2001 Antonio Linares <alinares@fivetech.com>
* www - http://www.harbour-project.org
@@ -61,7 +61,7 @@
/* ********************************************************************* */
CLASS HBMenuItem FROM HBPersistent
CLASS HGFMenuItem FROM HBPersistent
DATA Caption INIT "" PROPERTY // Specifies the text of the menu item
DATA Name PROPERTY // The name of this component
@@ -86,7 +86,7 @@ ENDCLASS
/* ********************************************************************* */
METHOD New( oOwner ) CLASS HBMenuItem
METHOD New( oOwner ) CLASS HGFMenuItem
::nId := ::nIdStart++
IF oOwner != nil
@@ -99,7 +99,7 @@ RETURN Self
/* ********************************************************************* */
METHOD Add( oMenuItem ) CLASS HBMenuItem
METHOD Add( oMenuItem ) CLASS HGFMenuItem
/* required because of a stupid Harbour compiler error */
LOCAL nHandle := ::nHandle
@@ -115,7 +115,7 @@ RETURN nil
/* ********************************************************************* */
METHOD FindItem( nId ) CLASS HBMenuItem
METHOD FindItem( nId ) CLASS HGFMenuItem
LOCAL oMenuItem, n
FOR n = 1 TO Len( ::Items )

2
harbour/contrib/hgf/gtk/msginfo.c
View File

@@ -1,5 +1,5 @@
/*
* $"Id"$
* $Id$
*/
/*

2
harbour/contrib/hgf/gtk/shared.ch
View File

@@ -1,5 +1,5 @@
/*
* $"Id"$
* $Id$
*/
/*

2
harbour/contrib/hgf/os2pm/tmenu.prg
View File

@@ -107,5 +107,3 @@ METHOD FindItem( nId ) CLASS HBMenu
next
return oMenuItem

13
harbour/contrib/hgf/os2pm/tmenuitm.prg
View File

@@ -2,7 +2,6 @@
* $Id$
*/
/*
* Harbour Project source code:
* Harbour GUI framework for IBM OS/2 Presentation Manager
@@ -58,8 +57,7 @@
#include "os2pm.ch"
CLASS HBMenuItem FROM HBPersistent
CLASS HGFMenuItem FROM HBPersistent
DATA Caption PROPERTY // Specifies the text of the menu item
DATA Name PROPERTY // The name of this component
@@ -80,7 +78,7 @@ CLASS HBMenuItem FROM HBPersistent
ENDCLASS
METHOD New( oOwner ) CLASS HBMenuItem
METHOD New( oOwner ) CLASS HGFMenuItem
DEFAULT ::nIdStart TO 110
@@ -93,7 +91,7 @@ METHOD New( oOwner ) CLASS HBMenuItem
return Self
METHOD Add( oMenuItem ) CLASS HBMenuItem
METHOD Add( oMenuItem ) CLASS HGFMenuItem
DEFAULT ::Items TO {}
@@ -111,7 +109,7 @@ METHOD Add( oMenuItem ) CLASS HBMenuItem
return nil
METHOD FindItem( nId ) CLASS HBMenuItem
METHOD FindItem( nId ) CLASS HGFMenuItem
local oMenuItem, n
@@ -128,6 +126,3 @@ METHOD FindItem( nId ) CLASS HBMenuItem
next
return oMenuItem

46
harbour/contrib/hgf/tests/bld_b32.bat
View File

@@ -1,25 +1,25 @@
@rem
@rem $Id$
@rem
@echo off
rem
rem $Id$
rem
@ECHO OFF
CLS
if A%1 == A GOTO :SINTAX
if A%1 == A GOTO :SYNTAX
if NOT EXIST %1.prg GOTO :NOEXIST
ECHO Compiling...
set hdir=..\..\..
set bcdir=c:\bcc55\bin
set bcdir=C:\bcc55\bin
%hdir%\bin\harbour %1 /n /p /i..\include;%hdir%\include %2 %3 > comp.log
@type comp.log
%hdir%\bin\harbour %1 /n /p /i..\include;%hdir%\include %2 %3 > bld_b32.log
type bld_b32.log
IF ERRORLEVEL 1 PAUSE
IF ERRORLEVEL 1 GOTO EXIT
echo -O2 -e%1.exe -I%hdir%\include %1.c > b32.bc
%bcdir%\bcc32 -M -c @b32.bc
%BCDIR%\bcc32 -M -c @b32.bc
:ENDCOMPILE
echo c0w32.obj + > b32.bc
@@ -37,28 +37,30 @@ echo %hdir%\lib\dbfcdx.lib + >> b32.bc
echo %hdir%\lib\debug.lib + >> b32.bc
echo %hdir%\lib\common.lib + >> b32.bc
echo %hdir%\lib\pp.lib + >> b32.bc
echo %hdir%\lib\hbsix.lib + >> b32.bc
echo %hdir%\lib\dbffpt.lib + >> b32.bc
echo %hdir%\lib\hgfwin32.lib + >> b32.bc
rem Uncomment these two lines to use Advantage RDD
rem echo %hdir%\lib\rddads.lib + >> b32.bc
rem echo %hdir%\lib\ace32.lib + >> b32.bc
echo %bcdir%\lib\cw32.lib + >> b32.bc
echo %bcdir%\lib\import32.lib, >> b32.bc
echo %BCDIR%\lib\cw32.lib + >> b32.bc
echo %BCDIR%\lib\import32.lib, >> b32.bc
ECHO *
ECHO Linking...
rem Use these flags to avoid the console window creation
rem %bcdir%\ilink32 -Gn -aa -Tpe -s @b32.bc
%bcdir%\ilink32 -Gn -Tpe -s @b32.bc
rem %BCDIR%\ilink32 -Gn -aa -Tpe -s @b32.bc
%BCDIR%\ilink32 -Gn -Tpe -s @b32.bc
rem delete temporary files
@del %1.c
@del b32.bc
@del comp.log
@del %1.map
@del %1.obj
@del %1.tds
del %1.c
del b32.bc
del bld_b32.log
del %1.map
del %1.obj
del %1.tds
IF ERRORLEVEL 1 GOTO LINKERROR
ECHO * Application successfully built
@@ -71,11 +73,11 @@ rem if exist meminfo.txt notepad meminfo.txt
rem PAUSE * Linking errors *
GOTO EXIT
:SINTAX
ECHO SYNTAX: Build [Program] {-- Don't specify .PRG extension
:SYNTAX
ECHO SYNTAX: Build [Program] {-- Don't specify .prg extension
GOTO EXIT
:NOEXIST
ECHO The specified PRG %1 does not exist
:EXIT
:EXIT

6
harbour/contrib/hgf/tests/form2.prg
View File

@@ -32,13 +32,13 @@ METHOD New() CLASS HBForm2
oMenu = HBMenu():New( Self )
oMenuItem = HBMenuItem():New( oMenu )
oMenuItem = HGFMenuItem():New( oMenu )
oMenuitem:Caption = "Test"
oMenuitem:Name = "Test"
oMenuItem:OnClick = "TestClick" // The container method to execute
oMenu:Add( oMenuItem )
oMenuItem = HBMenuItem():New( oMenu )
oMenuItem = HGFMenuItem():New( oMenu )
oMenuitem:Caption = "Exit"
oMenuitem:Name = "Exit"
oMenuItem:OnClick = "ExitClick" // The container method to execute
@@ -53,4 +53,4 @@ METHOD TestClick( oSender ) CLASS HBForm2
MsgInfo( "This event has been fired by a " + oSender:ClassName() + " object",;
"Welcome to Harbour GUI power" )
return nil
return nil

2
harbour/contrib/hgf/tests/form3.hbf
View File

@@ -7,4 +7,4 @@ OBJECT oForm3 AS HBForm3
::Height = 250
::OnClick = "FormClick"
ENDOBJECT
ENDOBJECT

2
harbour/contrib/hgf/tests/form3.prg
View File

@@ -28,4 +28,4 @@ METHOD New() CLASS HBForm3
#include "form3.hbf" // Notice this is just a persistence ascii file
// renamed as .hbf = Harbour form
return Self
return Self

2
harbour/contrib/hgf/tests/form3res.prg
View File

@@ -19,4 +19,4 @@ CLASS HBForm3 FROM HBForm
METHOD FormClick( oSender, nX, nY ) INLINE MsgInfo( "Click" )
ENDCLASS
ENDCLASS

6
harbour/contrib/hgf/tests/formtext.prg
View File

@@ -36,13 +36,13 @@ METHOD New() CLASS HBForm2
oMenu = HBMenu():New( Self )
oMenuItem = HBMenuItem():New( oMenu )
oMenuItem = HGFMenuItem():New( oMenu )
oMenuitem:Caption = "View as Text"
oMenuitem:Name = "ViewAsText"
oMenuItem:OnClick = "ViewAsTextClick" // The container method to execute
oMenu:Add( oMenuItem )
oMenuItem = HBMenuItem():New( oMenu )
oMenuItem = HGFMenuItem():New( oMenu )
oMenuitem:Caption = "Exit"
oMenuitem:Name = "Exit"
oMenuItem:OnClick = "ExitClick" // The container method to execute
@@ -57,4 +57,4 @@ METHOD Form2Click( oSender, nXPos, nYPos ) CLASS HBForm2
MsgInfo( "Click at " + AllTrim( Str( nXPos ) ) + ", " + ;
AllTrim( Str( nYPos ) ) )
return nil
return nil

2
harbour/contrib/hgf/tests/testctrl.prg
View File

@@ -55,4 +55,4 @@ CLASS HBFormControls FROM HBForm
METHOD BtnOkClick( oSender ) INLINE MsgInfo( "Ok was pressed" )
METHOD BtnCancelClick( oSender ) INLINE MsgInfo( "Cancel was pressed" )
ENDCLASS
ENDCLASS

16
harbour/contrib/hgf/tests/testform.prg
View File

@@ -10,31 +10,31 @@ function Main()
local oMenu := HBMenu():New( oForm )
local oMenuItem, oSubItem, oSubItem2
oMenuItem = HBMenuItem():New( oMenu )
oMenuItem = HGFMenuItem():New( oMenu )
oMenuItem:Caption = "One"
oMenu:Add( oMenuItem )
oSubItem = HBMenuItem():New( oMenuItem )
oSubItem = HGFMenuItem():New( oMenuItem )
oSubItem:Caption = "First"
oMenuItem:Add( oSubItem )
oSubItem = HBMenuItem():New( oMenuItem )
oSubItem = HGFMenuItem():New( oMenuItem )
oSubItem:Caption = "Second"
oMenuItem:Add( oSubItem )
oSubItem2 = HBMenuItem():New( oSubItem )
oSubItem2 = HGFMenuItem():New( oSubItem )
oSubItem2:Caption = "Some"
oSubItem:Add( oSubItem2 )
oSubItem2 = HBMenuItem():New( oSubItem )
oSubItem2 = HGFMenuItem():New( oSubItem )
oSubItem2:Caption = "More"
oSubItem:Add( oSubItem2 )
oMenuItem = HBMenuItem():New( oMenu )
oMenuItem = HGFMenuItem():New( oMenu )
oMenuItem:Caption = "Two"
oMenu:Add( oMenuItem )
oMenuItem = HBMenuItem():New( oMenu )
oMenuItem = HGFMenuItem():New( oMenu )
oMenuItem:Caption = "Three"
oMenu:Add( oMenuItem )
@@ -44,4 +44,4 @@ function Main()
oForm:ShowModal()
return nil
return nil

2
harbour/contrib/hgf/win32/button.prg
View File

@@ -70,4 +70,4 @@ METHOD New( oContainer ) CLASS HBButton
::Width = 80
::Height = 25
return Self
return Self

2
harbour/contrib/hgf/win32/edit.prg
View File

@@ -68,4 +68,4 @@ METHOD New( oContainer ) CLASS HBEdit
::Width = 121
::Height = 21
return Self
return Self

2
harbour/contrib/hgf/win32/form.prg
View File

@@ -181,4 +181,4 @@ function HB_GUI( hWnd, nMsg, nParam1, nParam2 ) // messages entry point
aReturn[ 1 ] = aForms[ nForm ]:HandleEvent( nMsg, nParam1, nParam2 )
endif
return aReturn
return aReturn

2
harbour/contrib/hgf/win32/menu.prg
View File

@@ -101,4 +101,4 @@ METHOD FindItem( nId ) CLASS HBMenu
endif
next
return oMenuItem
return oMenuItem

12
harbour/contrib/hgf/win32/menuitem.prg
View File

@@ -5,7 +5,7 @@
/*
* Harbour Project source code:
* Harbour GUI framework for Win32
* Class HBMenuItem
* Class HGFMenuItem
*
* Copyright 2001 Antonio Linares <alinares@fivetech.com>
* www - http://www.harbour-project.org
@@ -54,7 +54,7 @@
#include "common.ch"
#include "hbclass.ch"
CLASS HBMenuItem FROM HBPersistent
CLASS HGFMenuItem FROM HBPersistent
DATA Caption PROPERTY // Specifies the text of the menu item
DATA Name PROPERTY // The name of this component
@@ -74,7 +74,7 @@ CLASS HBMenuItem FROM HBPersistent
ENDCLASS
METHOD New( oOwner ) CLASS HBMenuItem
METHOD New( oOwner ) CLASS HGFMenuItem
DEFAULT ::nIdStart TO 110
@@ -85,7 +85,7 @@ METHOD New( oOwner ) CLASS HBMenuItem
return Self
METHOD Add( oMenuItem ) CLASS HBMenuItem
METHOD Add( oMenuItem ) CLASS HGFMenuItem
DEFAULT ::Items TO {}
DEFAULT ::nHandle TO WinCreateSubMenu( ::oParent:nHandle, ::nId )
@@ -98,7 +98,7 @@ METHOD Add( oMenuItem ) CLASS HBMenuItem
return nil
METHOD FindItem( nId ) CLASS HBMenuItem
METHOD FindItem( nId ) CLASS HGFMenuItem
local oMenuItem, n
@@ -114,4 +114,4 @@ METHOD FindItem( nId ) CLASS HBMenuItem
endif
next
return oMenuItem
return oMenuItem

2
harbour/contrib/hgf/win32/winctrl.prg
View File

@@ -85,4 +85,4 @@ CLASS HBWinControl FROM HBPersistent
METHOD Show() INLINE ShowWindow( ::hWnd, SW_SHOWNA )
ENDCLASS
ENDCLASS

0
harbour/contrib/odbc/test/browodbc.prg → harbour/contrib/odbc/browodbc.prg
View File

1
harbour/contrib/odbc/common.mak
View File

@@ -13,6 +13,7 @@ LIB_PATH = $(LIB_DIR)\$(LIBNAME)$(LIBEXT)
LIB_OBJS = \
$(OBJ_DIR)\odbc$(OBJEXT) \
$(OBJ_DIR)\todbc$(OBJEXT) \
$(OBJ_DIR)\browodbc$(OBJEXT) \
all: \
$(LIB_PATH) \

4
harbour/contrib/odbc/test/odbccall.prg
View File

@@ -1,3 +1,7 @@
/*
* $Id$
*/
#xcommand WITH <oObject> DO => Self := <oObject>
#xcommand ENDWITH => Self := NIL

3
harbour/contrib/odbc/test/odbcdemo.prg
View File

@@ -1,3 +1,6 @@
/*
* $Id$
*/
*+--------------------------------------------------------------------
*+

4
harbour/contrib/odbc/test/testodbc.prg
View File

@@ -1,3 +1,7 @@
/*
* $Id$
*/
#include "sql.ch"
#xcommand GET ROW <nRow> INTO <cVar> => ;

23
harbour/include/std.ch
View File

@@ -667,17 +667,16 @@
#endif /* HB_COMPAT_C53 */
#ifdef HB_EXTENSION
#command SET FILECASE <(x)> => Set( _SET_FILECASE, <(x)> )
#command SET FILECASE (<x>) => Set( _SET_FILECASE, <x> )
#command SET DIRCASE <(x)> => Set( _SET_DIRCASE, <(x)> )
#command SET DIRCASE (<x>) => Set( _SET_DIRCASE, <x> )
#command SET DIRSEPARATOR <x> => Set( _SET_DIRSEPARATOR, <x> )
#command SET DBFLOCKSCHEME TO <x> => Set( _SET_DBFLOCKSCHEME, <x> )
#command SET DBFLOCKSCHEME TO => Set( _SET_DBFLOCKSCHEME, 0 )
#command SET HARDCOMMIT <x:ON,OFF,&> => Set( _SET_HARDCOMMIT, <(x)> )
#command SET HARDCOMMIT (<x>) => Set( _SET_HARDCOMMIT, <x> )
#command SET EOL <x> => Set( _SET_EOL, <x> )
#endif
/* Harbour extensions */
#command SET FILECASE <(x)> => Set( _SET_FILECASE, <(x)> )
#command SET FILECASE (<x>) => Set( _SET_FILECASE, <x> )
#command SET DIRCASE <(x)> => Set( _SET_DIRCASE, <(x)> )
#command SET DIRCASE (<x>) => Set( _SET_DIRCASE, <x> )
#command SET DIRSEPARATOR <x> => Set( _SET_DIRSEPARATOR, <x> )
#command SET DBFLOCKSCHEME TO <x> => Set( _SET_DBFLOCKSCHEME, <x> )
#command SET DBFLOCKSCHEME TO => Set( _SET_DBFLOCKSCHEME, 0 )
#command SET HARDCOMMIT <x:ON,OFF,&> => Set( _SET_HARDCOMMIT, <(x)> )
#command SET HARDCOMMIT (<x>) => Set( _SET_HARDCOMMIT, <x> )
#command SET EOL <x> => Set( _SET_EOL, <x> )
#endif /* HB_STD_CH_ */

8
harbour/utils/hbpp/hbpplib.c
View File

@@ -60,15 +60,12 @@
#endif
#include <stdio.h>
/* #include <setjmp.h> */
#include "hbppdef.h"
#include "hbcomp.h"
#include "hbapi.h"
#include "hbapierr.h"
#ifdef HB_EXTENSION
HB_PATHNAMES * hb_comp_pIncludePath = NULL;
PHB_FNAME hb_comp_pFileName = NULL;
FILES hb_comp_files;
@@ -92,8 +89,6 @@ BOOL hb_comp_bDebugInfo = FALSE; /* holds if generate d
int hb_comp_iExitLevel = HB_EXITLEVEL_DEFAULT; /* holds if there was any warning during the compilation process */
FILE * hb_comp_yyppo = NULL;
/* static jmp_buf s_env; */
HB_FUNC( __PP_INIT )
{
hb_pp_Table();
@@ -251,6 +246,3 @@ void hb_compGenWarning( HB_COMP_DECL, char * szWarnings[], char cPrefix, int iWa
HB_SYMBOL_UNUSED( szWarning1 );
HB_SYMBOL_UNUSED( szWarning2 );
}
#endif

23
harbour/utils/hbtest/rt_stra.prg
View File

@@ -473,31 +473,30 @@ FUNCTION Exact_Str()
TEST_LINE( "DEF" >= "ABCD", .T. )
SET( _SET_EXACT, old_exact )
RETURN NIL
FUNCTION New_STRINGS()
#ifdef __HARBOUR__
#ifdef HB_EXTENSION
TEST_LINE( HB_ValToStr( 4 ) , " 4" )
TEST_LINE( HB_ValToStr( 4.0 / 2 ) , " 2.00" )
TEST_LINE( HB_ValToStr( "String" ) , "String" )
TEST_LINE( HB_ValToStr( HB_SToD( "20010101" ) ) , "2001.01.01" )
TEST_LINE( HB_ValToStr( NIL ) , "NIL" )
TEST_LINE( HB_ValToStr( .F. ) , ".F." )
TEST_LINE( HB_ValToStr( .T. ) , ".T." )
TEST_LINE( hb_ValToStr( 4 ) , " 4" )
TEST_LINE( hb_ValToStr( 4.0 / 2 ) , " 2.00" )
TEST_LINE( hb_ValToStr( "String" ) , "String" )
TEST_LINE( hb_ValToStr( hb_SToD( "20010101" ) ) , "2001.01.01" )
TEST_LINE( hb_ValToStr( NIL ) , "NIL" )
TEST_LINE( hb_ValToStr( .F. ) , ".F." )
TEST_LINE( hb_ValToStr( .T. ) , ".T." )
#endif
#endif
RETURN NIL
FUNCTION Long_STRINGS()
TEST_LINE( RIGHT( SPACE( 64 * 1024 - 5 ) + "12345 7890", 10 ), "12345 7890" )
TEST_LINE( LEN( SPACE( 81910 ) + "1234567890" ), 81920 )
TEST_LINE( ( "1234567890" + SPACE( 810910 ) ) - ( "1234567890" + SPACE( 810910 ) ), "12345678901234567890" + SPACE( 810910 * 2 ) )
TEST_LINE( Right( Space( 64 * 1024 - 5 ) + "12345 7890", 10 ), "12345 7890" )
TEST_LINE( Len( Space( 81910 ) + "1234567890" ), 81920 )
TEST_LINE( ( "1234567890" + Space( 810910 ) ) - ( "1234567890" + Space( 810910 ) ), "12345678901234567890" + Space( 810910 * 2 ) )
RETURN NIL