diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 118f40c179..373781e6a3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,23 @@ +20000416-12:34 GMT+1 Victor Szakats + + * source/lang/msgfr.c + + source/lang/msgro.c + * source/lang/Makefile + * makefile.bc + * makefile.vc + + Added French and Romanian language modules. + + * make_gnu.* + * bin/bld.* + * Made them even more similar to make the updates easier. + + * source/rdd/dbfcdx/dbfcdx1.c + ! One warning fixed. + ! One trace call fixed. + + * doc/howtomak.txt + + Added that Bison 1.25 is required as a minimum. + 20000416-12:11 GMT+2 Maurilio Longo * source/rdd/dbfcdx/dbfcdx1.c @@ -7,7 +27,7 @@ * source/compiler/genobj32.c + prefix "_HB_FUN_" added to function and external generated names. -20000415-21:1 GMT -3 Luiz Rafael Culik make_gnu.log + make %1 %2 %3 %4 %5 %6 %7 %8 %9 2> make_gnu.log goto END :END diff --git a/harbour/make_gnu.cmd b/harbour/make_gnu.cmd index 3a1a224e07..1e5d958244 100644 --- a/harbour/make_gnu.cmd +++ b/harbour/make_gnu.cmd @@ -3,8 +3,6 @@ rem rem $Id$ rem -rem Flavour: OS/2 command file - rem --------------------------------------------------------------- rem Template to initialize the environment before starting rem the GNU make system for Harbour @@ -40,7 +38,7 @@ set HB_INC_INSTALL=include\ :HELP echo. - echo Usage: make_gnu.cmd [command] + echo Usage: make_gnu [command] echo. echo The following commands are supported: echo - all (default) @@ -111,7 +109,7 @@ set HB_INC_INSTALL=include\ rem --------------------------------------------------------------- rem Start the GNU make system - make %1 %2 %3 %4 %5 %6 %7 %8 %9 + make %1 %2 %3 %4 %5 %6 %7 %8 %9 goto END :END diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh index a02a4ef5e7..5810a187b3 100644 --- a/harbour/make_gnu.sh +++ b/harbour/make_gnu.sh @@ -3,8 +3,6 @@ # $Id$ # -# Flavour: Bash script - # --------------------------------------------------------------- # Template to initialize the environment before starting # the GNU make system for Harbour diff --git a/harbour/makefile.bc b/harbour/makefile.bc index bdba0dee01..f76c789ffd 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -301,11 +301,13 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msgen.obj \ $(OBJ_DIR)\msges.obj \ $(OBJ_DIR)\msgeu.obj \ + $(OBJ_DIR)\msgfr.obj \ $(OBJ_DIR)\msggl.obj \ $(OBJ_DIR)\msghu852.obj \ $(OBJ_DIR)\msghucwi.obj \ $(OBJ_DIR)\msghuwin.obj \ - $(OBJ_DIR)\msgpt.obj + $(OBJ_DIR)\msgpt.obj \ + $(OBJ_DIR)\msgro.obj # # TOOLS.LIB rules @@ -1603,6 +1605,10 @@ $(OBJ_DIR)\msgeu.obj : $(LANG_DIR)\msgeu.c $(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $** tlib $(LANG_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\msgfr.obj : $(LANG_DIR)\msgfr.c + $(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $** + tlib $(LANG_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\msggl.obj : $(LANG_DIR)\msggl.c $(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $** tlib $(LANG_LIB) $(ARFLAGS) -+$@,, @@ -1623,6 +1629,10 @@ $(OBJ_DIR)\msgpt.obj : $(LANG_DIR)\msgpt.c $(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $** tlib $(LANG_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\msgro.obj : $(LANG_DIR)\msgro.c + $(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $** + tlib $(LANG_LIB) $(ARFLAGS) -+$@,, + # # TOOLS.LIB dependencies # diff --git a/harbour/makefile.vc b/harbour/makefile.vc index 6aacc9b100..769006b940 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -340,11 +340,13 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msgen.obj \ $(OBJ_DIR)\msges.obj \ $(OBJ_DIR)\msgeu.obj \ + $(OBJ_DIR)\msgfr.obj \ $(OBJ_DIR)\msggl.obj \ $(OBJ_DIR)\msghu852.obj \ $(OBJ_DIR)\msghucwi.obj \ $(OBJ_DIR)\msghuwin.obj \ - $(OBJ_DIR)\msgpt.obj + $(OBJ_DIR)\msgpt.obj \ + $(OBJ_DIR)\msgro.obj # # TOOLS.LIB rules diff --git a/harbour/source/lang/Makefile b/harbour/source/lang/Makefile index b72fd7badd..04380b2611 100644 --- a/harbour/source/lang/Makefile +++ b/harbour/source/lang/Makefile @@ -9,11 +9,13 @@ C_SOURCES=\ msgen.c \ msges.c \ msgeu.c \ + msgfr.c \ msggl.c \ msghu852.c \ msghucwi.c \ msghuwin.c \ msgpt.c \ + msgro.c \ LIBNAME=lang diff --git a/harbour/source/lang/msgfr.c b/harbour/source/lang/msgfr.c index 45407d6a01..afeb66cad2 100644 --- a/harbour/source/lang/msgfr.c +++ b/harbour/source/lang/msgfr.c @@ -2,91 +2,189 @@ * $Id$ */ -/* Language Support Module */ +/* + * Harbour Project source code: + * Language Support Module (FR) + * + * Copyright 2000 Victor Szakats + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version, with one exception: + * + * The exception is that if you link the Harbour Runtime Library (HRL) + * and/or the Harbour Virtual Machine (HVM) with other files to produce + * an executable, this does not by itself cause the resulting executable + * to be covered by the GNU General Public License. Your use of that + * executable is in no way restricted on account of linking the HRL + * and/or HVM code into it. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit + * their web site at http://www.gnu.org/). + * + */ /* Language name: French */ /* ISO language code (2 chars): FR */ /* Codepage: ???? */ -#include "hbdefs.h" +#include "hbapilng.h" -char *hb_dateMonthsName[ 12 ] = +static HB_LANG s_lang = { - "Janvier", - "F‚vrier", - "Mars", - "Avril", - "May", - "Juin", - "Juillet", - "Ao–t", - "Septembre", - "Octobre", - "Novembre", - "D‚cembre" + { + /* Identification */ + + "FR", /* ID */ + "French", /* Name (in English) */ + "fran‡ais", /* Name (in native language) */ + "FR", /* RFC ID */ + "850", /* Codepage */ + "$Revision$ $Date$", /* Version */ + + /* Month names */ + + "Janvier", + "F‚vrier", + "Mars", + "Avril", + "May", + "Juin", + "Juillet", + "Ao–t", + "Septembre", + "Octobre", + "Novembre", + "D‚cembre", + + /* Day names */ + + "Dimanche", + "Lundi", + "Mardi", + "Mercredi", + "Jeudi", + "Vendredi", + "Samedi" + + /* CA-Cl*pper compatible natmsg items */ + + "Base de donn‚es Nb d'enreg Date j-m-ae Taille", + "Voulez-vous d'autres ‚chantillons?", + "No. de pages", + "** Total interm‚diaire **", + "* Total partiel *", + "*** Total ***", + "Ins", + " ", + "Date invalide", + "Limites : ", + " - ", + "O/N", + "INVALID EXPRESSION", + + /* Error description names */ + + "Unknown error", + "Argument error", + "Bound error", + "String overflow", + "Numeric overflow", + "Zero divisor", + "Numeric error", + "Syntax error", + "Operation too complex", + "", + "", + "Memory low", + "Undefined function", + "No exported method", + "Variable does not exist", + "Alias does not exist", + "No exported variable", + "Illegal characters in alias", + "Alias already in use", + "", + "Create error", + "Open error", + "Close error", + "Read error", + "Write error", + "Print error", + "", + "", + "", + "", + "Operation not supported", + "Limit exceeded", + "Corruption detected", + "Data type error", + "Data width error", + "Workarea not in use", + "Workarea not indexed", + "Exclusive required", + "Lock required", + "Write not allowed", + "Append lock failed", + "Lock Failure", + "", + "", + "", + "", + "array access", + "array assign", + "array dimension", + "not an array", + "conditional", + + /* Internal error names */ + + "Unrecoverable error %lu: ", + "Error recovery failure", + "No ERRORBLOCK() for error", + "Too many recursive error handler calls", + "RDD invalid or failed to load", + "Invalid method type from %s", + "hb_xgrab can't allocate memory", + "hb_xrealloc called with a NULL pointer", + "hb_xrealloc called with an invalid pointer", + "hb_xrealloc can't reallocate memory", + "hb_xfree called with an invalid pointer", + "hb_xfree called with a NULL pointer", + "Can\'t locate the starting procedure: \'%s\'", + "No starting procedure", + "Unsupported VM opcode", + "Symbol item expected from %s", + "Invalid symbol type for self from %s", + "Codeblock expected from %s", + "Incorrect item type on the stack trying to pop from %s", + "Stack underflow", + "An item was going to be copied to itself from %s", + "Invalid symbol item passed as memvar %s", + + /* Texts */ + + "DD-MM-YYYY", + "O", + "N" + } }; -char *hb_dateDaysName[ 7 ] = -{ - "Dimanche", - "Lundi", - "Mardi", - "Mercredi", - "Jeudi", - "Vendredi", - "Samedi" -}; +HB_LANG_ANNOUNCE( FR ); + +HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_FR ) + hb_langRegister( &s_lang ); +HB_CALL_ON_STARTUP_END( hb_lang_Init_FR ) +#if ! defined(__GNUC__) && ! defined(_MSC_VER) + #pragma startup hb_lang_Init_FR +#endif -char *hb_errorsGeneric[] = -{ - "Unknown error", - "Argument error", - "Bound error", - "String overflow", - "Numeric overflow", - "Zero divisor", - "Numeric error", - "Syntax error", - "Operation too complex", - "", - "", - "Memory low", - "Undefined function", - "No exported method", - "Variable does not exist", - "Alias does not exist", - "No exported variable", - "Illegal characters in alias", - "Alias already in use", - "", - "Create error", - "Open error", - "Close error", - "Read error", - "Write error", - "Print error", - "", - "", - "", - "", - "Operation not supported", - "Limit exceeded", - "Corruption detected", - "Data type error", - "Data width error", - "Workarea not in use", - "Workarea not indexed", - "Exclusive required", - "Lock required", - "Write not allowed", - "Append lock failed", - "Lock Failure", - "", - "", - "", - "Incorrect number of arguments", - "array access", - "array assign", - "not an array", - "conditional" -}; diff --git a/harbour/source/lang/msgro.c b/harbour/source/lang/msgro.c new file mode 100644 index 0000000000..5ecfe61330 --- /dev/null +++ b/harbour/source/lang/msgro.c @@ -0,0 +1,190 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Language Support Module (RO) + * + * Copyright 2000 Victor Szakats + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version, with one exception: + * + * The exception is that if you link the Harbour Runtime Library (HRL) + * and/or the Harbour Virtual Machine (HVM) with other files to produce + * an executable, this does not by itself cause the resulting executable + * to be covered by the GNU General Public License. Your use of that + * executable is in no way restricted on account of linking the HRL + * and/or HVM code into it. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit + * their web site at http://www.gnu.org/). + * + */ + +/* Language name: Romanian */ +/* ISO language code (2 chars): RO */ +/* Codepage: 852 */ + +#include "hbapilng.h" + +static HB_LANG s_lang = +{ + { + /* Identification */ + + "RO", /* ID */ + "Romanian", /* Name (in English) */ + "Romƒn", /* Name (in native language) */ + "RO", /* RFC ID */ + "852", /* Codepage */ + "$Revision$ $Date$", /* Version */ + + /* Month names */ + + "ianuarie", + "februarie", + "martie", + "aprilie", + "mai", + "iunie", + "iulie", + "august", + "septembrie", + "octombrie", + "noiembrie", + "decembrie", + + /* Day names */ + + "duminicÇ", + "luni", + "marîi", + "miercuri", + "joi", + "vineri", + "sƒmbÇtÇ", + + /* CA-Cl*pper compatible natmsg items */ + + "Database Files # Records Last Update Size", + "Do you want more samples?", + "Page No.", + "** Subtotal **", + "* Subsubtotal *", + "*** Total ***", + "Ins", + " ", + "Invalid date", + "Range: ", + " - ", + "Y/N", + "INVALID EXPRESSION", + + /* Error description names */ + + "Unknown error", + "Argument error", + "Bound error", + "String overflow", + "Numeric overflow", + "Zero divisor", + "Numeric error", + "Syntax error", + "Operation too complex", + "", + "", + "Memory low", + "Undefined function", + "No exported method", + "Variable does not exist", + "Alias does not exist", + "No exported variable", + "Illegal characters in alias", + "Alias already in use", + "", + "Create error", + "Open error", + "Close error", + "Read error", + "Write error", + "Print error", + "", + "", + "", + "", + "Operation not supported", + "Limit exceeded", + "Corruption detected", + "Data type error", + "Data width error", + "Workarea not in use", + "Workarea not indexed", + "Exclusive required", + "Lock required", + "Write not allowed", + "Append lock failed", + "Lock Failure", + "", + "", + "", + "", + "array access", + "array assign", + "array dimension", + "not an array", + "conditional", + + /* Internal error names */ + + "Unrecoverable error %lu: ", + "Error recovery failure", + "No ERRORBLOCK() for error", + "Too many recursive error handler calls", + "RDD invalid or failed to load", + "Invalid method type from %s", + "hb_xgrab can't allocate memory", + "hb_xrealloc called with a NULL pointer", + "hb_xrealloc called with an invalid pointer", + "hb_xrealloc can't reallocate memory", + "hb_xfree called with an invalid pointer", + "hb_xfree called with a NULL pointer", + "Can\'t locate the starting procedure: \'%s\'", + "No starting procedure", + "Unsupported VM opcode", + "Symbol item expected from %s", + "Invalid symbol type for self from %s", + "Codeblock expected from %s", + "Incorrect item type on the stack trying to pop from %s", + "Stack underflow", + "An item was going to be copied to itself from %s", + "Invalid symbol item passed as memvar %s", + + /* Texts */ + + "DD.MM.YYYY", + "D", + "N" + } +}; + +HB_LANG_ANNOUNCE( RO ); + +HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_RO ) + hb_langRegister( &s_lang ); +HB_CALL_ON_STARTUP_END( hb_lang_Init_RO ) +#if ! defined(__GNUC__) && ! defined(_MSC_VER) + #pragma startup hb_lang_Init_RO +#endif + diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c index ed021d0d06..29408c5a35 100644 --- a/harbour/source/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c @@ -355,7 +355,7 @@ static BOOL hb_cdxltoa( LONG lValue, char * szBuffer, USHORT uiLen ) LONG lAbsNumber; int iCount, iPos; - HB_TRACE(HB_TR_DEBUG, ("hb_nltoa(%ld, %p, %hu)", lValue, szBuffer, uiLen)); + HB_TRACE(HB_TR_DEBUG, ("hb_cdxltoa(%ld, %p, %hu)", lValue, szBuffer, uiLen)); lAbsNumber = ( lValue > 0 ) ? lValue : - lValue; iCount = iPos = uiLen; @@ -806,7 +806,6 @@ static LONG hb_cdxTagNewRoot( LPTAGINFO pTag ) static void hb_cdxTagPageLoad( LPTAGINFO pTag, LPPAGEINFO pPage ) { CDXDATA pData; - /* LPKEYINFO pKey; */ hb_cdxIndexPageRead( pTag->Owner, pPage->Page, &pData, sizeof( CDXDATA ) ); if( pData.Node_Atr > 1 )