diff --git a/harbour/ChangeLog b/harbour/ChangeLog index da72aa6da6..4d6fdfeaf6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,28 @@ +19990731-03:33 CET Victor Szel + ! source/vm/hvm.c - Fixed some error codes. + (.OR., .AND., PVALUE) + * hb_ErrorNatDescription -> hb_errorNatDescription + source/vm/hvm.c + source/rtl/natmsg/*.c + source/rtl/errorapi.c + source/rtl/arrays.c + include/errorapi.h + + source/rtl/natmsg/*.c - Standardized, reformatted, + ISO codes filled. + + source/rtl/msgxxx.c + source/rtl/natmsg/msghu852.c (former msghu.c) + source/rtl/natmsg/msghucwi.c + source/rtl/natmsg/msghuwin.c + Support for two additional Hungarian codepages. + % source/rtl/natmsg/*.c + source/rtl/msgxxx.c + hb_errorNatDescription() moved from natmsg/*.c to msgxxx.c + so there's only one copy of it now. + - source/rtl/natmsg/makefile.dos - Removed since it was not used at all. + + doc/lang_id.txt - Standard RFC language code list. + ! source/rtl/alert.prg - Some typo fixed. + * source/rtl/runner/runner.c - #include <> -> #include "" + 19990731-08:05 WIB Andi Jahja + source/rtl/menu.prg __AtPrompt() diff --git a/harbour/doc/lang_id.txt b/harbour/doc/lang_id.txt new file mode 100644 index 0000000000..0b6f424795 --- /dev/null +++ b/harbour/doc/lang_id.txt @@ -0,0 +1,214 @@ + +Language codes +============== + +RFC ID Name ISO Language ID +------ ------------------------------ --------------- +AA Afar AA +AB Abkhazian AB +AF Afrikaans AF +AM Amharic AM +AR Arabic AR +AR-AE Arabic (U.A.E.) AR +AR-BH Arabic (Bahrain) AR +AR-DZ Arabic (Algeria) AR +AR-EG Arabic (Egypt) AR +AR-IQ Arabic (Iraq) AR +AR-JO Arabic (Jordan) AR +AR-KW Arabic (Kuwait) AR +AR-LB Arabic (Lebanon) AR +AR-LY Arabic (Libya) AR +AR-MA Arabic (Morocco) AR +AR-OM Arabic (Oman) AR +AR-QA Arabic (Qatar) AR +AR-SA Arabic (Saudi Arabia) AR +AR-SY Arabic (Syria) AR +AR-TN Arabic (Tunisia) AR +AR-YE Arabic (Yemen) AR +AS Assamese AS +AY Aymara AY +AZ Azerbaijani AZ +BA Bashkir BA +BE Byelorussian BE +BG Bulgarian BG +BH Bihari BH +BI Bislama BI +BN Bengali, Bangla BN +BO Tibetan BO +BR Breton BR +CA Catalan CA +CO Corsican CO +CS Czech CS +CY Welsh CY +DA Danish DA +DE German DE +DE-AT German (Austria) DE +DE-CH German (Swiss) DE +DE-LI German (Liechtenstein) DE +DE-LU German (Luxembourg) DE +DZ Bhutani DZ +EL Greek EL +EN English EN +EN-AU English (Australian) EN +EN-BZ English (Belize) EN +EN-CA English (Canadian) EN +EN-GB English (British) EN +EN-IE English (Ireland) EN +EN-JM English (Jamaica) EN +EN-JP English (Japan) EN +EN-NZ English (New Zealand) EN +EN-TT English (Trinidad) EN +EN-US English (USA) EN +EN-ZA English (South Africa) EN +EO Esperanto EO +ES Spanish ES +ES-AR Spanish (Argentina) ES +ES-BO Spanish (Bolivia) ES +ES-CL Spanish (Chile) ES +ES-CO Spanish (Colombia) ES +ES-CR Spanish (Costa Rica) ES +ES-DO Spanish (Dominican Republic) ES +ES-EC Spanish (Ecuador) ES +ES-GT Spanish (Guatemala) ES +ES-HN Spanish (Honduras) ES +ES-MX Spanish (Mexican) ES +ES-NI Spanish (Nicaragua) ES +ES-PA Spanish (Panama) ES +ES-PE Spanish (Peru) ES +ES-PR Spanish (Puerto Rico) ES +ES-PY Spanish (Paraguay) ES +ES-SV Spanish (El Salvador) ES +ES-UY Spanish (Uruguay) ES +ES-VE Spanish (Venezuela) ES +ET Estonian ET +EU Basque EU +FA Persian FA +FI Finnish FI +FJ Fiji FJ +FO Faeroese FO +FR French FR +FR-BE French (Belgian) FR +FR-CA French (Canadian) FR +FR-CH French (Swiss) FR +FR-LU French (Luxembourg) FR +FY Frisian FY +GA Irish GA +GD Scots Gaelic GD +GL Galician GL +GN Guarani GN +GU Gujarati GU +HA Hausa HA +HE Hebrew HE +HI Hindi HI +HR Croatian HR +HU Hungarian HU +HY Armenian HY +IA Interlingua IA +ID Indonesian ID +IE Interlingue IE +IK Inupiak IK +IN Indonesian (-) IN +IS Icelandic IS +IT Italian IT +IT-CH Italian (Swiss) IT +IU Inuktitut IU +IW Hebrew (-) IW +JA Japanese JA +JI Yiddish (-) JI +JW Javanese JW +KA Georgian KA +KK Kazakh KK +KL Greenlandic KL +KM Cambodian KM +KN Kannada KN +KO Korean KO +KS Kashmiri KS +KU Kurdish KU +KY Kirghiz KY +LA Latin LA +LN Lingala LN +LO Laothian LO +LT Lithuanian LT +LV Latvian, Lettish LV +MG Malagasy MG +MI Maori MI +MK Macedonian MK +ML Malayalam ML +MN Mongolian MN +MO Moldavian MO +MR Marathi MR +MS Malay MS +MT Maltese MT +MY Burmese MY +NA Nauru NA +NE Nepali NE +NL Dutch NL +NL-BE Dutch (Belgian) NL +NO Norwegian NO +NO-BOK Norwegian (bokmal) NO +NO-NYN Norwegian (Nynorsk) NO +OC Occitan OC +OM (Afan) Oromo OM +OR Oriya OR +PA Punjabi PA +PL Polish PL +PS Pashto, Pushto PS +PT Portuguese PT +PT-BR Portuguese (Brazilian) PT +QU Quechua QU +RM Rhaeto-Romance RM +RN Kirundi RN +RO Romanian RO +RO-MO Romanian (Moldavia) RO +RU Russian RU +RU-MO Russian (Moldavia) RU +RW Kinyarwanda RW +SA Sanskrit SA +SD Sindhi SD +SG Sangro SG +SH Serbo-Croatian SH +SI Singhalese SI +SK Slovak SK +SL Slovenian SL +SM Samoan SM +SN Shona SN +SO Somali SO +SQ Albanian SQ +SR Serbian SR +SS Siswati SS +ST Sesotho ST +SU Sundanese SU +SV Swedish SV +SV-FI Swedish (Finland) SV +SW Swahili SW +TA Tamil TA +TE Tegulu TE +TG Tajik TG +TH Thai TH +TI Tigrinya TI +TK Turkmen TK +TL Tagalog TL +TN Setswana TN +TO Tonga TO +TR Turkish TR +TS Tsonga TS +TT Tatar TT +TW Twi TW +UG Uigur UG +UK Ukrainian UK +UR Urdu UR +UZ Uzbek UZ +VI Vietnamese VI +VO Volapuk VO +WO Wolof WO +XH Xhosa XH +YI Yiddish YI +YO Yoruba YO +ZA Zhuang ZA +ZH Chinese ZH +ZH-CN Chinese (PRC) ZH +ZH-HK Chinese (Hong Kong) ZH +ZH-SG Chinese (Singapore) ZH +ZH-TW Chinese (Taiwan) ZH +ZU Zulu ZU + diff --git a/harbour/include/errorapi.h b/harbour/include/errorapi.h index 4988210986..cc19aaabcb 100644 --- a/harbour/include/errorapi.h +++ b/harbour/include/errorapi.h @@ -104,7 +104,7 @@ WORD hb_errorRT_DBCMD( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, c void hb_errorInternal( ULONG ulCode ); */ /* Reads error description in national language */ -char *hb_ErrorNatDescription( ULONG ulGenCode ); +char *hb_errorNatDescription( ULONG ulGenCode ); #endif /* HB_ERRORAPI_H_ */ diff --git a/harbour/source/rtl/alert.prg b/harbour/source/rtl/alert.prg index cfdffd8f05..3913e15e9c 100644 --- a/harbour/source/rtl/alert.prg +++ b/harbour/source/rtl/alert.prg @@ -16,7 +16,7 @@ // ; Clipper defines a clipped window for Alert() // ; Clipper handles these buttons { "Ok", "", "Cancel" } in a buggy way. // This is fixed. -// ; nDelay function is a Harbour addition. +// ; nDelay parameter is a Harbour addition. FUNCTION Alert(cMessage, aOptions, cColorNorm, nDelay) LOCAL nChoice @@ -29,12 +29,12 @@ FUNCTION Alert(cMessage, aOptions, cColorNorm, nDelay) LOCAL nOldCursor LOCAL cOldScreen - /* TOFIX: Clipper decides at runtime, wether the GT is linked, */ - /* if it is not, the console mode is selected here */ + /* TOFIX: Clipper decides at runtime, whether the GT is linked, */ + /* if it is not, the console mode is choosed here */ LOCAL lConsole := .F. #ifdef HARBOUR_STRICT_CLIPPER_COMPATIBILITY -// IF "//NOALERT" $ /* cCommandLine */ +// IF "//NOALERT" $ /* Upper(cCommandLine) */ // QUIT // ENDIF #endif @@ -194,7 +194,7 @@ FUNCTION Alert(cMessage, aOptions, cColorNorm, nDelay) ELSE - /* Restore screen */ + /* Restore status */ RestScreen( nInitRow, nInitCol, nInitRow + Len(aSay) + 3, nInitCol + nWidth + 1, cScreen ) SetCursor(nOldCursor) SetPos(nOldRow, nOldCol) diff --git a/harbour/source/rtl/arrays.c b/harbour/source/rtl/arrays.c index f63582611b..82edf20fe9 100644 --- a/harbour/source/rtl/arrays.c +++ b/harbour/source/rtl/arrays.c @@ -98,12 +98,12 @@ char * hb_arrayGetDate( PHB_ITEM pArray, ULONG ulIndex ) } else { - hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS)); } } else { - hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS)); } return " "; } @@ -124,12 +124,12 @@ BOOL hb_arrayGetBool( PHB_ITEM pArray, ULONG ulIndex ) } else { - hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS)); } } else { - hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS)); } return 0; } @@ -156,12 +156,12 @@ double hb_arrayGetDouble( PHB_ITEM pArray, ULONG ulIndex ) } else { - hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS)); } } else { - hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS)); } return 0; } @@ -208,12 +208,12 @@ void hb_arrayGet( PHB_ITEM pArray, ULONG ulIndex, PHB_ITEM pItem ) hb_itemCopy( pItem, pArray->item.asArray.value->pItems + ( ulIndex - 1 ) ); else { - hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS)); } } else { - hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS)); } } @@ -232,12 +232,12 @@ char *hb_arrayGetString( PHB_ITEM pArray, ULONG ulIndex ) } else { - hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS)); } } else { - hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS)); } return ""; } @@ -257,12 +257,12 @@ ULONG hb_arrayGetStringLen( PHB_ITEM pArray, ULONG ulIndex ) } else { - hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS)); } } else { - hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS)); } return 0; } @@ -278,12 +278,12 @@ int hb_arrayGetType( PHB_ITEM pArray, ULONG ulIndex ) } else { - hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS)); } } else { - hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS)); } return 0; } @@ -303,7 +303,7 @@ ULONG hb_arrayLen( PHB_ITEM pArray ) return pArray->item.asArray.value->ulLen; else { - hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS)); } return 0; } @@ -316,12 +316,12 @@ void hb_arraySet( PHB_ITEM pArray, ULONG ulIndex, PHB_ITEM pItem ) hb_itemCopy( pArray->item.asArray.value->pItems + ( ulIndex - 1 ), pItem ); else { - hb_errorRT_BASE(EG_BOUND, 1133, NULL, hb_ErrorNatDescription(EG_ARRASSIGN)); + hb_errorRT_BASE(EG_BOUND, 1133, NULL, hb_errorNatDescription(EG_ARRASSIGN)); } } else { - hb_errorRT_BASE(EG_ARG, 1069, NULL, hb_ErrorNatDescription(EG_ARRASSIGN)); + hb_errorRT_BASE(EG_ARG, 1069, NULL, hb_errorNatDescription(EG_ARRASSIGN)); } } @@ -384,7 +384,7 @@ void hb_arrayFill( PHB_ITEM pArray, PHB_ITEM pValue, ULONG ulStart, ULONG ulCoun } else { - hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_NOTARRAY)); + hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_NOTARRAY)); } } @@ -407,12 +407,12 @@ void hb_arrayDel( PHB_ITEM pArray, ULONG ulIndex ) } else { - hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS)); } } else { - hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_NOTARRAY)); + hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_NOTARRAY)); } } @@ -435,12 +435,12 @@ void hb_arrayIns( PHB_ITEM pArray, ULONG ulIndex ) } else { - hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS)); + hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS)); } } else { - hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_NOTARRAY)); + hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_NOTARRAY)); } } @@ -514,7 +514,7 @@ int hb_arrayScan( PHB_ITEM pArray, PHB_ITEM pValue, ULONG ulStart, ULONG ulCount } else { - hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_NOTARRAY)); + hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_NOTARRAY)); } return 0; } @@ -576,7 +576,7 @@ void hb_arrayRelease( PHB_ITEM pArray ) } else { - hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_NOTARRAY)); + hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_NOTARRAY)); } } @@ -614,7 +614,7 @@ void hb_arrayCopy( PHB_ITEM pSrcArray, PHB_ITEM pDstArray, ULONG ulStart, } else { - hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_NOTARRAY)); + hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_NOTARRAY)); } } @@ -651,7 +651,7 @@ PHB_ITEM hb_arrayClone( PHB_ITEM pSrcArray ) } else { - hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_NOTARRAY)); + hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_NOTARRAY)); } return pDstArray; } diff --git a/harbour/source/rtl/errorapi.c b/harbour/source/rtl/errorapi.c index aabae5bbc6..6362e5c74c 100644 --- a/harbour/source/rtl/errorapi.c +++ b/harbour/source/rtl/errorapi.c @@ -282,7 +282,7 @@ WORD hb_errorRT_BASE( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, ch if( szDescription ) hb_errPutDescription( pError, szDescription ); else - hb_errPutDescription( pError, hb_ErrorNatDescription(ulGenCode) ); + hb_errPutDescription( pError, hb_errorNatDescription(ulGenCode) ); hb_errPutOperation( pError, szOperation ); wRetVal = hb_errLaunch( pError ); @@ -304,7 +304,7 @@ WORD hb_errorRT_TERMINAL( ULONG ulGenCode, ULONG ulSubCode, char * szDescription if( szDescription ) hb_errPutDescription( pError, szDescription ); else - hb_errPutDescription( pError, hb_ErrorNatDescription(ulGenCode) ); + hb_errPutDescription( pError, hb_errorNatDescription(ulGenCode) ); hb_errPutOperation( pError, szOperation ); wRetVal = hb_errLaunch( pError ); @@ -326,7 +326,7 @@ WORD hb_errorRT_DBCMD( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, c if( szDescription ) hb_errPutDescription( pError, szDescription ); else - hb_errPutDescription( pError, hb_ErrorNatDescription(ulGenCode) ); + hb_errPutDescription( pError, hb_errorNatDescription(ulGenCode) ); hb_errPutOperation( pError, szOperation ); wRetVal = hb_errLaunch( pError ); diff --git a/harbour/source/rtl/msgxxx.c b/harbour/source/rtl/msgxxx.c index fa206ab4a1..351f1083ec 100644 --- a/harbour/source/rtl/msgxxx.c +++ b/harbour/source/rtl/msgxxx.c @@ -1,6 +1,7 @@ /* * $Id$ */ + #include "hbdefs.h" #include "hbsetup.h" @@ -16,8 +17,12 @@ #include "natmsg/msgger.c" #elif defined(HARBOUR_LANGUAGE_INA) #include "natmsg/msgia.c" -#elif defined(HARBOUR_LANGUAGE_HU) -#include "natmsg/msghu.c" +#elif defined(HARBOUR_LANGUAGE_HU852) +#include "natmsg/msghu852.c" +#elif defined(HARBOUR_LANGUAGE_HUCWI) +#include "natmsg/msghucwi.c" +#elif defined(HARBOUR_LANGUAGE_HUWIN) +#include "natmsg/msghuwin.c" #elif defined(HARBOUR_LANGUAGE_KOR) #include "natmsg/msgkor.c" #elif defined(HARBOUR_LANGUAGE_POR) @@ -47,3 +52,11 @@ #else #include "natmsg/msguk.c" #endif + +char *hb_errorNatDescription( ULONG ulGenError ) +{ + if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) + return genericErrors[ ulGenError ]; + else + return genericErrors[ 0 ]; +} diff --git a/harbour/source/rtl/natmsg/makefile.dos b/harbour/source/rtl/natmsg/makefile.dos deleted file mode 100644 index 3b43e8e40c..0000000000 --- a/harbour/source/rtl/natmsg/makefile.dos +++ /dev/null @@ -1,19 +0,0 @@ -# $Id$ -# Make file for DOS DJGPP -# -include ../../../makedos.env - -SRCPRG:= $(wildcard *.prg) -CPRG=$(SRCPRG:.prg=.c) -OBJPRG=$(CPRG:.c=.o) - -SRCC:= $(wildcard *.c) -OBJC=$(SRCC:.c=.o) - -all: $(HARBOURLIB) - -$(HARBOURLIB): ${OBJPRG} $(OBJC) - ar r $(HARBOURLIB) msguk.o - -clean: - -del *.o diff --git a/harbour/source/rtl/natmsg/msgbas.c b/harbour/source/rtl/natmsg/msgbas.c index 237dfbf372..6ec8298d3e 100644 --- a/harbour/source/rtl/natmsg/msgbas.c +++ b/harbour/source/rtl/natmsg/msgbas.c @@ -2,22 +2,40 @@ * $Id$ */ -/* - * Language support unit for Basque - */ +/* Language Support Module */ + +/* Language name: Basque */ +/* ISO language code (2 chars): EU */ +/* Codepage: ???? */ #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "Urtarrila", "Otsaila", "Martxoa", - "Apirila", "Maitza", "Ekaina", "Uztaila", - "Abuztua", "Iraila", "Urria", - "Azaroa", "Abendua" }; +char *hb_monthsname[ 12 ] = +{ + "Urtarrila", + "Otsaila", + "Martxoa", + "Apirila", + "Maitza", + "Ekaina", + "Uztaila", + "Abuztua", + "Iraila", + "Urria", + "Azaroa", + "Abendua" +}; -char *hb_daysname[ 7 ] = { - "Igandea", "Astelehena", "Asteartea", - "Asteazkena", "Osteguna", "Ostirala", - "Larunbata" }; +char *hb_daysname[ 7 ] = +{ + "Igandea", + "Astelehena", + "Asteartea", + "Asteazkena", + "Osteguna", + "Ostirala", + "Larunbata" +}; static char *genericErrors[] = { @@ -72,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msgcat.c b/harbour/source/rtl/natmsg/msgcat.c index caf8d9edb3..2aff74ade2 100644 --- a/harbour/source/rtl/natmsg/msgcat.c +++ b/harbour/source/rtl/natmsg/msgcat.c @@ -2,23 +2,40 @@ * $Id$ */ -/* - * Language support unit for Catalan - * - */ +/* Language Support Module */ + +/* Language name: Catalan */ +/* ISO language code (2 chars): CA */ +/* Codepage: ???? */ #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "Xaner", "Febrer", "Mars", - "April", "Mallol", "Xuniol", "Xuliol", - "Agust", "Setembre", "Octubre", - "Novembre", "Decembre" }; +char *hb_monthsname[ 12 ] = +{ + "Xaner", + "Febrer", + "Mars", + "April", + "Mallol", + "Xuniol", + "Xuliol", + "Agust", + "Setembre", + "Octubre", + "Novembre", + "Decembre" +}; -char *hb_daysname[ 7 ] = { - "Diumenge", "Dilluns", "Dimarts", - "Dimecres", "Dijous", "Divendres", - "Disabte" }; +char *hb_daysname[ 7 ] = +{ + "Diumenge", + "Dilluns", + "Dimarts", + "Dimecres", + "Dijous", + "Divendres", + "Disabte" +}; static char *genericErrors[] = { @@ -73,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msgcz852.c b/harbour/source/rtl/natmsg/msgcz852.c index 4d035565df..454d78cb7f 100644 --- a/harbour/source/rtl/natmsg/msgcz852.c +++ b/harbour/source/rtl/natmsg/msgcz852.c @@ -2,8 +2,11 @@ * $Id$ */ -/* Czech language module (2 char. ISO language code: CZ) */ -/* Codepage: Latin II - 852 */ +/* Language Support Module */ + +/* Language name: Czech */ +/* ISO language code (2 chars): CS */ +/* Codepage: Latin II - 852 */ #include "hbdefs.h" @@ -87,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msgczkam.c b/harbour/source/rtl/natmsg/msgczkam.c index 5206cb428e..b54783b038 100644 --- a/harbour/source/rtl/natmsg/msgczkam.c +++ b/harbour/source/rtl/natmsg/msgczkam.c @@ -2,8 +2,11 @@ * $Id$ */ -/* Czech language module (2 char. ISO language code: CZ) */ -/* Codepage: Czech - Kamenickych (CS2) */ +/* Language Support Module */ + +/* Language name: Czech */ +/* ISO language code (2 chars): CS */ +/* Codepage: Czech - Kamenickych (CS2) */ #include "hbdefs.h" @@ -87,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msgdut.c b/harbour/source/rtl/natmsg/msgdut.c index 360fad14eb..9131bcfbb9 100644 --- a/harbour/source/rtl/natmsg/msgdut.c +++ b/harbour/source/rtl/natmsg/msgdut.c @@ -2,17 +2,40 @@ * $Id$ */ +/* Language Support Module */ + +/* Language name: Dutch */ +/* ISO language code (2 chars): NL */ +/* Codepage: ???? */ + #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "januari", "februari", "maart", - "april", "mei", "juni", "juli", - "augustus", "september", "oktober", - "november", "december" }; +char *hb_monthsname[ 12 ] = +{ + "januari", + "februari", + "maart", + "april", + "mei", + "juni", + "juli", + "augustus", + "september", + "oktober", + "november", + "december" +}; -char *hb_daysname[ 7 ] = { - "zondag", "maandag", "dinsdag", "woensdag", "donderdag", "vrijdag", - "zaterdag" }; +char *hb_daysname[ 7 ] = +{ + "zondag", + "maandag", + "dinsdag", + "woensdag", + "donderdag", + "vrijdag", + "zaterdag" +}; static char *genericErrors[] = { @@ -67,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msgeo.c b/harbour/source/rtl/natmsg/msgeo.c index 9507f64969..660035ecaa 100644 --- a/harbour/source/rtl/natmsg/msgeo.c +++ b/harbour/source/rtl/natmsg/msgeo.c @@ -1,20 +1,41 @@ /* - * Language support unit for Esperanto - * Codepage: N/A + * $Id$ */ +/* Language Support Module */ + +/* Language name: Esperanto */ +/* ISO language code (2 chars): EO */ +/* Codepage: ???? */ + #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "Jaunaro", "Februaro", "Marto", - "Aprilo", "Majo", "Junio", "Julio", - "Agusto", "Septembro", "Oktobro", - "Novembro", "Decembro" }; +char *hb_monthsname[ 12 ] = +{ + "Jaunaro", + "Februaro", + "Marto", + "Aprilo", + "Majo", + "Junio", + "Julio", + "Agusto", + "Septembro", + "Oktobro", + "Novembro", + "Decembro" +}; -char *hb_daysname[ 7 ] = { - "dimanco", "lundo", "mardo", - "merkredo", "jaudo", "vendredo", - "sabato" }; +char *hb_daysname[ 7 ] = +{ + "dimanco", + "lundo", + "mardo", + "merkredo", + "jaudo", + "vendredo", + "sabato" +}; static char *genericErrors[] = { @@ -69,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msgfre.c b/harbour/source/rtl/natmsg/msgfre.c index 5b52bb7af8..41d1b893e8 100644 --- a/harbour/source/rtl/natmsg/msgfre.c +++ b/harbour/source/rtl/natmsg/msgfre.c @@ -2,23 +2,40 @@ * $Id$ */ -/* - * Language support unit for French - * - */ +/* Language Support Module */ + +/* Language name: French */ +/* ISO language code (2 chars): FR */ +/* Codepage: ???? */ #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "Janvier", "Fvrier", "Mars", - "Avril", "May", "Juin", "Juillet", - "Aot", "Septembre", "Octobre", - "Novembre", "Dcembre" }; +char *hb_monthsname[ 12 ] = +{ + "Janvier", + "Fvrier", + "Mars", + "Avril", + "May", + "Juin", + "Juillet", + "Aot", + "Septembre", + "Octobre", + "Novembre", + "Dcembre" +}; -char *hb_daysname[ 7 ] = { - "Dimanche", "Lundi", "Mardi", - "Mercredi", "Jeudi", "Vendredi", - "Samedi" }; +char *hb_daysname[ 7 ] = +{ + "Dimanche", + "Lundi", + "Mardi", + "Mercredi", + "Jeudi", + "Vendredi", + "Samedi" +}; static char *genericErrors[] = { @@ -73,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msggal.c b/harbour/source/rtl/natmsg/msggal.c index 325bbfc7ce..272db5c629 100644 --- a/harbour/source/rtl/natmsg/msggal.c +++ b/harbour/source/rtl/natmsg/msggal.c @@ -2,23 +2,40 @@ * $Id$ */ -/* - * Language support unit for Galician - * - */ +/* Language Support Module */ + +/* Language name: Galician */ +/* ISO language code (2 chars): GL */ +/* Codepage: ???? */ #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "Xaneiro", "Febreiro", "Marzal", - "Abril", "Maio", "Xunio", "Xullo", - "Agosto", "Setembro", "Outubro", - "Novembro", "Decembro" }; +char *hb_monthsname[ 12 ] = +{ + "Xaneiro", + "Febreiro", + "Marzal", + "Abril", + "Maio", + "Xunio", + "Xullo", + "Agosto", + "Setembro", + "Outubro", + "Novembro", + "Decembro" +}; -char *hb_daysname[ 7 ] = { - "Domingo", "Luns", "Martes", - "Mrcores", "Xoves", "Venres", - "Sbado" }; +char *hb_daysname[ 7 ] = +{ + "Domingo", + "Luns", + "Martes", + "Mrcores", + "Xoves", + "Venres", + "Sbado" +}; static char *genericErrors[] = { @@ -73,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msgger.c b/harbour/source/rtl/natmsg/msgger.c index c3b2d7d19e..03aad4dc48 100644 --- a/harbour/source/rtl/natmsg/msgger.c +++ b/harbour/source/rtl/natmsg/msgger.c @@ -2,18 +2,40 @@ * $Id$ */ +/* Language Support Module */ + +/* Language name: German */ +/* ISO language code (2 chars): DE */ +/* Codepage: ???? */ + #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "Januar", "Februar", "Mrz", - "April", "Mai", "Juni", "Juli", - "August", "September", "Oktober", - "November", "Dezember" }; +char *hb_monthsname[ 12 ] = +{ + "Januar", + "Februar", + "Mrz", + "April", + "Mai", + "Juni", + "Juli", + "August", + "September", + "Oktober", + "November", + "Dezember" +}; -char *hb_daysname[ 7 ] = { - "Sonntag", "Montag", "Dienstag", - "Mittwoch", "Donnerstag", "Freitag", - "Samstag" }; +char *hb_daysname[ 7 ] = +{ + "Sonntag", + "Montag", + "Dienstag", + "Mittwoch", + "Donnerstag", + "Freitag", + "Samstag" +}; static char *genericErrors[] = { @@ -68,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msghu.c b/harbour/source/rtl/natmsg/msghu.c deleted file mode 100644 index 1d60f3bd49..0000000000 --- a/harbour/source/rtl/natmsg/msghu.c +++ /dev/null @@ -1,126 +0,0 @@ -/* $Id$ - - Harbour Project source code - - Hungarian language module (2 char. ISO language code: HU) - Codepage: 852 - - Copyright (C) 1999 Victor Szel - 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/). -*/ - -/* TODO: Decide which codepage to use, and how to implement the whole - codepage issue */ - -#include "hbdefs.h" - -char *hb_monthsname[ 12 ] = -{ - "janur", - "februr", - "mrcius", - "prilis", - "mjus", - "jnius", - "jlius", - "augusztus", - "szeptember", - "oktber", - "november", - "december" -}; - -char *hb_daysname[ 7 ] = -{ - "vasrnap", - "htf", - "kedd", - "szerda", - "cstrtk", - "pntek", - "szombat" -}; - -static char *genericErrors[] = -{ - "Ismeretlen hiba", - "Paramter hiba", - "Tmbindex hiba", - "Karakteres vltoz tlcsorduls", - "Numerikus tlcsorduls", - "Nullval val oszts", - "Numerikus hiba", - "Szintaktikus hiba", - "Tl sszetett mvelet", - "", - "", - "Kevs memria", - "Nem definilt fggvny", - "Nem exportlt metdus", - "Nem ltez vltoz", - "Nem ltez munkaterlet nv", - "Nem exportlt vltoz", - "Helytelen munkaterlet nv", - "Mr hasznlt munkaterlet nv", - "", - "Ltrehozsi hiba", - "Megnyitsi hiba", - "Lezrsi hiba", - "Olvassi hiba", - "rs hiba", - "Nyomtatsi hiba", - "", - "", - "", - "", - "Nem tmogatott mvelet", - "Korlt tllpve", - "Index hiba felfedezve", - "Nem megfelel adattpus", - "Tl szles adat", - "Nem megnyitott munkaterlet", - "Nem indexelt munkaterlet", - "Kizrlagos megnyitsi md szksges", - "Zrols szksges", - "rs nem megengedett", - "Zrols nem sikerlt j rekord felvitelekor", - "Zrols nem sikerlt", - "", - "", - "", - "Nem megfelel szm paramter", - "tmbelem hozzfrs", - "tmbelem rtkads", - "nem tmb", - "feltteles" -}; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msghu852.c b/harbour/source/rtl/natmsg/msghu852.c new file mode 100644 index 0000000000..1ec0fafb88 --- /dev/null +++ b/harbour/source/rtl/natmsg/msghu852.c @@ -0,0 +1,92 @@ +/* + * $Id$ + */ + +/* Language Support Module */ + +/* Language name: Hungarian */ +/* ISO language code (2 chars): HU */ +/* Codepage: 852 */ + +#include "hbdefs.h" + +char *hb_monthsname[ 12 ] = +{ + "janur", + "februr", + "mrcius", + "prilis", + "mjus", + "jnius", + "jlius", + "augusztus", + "szeptember", + "oktber", + "november", + "december" +}; + +char *hb_daysname[ 7 ] = +{ + "vasrnap", + "htf", + "kedd", + "szerda", + "cstrtk", + "pntek", + "szombat" +}; + +static char *genericErrors[] = +{ + "Ismeretlen hiba", + "Paramter hiba", + "Tmbindex hiba", + "Karakteres vltoz tlcsorduls", + "Numerikus tlcsorduls", + "Nullval val oszts", + "Numerikus hiba", + "Szintaktikus hiba", + "Tl sszetett mvelet", + "", + "", + "Kevs memria", + "Nem definilt fggvny", + "Nem exportlt metdus", + "Nem ltez vltoz", + "Nem ltez munkaterlet nv", + "Nem exportlt vltoz", + "Helytelen munkaterlet nv", + "Mr hasznlt munkaterlet nv", + "", + "Ltrehozsi hiba", + "Megnyitsi hiba", + "Lezrsi hiba", + "Olvassi hiba", + "rs hiba", + "Nyomtatsi hiba", + "", + "", + "", + "", + "Nem tmogatott mvelet", + "Korlt tllpve", + "Index hiba felfedezve", + "Nem megfelel adattpus", + "Tl szles adat", + "Nem megnyitott munkaterlet", + "Nem indexelt munkaterlet", + "Kizrlagos megnyitsi md szksges", + "Zrols szksges", + "rs nem megengedett", + "Zrols nem sikerlt j rekord felvitelekor", + "Zrols nem sikerlt", + "", + "", + "", + "Nem megfelel szm paramter", + "tmbelem hozzfrs", + "tmbelem rtkads", + "nem tmb", + "feltteles" +}; diff --git a/harbour/source/rtl/natmsg/msghucwi.c b/harbour/source/rtl/natmsg/msghucwi.c new file mode 100644 index 0000000000..77603e6ba0 --- /dev/null +++ b/harbour/source/rtl/natmsg/msghucwi.c @@ -0,0 +1,92 @@ +/* + * $Id$ + */ + +/* Language Support Module */ + +/* Language name: Hungarian */ +/* ISO language code (2 chars): HU */ +/* Codepage: CWI-2 */ + +#include "hbdefs.h" + +char *hb_monthsname[ 12 ] = +{ + "janur", + "februr", + "mrcius", + "prilis", + "mjus", + "jnius", + "jlius", + "augusztus", + "szeptember", + "oktber", + "november", + "december" +}; + +char *hb_daysname[ 7 ] = +{ + "vasrnap", + "htf", + "kedd", + "szerda", + "cstrtk", + "pntek", + "szombat" +}; + +static char *genericErrors[] = +{ + "Ismeretlen hiba", + "Paramter hiba", + "Tmbindex hiba", + "Karakteres vltoz tlcsorduls", + "Numerikus tlcsorduls", + "Nullval val oszts", + "Numerikus hiba", + "Szintaktikus hiba", + "Tl sszetett mvelet", + "", + "", + "Kevs memria", + "Nem definilt fggvny", + "Nem exportlt metdus", + "Nem ltez vltoz", + "Nem ltez munkaterlet nv", + "Nem exportlt vltoz", + "Helytelen munkaterlet nv", + "Mr hasznlt munkaterlet nv", + "", + "Ltrehozsi hiba", + "Megnyitsi hiba", + "Lezrsi hiba", + "Olvassi hiba", + "rs hiba", + "Nyomtatsi hiba", + "", + "", + "", + "", + "Nem tmogatott mvelet", + "Korlt tllpve", + "Index hiba felfedezve", + "Nem megfelel adattpus", + "Tl szles adat", + "Nem megnyitott munkaterlet", + "Nem indexelt munkaterlet", + "Kizrlagos megnyitsi md szksges", + "Zrols szksges", + "rs nem megengedett", + "Zrols nem sikerlt j rekord felvitelekor", + "Zrols nem sikerlt", + "", + "", + "", + "Nem megfelel szm paramter", + "tmbelem hozzfrs", + "tmbelem rtkads", + "nem tmb", + "feltteles" +}; diff --git a/harbour/source/rtl/natmsg/msghuwin.c b/harbour/source/rtl/natmsg/msghuwin.c new file mode 100644 index 0000000000..897f920308 --- /dev/null +++ b/harbour/source/rtl/natmsg/msghuwin.c @@ -0,0 +1,92 @@ +/* + * $Id$ + */ + +/* Language Support Module */ + +/* Language name: Hungarian */ +/* ISO language code (2 chars): HU */ +/* Codepage: Windows-1 */ + +#include "hbdefs.h" + +char *hb_monthsname[ 12 ] = +{ + "janur", + "februr", + "mrcius", + "prilis", + "mjus", + "jnius", + "jlius", + "augusztus", + "szeptember", + "oktber", + "november", + "december" +}; + +char *hb_daysname[ 7 ] = +{ + "vasrnap", + "htf", + "kedd", + "szerda", + "cstrtk", + "pntek", + "szombat" +}; + +static char *genericErrors[] = +{ + "Ismeretlen hiba", + "Paramter hiba", + "Tmbindex hiba", + "Karakteres vltoz tlcsorduls", + "Numerikus tlcsorduls", + "Nullval val oszts", + "Numerikus hiba", + "Szintaktikus hiba", + "Tl sszetett mvelet", + "", + "", + "Kevs memria", + "Nem definilt fggvny", + "Nem exportlt metdus", + "Nem ltez vltoz", + "Nem ltez munkaterlet nv", + "Nem exportlt vltoz", + "Helytelen munkaterlet nv", + "Mr hasznlt munkaterlet nv", + "", + "Ltrehozsi hiba", + "Megnyitsi hiba", + "Lezrsi hiba", + "Olvassi hiba", + "rs hiba", + "Nyomtatsi hiba", + "", + "", + "", + "", + "Nem tmogatott mvelet", + "Korlt tllpve", + "Index hiba felfedezve", + "Nem megfelel adattpus", + "Tl szles adat", + "Nem megnyitott munkaterlet", + "Nem indexelt munkaterlet", + "Kizrlagos megnyitsi md szksges", + "Zrols szksges", + "rs nem megengedett", + "Zrols nem sikerlt j rekord felvitelekor", + "Zrols nem sikerlt", + "", + "", + "", + "Nem megfelel szm paramter", + "tmbelem hozzfrs", + "tmbelem rtkads", + "nem tmb", + "feltteles" +}; diff --git a/harbour/source/rtl/natmsg/msgia.c b/harbour/source/rtl/natmsg/msgia.c index 4834a75deb..b05c014408 100644 --- a/harbour/source/rtl/natmsg/msgia.c +++ b/harbour/source/rtl/natmsg/msgia.c @@ -2,21 +2,40 @@ * $Id$ */ -/* Indonesian language module */ -/* Codepage: N/A */ +/* Language Support Module */ + +/* Language name: Indonesian */ +/* ISO language code (2 chars): ID */ +/* Codepage: ???? */ #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "Januari", "Februari", "Maret", - "April", "Mei", "Juni", "Juli", - "Agustus", "September", "Oktober", - "Nopember", "Desember" }; +char *hb_monthsname[ 12 ] = +{ + "Januari", + "Februari", + "Maret", + "April", + "Mei", + "Juni", + "Juli", + "Agustus", + "September", + "Oktober", + "Nopember", + "Desember" +}; -char *hb_daysname[ 7 ] = { - "Minggu", "Senin", "Selasa", - "Rabu", "Kamis", "Jumat", - "Sabtu" }; +char *hb_daysname[ 7 ] = +{ + "Minggu", + "Senin", + "Selasa", + "Rabu", + "Kamis", + "Jumat", + "Sabtu" +}; static char *genericErrors[] = { @@ -71,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msgita.c b/harbour/source/rtl/natmsg/msgita.c index 72b883a1f0..9c3a0eee84 100644 --- a/harbour/source/rtl/natmsg/msgita.c +++ b/harbour/source/rtl/natmsg/msgita.c @@ -2,23 +2,40 @@ * $Id$ */ -/* - * Language support unit for Italian - * - */ +/* Language Support Module */ + +/* Language name: Italian */ +/* ISO language code (2 chars): IT */ +/* Codepage: ???? */ #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "Gennaio", "Febbraio", "Marzo", - "Aprile", "Maggio", "Giugno", "Luglio", - "Agosto", "Settembre", "Ottobre", - "Novembre", "Dicembre" }; +char *hb_monthsname[ 12 ] = +{ + "Gennaio", + "Febbraio", + "Marzo", + "Aprile", + "Maggio", + "Giugno", + "Luglio", + "Agosto", + "Settembre", + "Ottobre", + "Novembre", + "Dicembre" +}; -char *hb_daysname[ 7 ] = { - "Domenica", "Lunedi", "Martedi", - "Mercoledi", "Giovedi", "Venerdi", - "Sabato" }; +char *hb_daysname[ 7 ] = +{ + "Domenica", + "Lunedi", + "Martedi", + "Mercoledi", + "Giovedi", + "Venerdi", + "Sabato" +}; static char *genericErrors[] = { @@ -73,11 +90,3 @@ static char *genericErrors[] = "non e' un array", "condizione" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msgkor.c b/harbour/source/rtl/natmsg/msgkor.c index b28fce20f2..50033d8a44 100644 --- a/harbour/source/rtl/natmsg/msgkor.c +++ b/harbour/source/rtl/natmsg/msgkor.c @@ -2,20 +2,40 @@ * $Id$ */ -/* Korea language module */ +/* Language Support Module */ + +/* Language name: Korean */ +/* ISO language code (2 chars): KO */ +/* Codepage: ???? */ #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "1", "2", "3", - "4", "5", "6", "7", - "8", "9", "10", - "11", "12" }; +char *hb_monthsname[ 12 ] = +{ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12" +}; -char *hb_daysname[ 7 ] = { - "Ͽ", "", "ȭ", - "", "", "ݿ", - "" }; +char *hb_daysname[ 7 ] = +{ + "Ͽ", + "", + "ȭ", + "", + "", + "ݿ", + "" +}; static char *genericErrors[] = { @@ -70,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msgpl852.c b/harbour/source/rtl/natmsg/msgpl852.c index e9f1696464..fdf2e94676 100644 --- a/harbour/source/rtl/natmsg/msgpl852.c +++ b/harbour/source/rtl/natmsg/msgpl852.c @@ -2,21 +2,40 @@ * $Id$ */ -/* Polish language module - Polskojzyczny modu dla Harbour */ +/* Language Support Module - Polskojzyczny modu dla Harbour */ + +/* Language name: Polish */ +/* ISO language code (2 chars): PL */ /* Codepage: Latin II - 852 */ #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "Stycze", "Luty", "Marzec", - "Kwiecie", "Maj", "Czerwiec", "Lipiec", - "Sierpie", "Wrzesie", "Padziernik", - "Listopad", "Grudzie" }; +char *hb_monthsname[ 12 ] = +{ + "Stycze", + "Luty", + "Marzec", + "Kwiecie", + "Maj", + "Czerwiec", + "Lipiec", + "Sierpie", + "Wrzesie", + "Padziernik", + "Listopad", + "Grudzie" +}; -char *hb_daysname[ 7 ] = { - "Niedziela", "Poniedziaek", "Wtorek", - "roda", "Czwartek", "Pitek", - "Sobota" }; +char *hb_daysname[ 7 ] = +{ + "Niedziela", + "Poniedziaek", + "Wtorek", + "roda", + "Czwartek", + "Pitek", + "Sobota" +}; static char *genericErrors[] = { @@ -71,12 +90,3 @@ static char *genericErrors[] = "wymagana jest tablica", "wymagany typ: logiczny" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} - diff --git a/harbour/source/rtl/natmsg/msgpliso.c b/harbour/source/rtl/natmsg/msgpliso.c index eca56fd4e0..a66054d261 100644 --- a/harbour/source/rtl/natmsg/msgpliso.c +++ b/harbour/source/rtl/natmsg/msgpliso.c @@ -2,21 +2,40 @@ * $Id$ */ -/* Polish language module - Polskojzyczny modu dla Harbour */ +/* Language Support Module - Polskojzyczny modu dla Harbour */ + +/* Language name: Polish */ +/* ISO language code (2 chars): PL */ /* Codepage: ISO-8859-2 */ #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "Stycze", "Luty", "Marzec", - "Kwiecie", "Maj", "Czerwiec", "Lipiec", - "Sierpie", "Wrzesie", "Padziernik", - "Listopad", "Grudzie" }; +char *hb_monthsname[ 12 ] = +{ + "Stycze", + "Luty", + "Marzec", + "Kwiecie", + "Maj", + "Czerwiec", + "Lipiec", + "Sierpie", + "Wrzesie", + "Padziernik", + "Listopad", + "Grudzie" +}; -char *hb_daysname[ 7 ] = { - "Niedziela", "Poniedziaek", "Wtorek", - "roda", "Czwartek", "Pitek", - "Sobota" }; +char *hb_daysname[ 7 ] = +{ + "Niedziela", + "Poniedziaek", + "Wtorek", + "roda", + "Czwartek", + "Pitek", + "Sobota" +}; static char *genericErrors[] = { @@ -71,12 +90,3 @@ static char *genericErrors[] = "wymagana jest tablica", "wymagany typ: logiczny" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} - diff --git a/harbour/source/rtl/natmsg/msgplmaz.c b/harbour/source/rtl/natmsg/msgplmaz.c index 390cb1af18..e0c66ce5f8 100644 --- a/harbour/source/rtl/natmsg/msgplmaz.c +++ b/harbour/source/rtl/natmsg/msgplmaz.c @@ -2,21 +2,40 @@ * $Id$ */ -/* Polish language module - Polskojzyczny modu dla Harbour */ +/* Language Support Module - Polskojzyczny modu dla Harbour */ + +/* Language name: Polish */ +/* ISO language code (2 chars): PL */ /* Codepage: Mazowia */ #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "Stycze", "Luty", "Marzec", - "Kwiecie", "Maj", "Czerwiec", "Lipiec", - "Sierpie", "Wrzesie", "Padziernik", - "Listopad", "Grudzie" }; +char *hb_monthsname[ 12 ] = +{ + "Stycze", + "Luty", + "Marzec", + "Kwiecie", + "Maj", + "Czerwiec", + "Lipiec", + "Sierpie", + "Wrzesie", + "Padziernik", + "Listopad", + "Grudzie" +}; -char *hb_daysname[ 7 ] = { - "Niedziela", "Poniedziaek", "Wtorek", - "roda", "Czwartek", "Pitek", - "Sobota" }; +char *hb_daysname[ 7 ] = +{ + "Niedziela", + "Poniedziaek", + "Wtorek", + "roda", + "Czwartek", + "Pitek", + "Sobota" +}; static char *genericErrors[] = { @@ -71,12 +90,3 @@ static char *genericErrors[] = "wymagana jest tablica", "wymagany typ: logiczny" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} - diff --git a/harbour/source/rtl/natmsg/msgpor.c b/harbour/source/rtl/natmsg/msgpor.c index bf5cdcfe5c..c9024a2414 100644 --- a/harbour/source/rtl/natmsg/msgpor.c +++ b/harbour/source/rtl/natmsg/msgpor.c @@ -2,18 +2,40 @@ * $Id$ */ +/* Language Support Module */ + +/* Language name: Portugese */ +/* ISO language code (2 chars): PT */ +/* Codepage: ???? */ + #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "Janeiro", "Fevereiro", "Maro", - "Abril", "Maio", "Junho", "Julho", - "Agosto", "Setembro", "Outubro", - "Novembro", "Dezembro" }; +char *hb_monthsname[ 12 ] = +{ + "Janeiro", + "Fevereiro", + "Maro", + "Abril", + "Maio", + "Junho", + "Julho", + "Agosto", + "Setembro", + "Outubro", + "Novembro", + "Dezembro" +}; -char *hb_daysname[ 7 ] = { - "Domingo", "Segunda-feira", "Tera-feira", - "Quarta-feira", "Quinta-feira", "Sexta-feira", - "Sbado" }; +char *hb_daysname[ 7 ] = +{ + "Domingo", + "Segunda-feira", + "Tera-feira", + "Quarta-feira", + "Quinta-feira", + "Sexta-feira", + "Sbado" +}; static char *genericErrors[] = { @@ -68,11 +90,3 @@ static char *genericErrors[] = "no um array", "condicional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msgr1251.c b/harbour/source/rtl/natmsg/msgr1251.c index 5fca302986..94414b9471 100644 --- a/harbour/source/rtl/natmsg/msgr1251.c +++ b/harbour/source/rtl/natmsg/msgr1251.c @@ -2,18 +2,40 @@ * $Id$ */ +/* Language Support Module */ + +/* Language name: Russian */ +/* ISO language code (2 chars): RU */ +/* Codepage: 1251 */ + #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "", "", "", - "", "", "", "", - "", "", "", - "", "" }; +char *hb_monthsname[ 12 ] = +{ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" +}; -char *hb_daysname[ 7 ] = { - "", "", "", - "", "", "", - "" }; +char *hb_daysname[ 7 ] = +{ + "", + "", + "", + "", + "", + "", + "" +}; static char *genericErrors[] = { @@ -68,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msgru866.c b/harbour/source/rtl/natmsg/msgru866.c index 3099df0d0e..bffe07f76f 100644 --- a/harbour/source/rtl/natmsg/msgru866.c +++ b/harbour/source/rtl/natmsg/msgru866.c @@ -2,18 +2,40 @@ * $Id$ */ +/* Language Support Module */ + +/* Language name: Portugese */ +/* ISO language code (2 chars): PT */ +/* Codepage: 866 */ + #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "", "ࠫ", "", - "५", "", "", "", - "", "", "", - "", "" }; +char *hb_monthsname[ 12 ] = +{ + "", + "ࠫ", + "", + "५", + "", + "", + "", + "", + "", + "", + "", + "" +}; -char *hb_daysname[ 7 ] = { - "ᥭ", "쭨", "୨", - "।", "⢥", "⭨", - "㡡" }; +char *hb_daysname[ 7 ] = +{ + "ᥭ", + "쭨", + "୨", + "।", + "⢥", + "⭨", + "㡡" +}; static char *genericErrors[] = { @@ -68,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msgspa.c b/harbour/source/rtl/natmsg/msgspa.c index 1d78255e29..5b4df1147d 100644 --- a/harbour/source/rtl/natmsg/msgspa.c +++ b/harbour/source/rtl/natmsg/msgspa.c @@ -2,18 +2,40 @@ * $Id$ */ +/* Language Support Module */ + +/* Language name: Spanish */ +/* ISO language code (2 chars): ES */ +/* Codepage: ???? */ + #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "Enero", "Febrero", "Marzo", - "Abril", "Mayo", "Junio", "Julio", - "Agosto", "Septiembre", "Octubre", - "Noviembre", "Diciembre" }; +char *hb_monthsname[ 12 ] = +{ + "Enero", + "Febrero", + "Marzo", + "Abril", + "Mayo", + "Junio", + "Julio", + "Agosto", + "Septiembre", + "Octubre", + "Noviembre", + "Diciembre" +}; -char *hb_daysname[ 7 ] = { - "Domingo", "Lunes", "Martes", - "Mircoles", "Jueves", "Viernes", - "Sbado" }; +char *hb_daysname[ 7 ] = +{ + "Domingo", + "Lunes", + "Martes", + "Mircoles", + "Jueves", + "Viernes", + "Sbado" +}; static char *genericErrors[] = { @@ -68,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msguk.c b/harbour/source/rtl/natmsg/msguk.c index d6c96fb8b6..3679124195 100644 --- a/harbour/source/rtl/natmsg/msguk.c +++ b/harbour/source/rtl/natmsg/msguk.c @@ -2,21 +2,40 @@ * $Id$ */ -/* English language module */ -/* Codepage: N/A */ +/* Language Support Module */ + +/* Language name: English */ +/* ISO language code (2 chars): EN */ +/* Codepage: ???? */ #include "hbdefs.h" -char *hb_monthsname[ 12 ] = { - "January", "February", "March", - "April", "May", "June", "July", - "August", "September", "October", - "November", "December" }; +char *hb_monthsname[ 12 ] = +{ + "January", + "February", + "March", + "April", + "May", + "June", + "July", + "August", + "September", + "October", + "November", + "December" +}; -char *hb_daysname[ 7 ] = { - "Sunday", "Monday", "Tuesday", - "Wednesday", "Thursday", "Friday", - "Saturday" }; +char *hb_daysname[ 7 ] = +{ + "Sunday", + "Monday", + "Tuesday", + "Wednesday", + "Thursday", + "Friday", + "Saturday" +}; static char *genericErrors[] = { @@ -71,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/rtl/natmsg/msgyu852.c b/harbour/source/rtl/natmsg/msgyu852.c index 26813e698e..211bd43108 100644 --- a/harbour/source/rtl/natmsg/msgyu852.c +++ b/harbour/source/rtl/natmsg/msgyu852.c @@ -2,8 +2,11 @@ * $Id$ */ -/* Serbian language module (2 char. ISO language code: YU) */ -/* Codepage: Latin II - 852 */ +/* Language Support Module */ + +/* Language name: Serbian */ +/* ISO language code (2 chars): SR */ +/* Codepage: Latin II - 852 */ #include "hbdefs.h" @@ -87,11 +90,3 @@ static char *genericErrors[] = "not an array", "conditional" }; - -char *hb_ErrorNatDescription( ULONG ulGenError ) -{ - if( ulGenError < sizeof(genericErrors)/sizeof(char*) ) - return genericErrors[ ulGenError ]; - else - return genericErrors[ 0 ]; -} diff --git a/harbour/source/runner/runner.c b/harbour/source/runner/runner.c index 70501769a9..e185f931b0 100644 --- a/harbour/source/runner/runner.c +++ b/harbour/source/runner/runner.c @@ -23,10 +23,11 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include + #include "pcode.h" #include "errorapi.h" #include "init.h" -#include /* #if INTEL32 */ static BYTE prgFunction[] = { 0x68, 0x00, 0x00, 0x00, 0x00, @@ -110,7 +111,7 @@ extern void Transfrm__InitSymbols( void ); static void InitRunnerTable( void ) { -#include /* Include default symbols */ +#include "initsymb.h" /* Include default symbols */ } #if !defined( __GNUC__ ) #pragma startup InitRunnerTable diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index 3ec30354e0..b6d1e169d9 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -180,12 +180,12 @@ int iHB_DEBUG = 0; /* if 1 traces the virtual machine activity */ STACK stack; SYMBOL symEval = { "__EVAL", FS_PUBLIC, DoBlock, 0 }; /* symbol to evaluate codeblocks */ -PSYMBOL pSymStart; /* start symbol of the application. MAIN() is not required */ +PSYMBOL pSymStart; /* start symbol of the application. MAIN() is not required */ HB_ITEM aStatics; /* Harbour array to hold all application statics variables */ HB_ITEM errorBlock; /* errorblock */ -PSYMBOLS pSymbols = 0; /* to hold a linked list of all different modules symbol tables */ -BOOL bQuit = FALSE; /* inmediately exit the application */ -BYTE bErrorLevel = 0; /* application exit errorlevel */ +PSYMBOLS pSymbols = 0; /* to hold a linked list of all different modules symbol tables */ +BOOL bQuit = FALSE; /* inmediately exit the application */ +BYTE bErrorLevel = 0; /* application exit errorlevel */ #define HB_DEBUG( x ) if( iHB_DEBUG ) printf( x ) #define HB_DEBUG2( x, y ) if( iHB_DEBUG ) printf( x, y ) @@ -650,7 +650,7 @@ void And( void ) } else { - hb_errorRT_BASE(EG_ARG, 1066, NULL, ".AND."); + hb_errorRT_BASE(EG_ARG, 1078, NULL, ".AND."); } } @@ -1404,7 +1404,7 @@ void Or( void ) } else { - hb_errorRT_BASE(EG_ARG, 1066, NULL, ".OR."); + hb_errorRT_BASE(EG_ARG, 1079, NULL, ".OR."); } } @@ -1544,7 +1544,7 @@ int PopLogical( void ) return stack.pPos->item.asLogical.value; else { - hb_errorRT_BASE(EG_ARG, 1066, NULL, hb_ErrorNatDescription(EG_CONDITION)); + hb_errorRT_BASE(EG_ARG, 1066, NULL, hb_errorNatDescription(EG_CONDITION)); return 0; } } @@ -2333,6 +2333,6 @@ HARBOUR HB_PVALUE(void) /* PValue( ) hb_itemReturn( pBase + 1 + wParam ); else { - hb_errorRT_BASE(EG_ARG, 1082, NULL, "PVALUE"); + hb_errorRT_BASE(EG_ARG, 9999, NULL, "PVALUE"); } }