diff --git a/harbour/ChangeLog b/harbour/ChangeLog index eb03e26707..ae5d047d8f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,13 @@ +20000516-03:59 GMT+1 Victor Szakats + + * source/lang/Makefile + * source/lang/msgsr852.c + + source/lang/msgsriso.c + * source/compiler/hbusage.c + * makefile.bc + * makefile.vc + + Added new languages. + 20000515-18:00 GMT-8 Ron Pinkas * source/compiler/harbour.c diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 074b4e83f6..9369376048 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -317,7 +317,9 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msghuwin.obj \ $(OBJ_DIR)\msgis850.obj \ $(OBJ_DIR)\msgpt.obj \ - $(OBJ_DIR)\msgro.obj + $(OBJ_DIR)\msgro.obj \ + $(OBJ_DIR)\msgsr852.obj \ + $(OBJ_DIR)\msgsriso.obj # # MACRO.LIB rules @@ -1634,6 +1636,14 @@ $(OBJ_DIR)\msgro.obj : $(LANG_DIR)\msgro.c $(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $** tlib $(LANG_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\msgsr852.obj : $(LANG_DIR)\msgsr852.c + $(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $** + tlib $(LANG_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\msgsriso.obj : $(LANG_DIR)\msgsriso.c + $(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $** + tlib $(LANG_LIB) $(ARFLAGS) -+$@,, + # # MACRO.LIB dependencies # diff --git a/harbour/makefile.vc b/harbour/makefile.vc index 5709e40a56..ec7e90f2d7 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -350,7 +350,9 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msghuwin.obj \ $(OBJ_DIR)\msgis850.obj \ $(OBJ_DIR)\msgpt.obj \ - $(OBJ_DIR)\msgro.obj + $(OBJ_DIR)\msgro.obj \ + $(OBJ_DIR)\msgsr852.obj \ + $(OBJ_DIR)\msgsriso.obj # # MACRO.LIB rules diff --git a/harbour/source/compiler/hbusage.c b/harbour/source/compiler/hbusage.c index 32cbe65217..3e619ec869 100644 --- a/harbour/source/compiler/hbusage.c +++ b/harbour/source/compiler/hbusage.c @@ -103,6 +103,7 @@ void hb_compPrintCredits( void ) "Chen Kedem \n" "Dave Pearson \n" "David G. Holm \n" + "Davor Siklic \n" "Eddie Runia \n" "Felipe G. Coury \n" "Gonzalo A. Diethelm \n" diff --git a/harbour/source/lang/Makefile b/harbour/source/lang/Makefile index 14519c806c..9923cd94a2 100644 --- a/harbour/source/lang/Makefile +++ b/harbour/source/lang/Makefile @@ -19,6 +19,8 @@ C_SOURCES=\ msgis850.c \ msgpt.c \ msgro.c \ + msgsr852.c \ + msgsriso.c \ LIBNAME=lang diff --git a/harbour/source/lang/msgsr852.c b/harbour/source/lang/msgsr852.c index b984d4116f..3fb540b9ac 100644 --- a/harbour/source/lang/msgsr852.c +++ b/harbour/source/lang/msgsr852.c @@ -2,91 +2,189 @@ * $Id$ */ -/* Language Support Module */ +/* + * Harbour Project source code: + * Language Support Module (SR852) + * + * Copyright 2000 Davor Siklic + * 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: Serbian */ /* ISO language code (2 chars): SR */ -/* Codepage: Latin II - 852 */ +/* Codepage: Latin II 852 */ -#include "hbdefs.h" +#include "hbapilng.h" -char *hb_dateMonthsName[ 12 ] = +static HB_LANG s_lang = { - "januar", - "februar", - "mart", - "april", - "maj", - "jun", - "jul", - "avgust", - "septembar", - "oktobar", - "novembar", - "decembar" + { + /* Identification */ + + "SR852", /* ID */ + "Serbian", /* Name (in English) */ + "Srpski", /* Name (in native language) */ + "SR", /* RFC ID */ + "852", /* Codepage */ + "$Revision$ $Date$", /* Version */ + + /* Month names */ + + "Januar", + "Februar", + "Mart", + "April", + "Maj", + "Jun", + "Jul", + "Avgust", + "Septembar", + "Oktobar", + "Novembar", + "Decembar" + + /* Day names */ + + "Nedelja", + "Ponedeljak", + "Utorak", + "Sreda", + "¬etvrtak", + "Petak", + "Subota" + + /* 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: ", + " - ", + "D/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 */ + + "YYYY/MM/DD", + "D", + "N" + } }; -char *hb_dateDaysName[ 7 ] = -{ - "nedelja", - "ponedeljak", - "utorak", - "sreda", - "Ÿetvrtak", - "petak", - "subota" -}; +HB_LANG_ANNOUNCE( SR852 ); + +HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SR852 ) + hb_langRegister( &s_lang ); +HB_CALL_ON_STARTUP_END( hb_lang_Init_SR852 ) +#if ! defined(__GNUC__) && ! defined(_MSC_VER) + #pragma startup hb_lang_Init_SR852 +#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/msgsriso.c b/harbour/source/lang/msgsriso.c new file mode 100644 index 0000000000..7ec5640129 --- /dev/null +++ b/harbour/source/lang/msgsriso.c @@ -0,0 +1,190 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Language Support Module (SRISO) + * + * Copyright 2000 Davor Siklic + * 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: Serbian */ +/* ISO language code (2 chars): SR */ +/* Codepage: ISO-8859-2 */ + +#include "hbapilng.h" + +static HB_LANG s_lang = +{ + { + /* Identification */ + + "SRISO", /* ID */ + "Serbian", /* Name (in English) */ + "Srpski", /* Name (in native language) */ + "SR", /* RFC ID */ + "ISO-8859-2", /* Codepage */ + "$Revision$ $Date$", /* Version */ + + /* Month names */ + + "Januar", + "Februar", + "Mart", + "April", + "Maj", + "Jun", + "Jul", + "Avgust", + "Septembar", + "Oktobar", + "Novembar", + "Decembar" + + /* Day names */ + + "Nedelja", + "Ponedeljak", + "Utorak", + "Sreda", + "Èetvrtak", + "Petak", + "Subota" + + /* 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: ", + " - ", + "D/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 */ + + "YYYY/MM/DD", + "D", + "N" + } +}; + +HB_LANG_ANNOUNCE( SRISO ); + +HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SRISO ) + hb_langRegister( &s_lang ); +HB_CALL_ON_STARTUP_END( hb_lang_Init_SRISO ) +#if ! defined(__GNUC__) && ! defined(_MSC_VER) + #pragma startup hb_lang_Init_SRISO +#endif +