From 4ee2e7de8a8a65cb3d4681be74891404be1bbe06 Mon Sep 17 00:00:00 2001 From: David Arturo Macias Corona Date: Wed, 8 Mar 2006 09:43:40 +0000 Subject: [PATCH] 2006-03-08 3:31 UTC-0500 David Arturo Macias Corona - harbour/source/codepage/cdpsl437.c - harbour/source/codepage/cdpsl852.c - harbour/source/codepage/cdpslwin.c - harbour/source/codepage/cdpsliso.c - Removed these four files. --- harbour/ChangeLog | 7 ++ harbour/source/codepage/cdpsl437.c | 107 ---------------------------- harbour/source/codepage/cdpsl852.c | 108 ----------------------------- harbour/source/codepage/cdpsliso.c | 107 ---------------------------- harbour/source/codepage/cdpslwin.c | 107 ---------------------------- 5 files changed, 7 insertions(+), 429 deletions(-) delete mode 100644 harbour/source/codepage/cdpsl437.c delete mode 100644 harbour/source/codepage/cdpsl852.c delete mode 100644 harbour/source/codepage/cdpsliso.c delete mode 100644 harbour/source/codepage/cdpslwin.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6cbd0795c4..f2304528ad 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -9,6 +9,13 @@ */ * harbour/makefile.vc * source/pp/ppcomp.c + * source/pp/ppcore.c + * source/pp/pplib.c + * source/pp/pptable.c + * source/pp/pragma.c + * fixed compilation of #command ( => (,7 + (loops in #define or #command are trapped now) + * fixed compilation of \[ and \] in command/translate * modified TEXT/ENDTEXT to use '#pragma __text' + added #pragma __stream and #pragma __cstream (examples later) diff --git a/harbour/source/codepage/cdpsl437.c b/harbour/source/codepage/cdpsl437.c deleted file mode 100644 index 6e9cac8611..0000000000 --- a/harbour/source/codepage/cdpsl437.c +++ /dev/null @@ -1,107 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * National Collation Support Module ( SL437 ) - * - * Copyright 2002 Alexander S.Kresin - * www - http://www.harbour-project.org - * 2003 Mitja Podgornik - * - * 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, or (at your option) - * any later version. - * - * 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 software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries 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 Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ - -/* Language name: Slovenian */ -/* ISO language code (2 chars): SL */ -/* Codepage: 437 */ - -#include -#include "hbapi.h" -#include "hbapicdp.h" - -#define NUMBER_OF_CHARACTERS 31 /* The number of single characters in the - alphabet, two-as-one aren't considered - here, accented - are considered. */ -#define IS_LATIN 1 /* Should be 1, if the national alphabet - is based on Latin */ -#define ACCENTED_EQUAL 0 /* Should be 1, if accented character - has the same weight as appropriate - unaccented. */ -#define ACCENTED_INTERLEAVED 0 /* Should be 1, if accented characters - sort after their unaccented counterparts - only if the unaccented versions of all - characters being compared are the same - ( interleaving ) */ - -/* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the - accented characters with the symbol '~' before each of them, for example: - a~€ - If there is two-character sequence, which is considered as one, it should - be marked with '.' before and after it, for example: - ... h.ch.i ... - - The Upper case string and the Lower case string should be absolutely the - same excepting the characters case, of course. - */ - -static HB_CODEPAGE s_codepage = { "SL437", - CPID_437, UNITB_437, NUMBER_OF_CHARACTERS, - "ABC^]D\\EFGHIJKLMNOPQRS[TUVWZ@XY", - "abc~}d|efghijklmnopqrs{tuvwz`xy", - IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; - -HB_CODEPAGE_INIT( SL437 ); - -#if defined(HB_PRAGMA_STARTUP) - #pragma startup hb_codepage_Init_SL437 -#elif defined(HB_MSC_STARTUP) - #if _MSC_VER >= 1010 - #pragma data_seg( ".CRT$XIY" ) - #pragma comment( linker, "/Merge:.CRT=.data" ) - #else - #pragma data_seg( "XIY" ) - #endif - static HB_$INITSYM hb_vm_auto_hb_codepage_Init_SL437 = hb_codepage_Init_SL437; - #pragma data_seg() -#endif - diff --git a/harbour/source/codepage/cdpsl852.c b/harbour/source/codepage/cdpsl852.c deleted file mode 100644 index 77ab20e5db..0000000000 --- a/harbour/source/codepage/cdpsl852.c +++ /dev/null @@ -1,108 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * National Collation Support Module ( SL852 ) - * - * Copyright 2002 Alexander S.Kresin - * www - http://www.harbour-project.org - * 2003 Mitja Podgornik - * - * 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, or (at your option) - * any later version. - * - * 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 software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries 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 Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ - -/* Language name: Slovenian */ -/* ISO language code (2 chars): SL */ -/* Codepage: 852 */ - -#include -#include "hbapi.h" -#include "hbapicdp.h" - -#define NUMBER_OF_CHARACTERS 31 /* The number of single characters in the - alphabet, two-as-one aren't considered - here, accented - are considered. */ -#define IS_LATIN 1 /* Should be 1, if the national alphabet - is based on Latin */ -#define ACCENTED_EQUAL 0 /* Should be 1, if accented character - has the same weight as appropriate - unaccented. */ -#define ACCENTED_INTERLEAVED 0 /* Should be 1, if accented characters - sort after their unaccented counterparts - only if the unaccented versions of all - characters being compared are the same - ( interleaving ) */ - -/* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the - accented characters with the symbol '~' before each of them, for example: - a~€ - If there is two-character sequence, which is considered as one, it should - be marked with '.' before and after it, for example: - ... h.ch.i ... - - The Upper case string and the Lower case string should be absolutely the - same excepting the characters case, of course. - */ - -static HB_CODEPAGE s_codepage = { "SL852", - CPID_852, UNITB_852, NUMBER_OF_CHARACTERS, - "ABC¬DÑEFGHIJKLMNOPQRSæTUVWZ¦XY", - "abcŸ†dÐefghijklmnopqrsçtuvwz§xy", - IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; - -HB_CODEPAGE_INIT( SL852 ); - -#if defined(HB_PRAGMA_STARTUP) - #pragma startup hb_codepage_Init_SL852 -#elif defined(HB_MSC_STARTUP) - #if _MSC_VER >= 1010 - #pragma data_seg( ".CRT$XIY" ) - #pragma comment( linker, "/Merge:.CRT=.data" ) - #else - #pragma data_seg( "XIY" ) - #endif - static HB_$INITSYM hb_vm_auto_hb_codepage_Init_SL852 = hb_codepage_Init_SL852; - #pragma data_seg() -#endif - - diff --git a/harbour/source/codepage/cdpsliso.c b/harbour/source/codepage/cdpsliso.c deleted file mode 100644 index a6162922bc..0000000000 --- a/harbour/source/codepage/cdpsliso.c +++ /dev/null @@ -1,107 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * National Collation Support Module ( SLISO ) - * - * Copyright 2002 Alexander S.Kresin - * www - http://www.harbour-project.org - * 2003 Mitja Podgornik - * - * 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, or (at your option) - * any later version. - * - * 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 software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries 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 Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ - -/* Language name: Slovenian */ -/* ISO language code (2 chars): SL */ -/* Codepage: ISO-8859-2 */ - -#include -#include "hbapi.h" -#include "hbapicdp.h" - -#define NUMBER_OF_CHARACTERS 31 /* The number of single characters in the - alphabet, two-as-one aren't considered - here, accented - are considered. */ -#define IS_LATIN 1 /* Should be 1, if the national alphabet - is based on Latin */ -#define ACCENTED_EQUAL 0 /* Should be 1, if accented character - has the same weight as appropriate - unaccented. */ -#define ACCENTED_INTERLEAVED 0 /* Should be 1, if accented characters - sort after their unaccented counterparts - only if the unaccented versions of all - characters being compared are the same - ( interleaving ) */ - -/* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the - accented characters with the symbol '~' before each of them, for example: - a~€ - If there is two-character sequence, which is considered as one, it should - be marked with '.' before and after it, for example: - ... h.ch.i ... - - The Upper case string and the Lower case string should be absolutely the - same excepting the characters case, of course. - */ - -static HB_CODEPAGE s_codepage = { "SLISO", - CPID_8859_2, UNITB_8859_2, NUMBER_OF_CHARACTERS, - "ABCÈÆDÐEFGHIJKLMNOPQRS©TUVWZ®XY", - "abcèædðefghijklmnopqrs¹tuvwz¾xy", - IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; - -HB_CODEPAGE_INIT( SLISO ); - -#if defined(HB_PRAGMA_STARTUP) - #pragma startup hb_codepage_Init_SLISO -#elif defined(HB_MSC_STARTUP) - #if _MSC_VER >= 1010 - #pragma data_seg( ".CRT$XIY" ) - #pragma comment( linker, "/Merge:.CRT=.data" ) - #else - #pragma data_seg( "XIY" ) - #endif - static HB_$INITSYM hb_vm_auto_hb_codepage_Init_SL852 = hb_codepage_Init_SLISO; - #pragma data_seg() -#endif - diff --git a/harbour/source/codepage/cdpslwin.c b/harbour/source/codepage/cdpslwin.c deleted file mode 100644 index a743909acd..0000000000 --- a/harbour/source/codepage/cdpslwin.c +++ /dev/null @@ -1,107 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * National Collation Support Module ( SLWIN ) - * - * Copyright 2002 Alexander S.Kresin - * www - http://www.harbour-project.org - * 2003 Mitja Podgornik - * - * 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, or (at your option) - * any later version. - * - * 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 software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries 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 Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ - -/* Language name: Slovenian */ -/* ISO language code (2 chars): SL */ -/* Codepage: 1250 */ - -#include -#include "hbapi.h" -#include "hbapicdp.h" - -#define NUMBER_OF_CHARACTERS 31 /* The number of single characters in the - alphabet, two-as-one aren't considered - here, accented - are considered. */ -#define IS_LATIN 1 /* Should be 1, if the national alphabet - is based on Latin */ -#define ACCENTED_EQUAL 0 /* Should be 1, if accented character - has the same weight as appropriate - unaccented. */ -#define ACCENTED_INTERLEAVED 0 /* Should be 1, if accented characters - sort after their unaccented counterparts - only if the unaccented versions of all - characters being compared are the same - ( interleaving ) */ - -/* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the - accented characters with the symbol '~' before each of them, for example: - a~€ - If there is two-character sequence, which is considered as one, it should - be marked with '.' before and after it, for example: - ... h.ch.i ... - - The Upper case string and the Lower case string should be absolutely the - same excepting the characters case, of course. - */ - -static HB_CODEPAGE s_codepage = { "SLWIN", - CPID_1250, UNITB_1250, NUMBER_OF_CHARACTERS, - "ABCÈÆDÐEFGHIJKLMNOPQRSŠTUVWZŽXY", - "abcèædðefghijklmnopqrsštuvwzžxy", - IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; - -HB_CODEPAGE_INIT( SLWIN ); - -#if defined(HB_PRAGMA_STARTUP) - #pragma startup hb_codepage_Init_SLWIN -#elif defined(HB_MSC_STARTUP) - #if _MSC_VER >= 1010 - #pragma data_seg( ".CRT$XIY" ) - #pragma comment( linker, "/Merge:.CRT=.data" ) - #else - #pragma data_seg( "XIY" ) - #endif - static HB_$INITSYM hb_vm_auto_hb_codepage_Init_SLWIN = hb_codepage_Init_SLWIN; - #pragma data_seg() -#endif -