diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 07a2cb4ccf..14373bf932 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,9 @@ +19990615-21:00 CET Jose Lalin / Eddie Runia + + source/rtl/natmsg/msgbas.c + * source/rtl/msgxxx.c + * source/compiler/harbour.y + VarId ArrayIndex ':' and ObjectData ArrayIndex ':' syntax was incorrect + 19990615-12:30 EDT David G. Holm * source/compiler/makefile.dos - Integrated preprocessor into compiler diff --git a/harbour/source/compiler/harbour.y b/harbour/source/compiler/harbour.y index 47744432a0..55a2aa38f7 100644 --- a/harbour/source/compiler/harbour.y +++ b/harbour/source/compiler/harbour.y @@ -611,20 +611,20 @@ MethParams : /* empty */ { $$ = 0; } ; ObjectData : IdSend IDENTIFIER { $$ = $2; _lMessageFix = functions.pLast->lPCodePos; Message( $2 ); Function( 0 ); } - | VarId ArrayIndex ':' IDENTIFIER { $$ = $4; _lMessageFix = functions.pLast->lPCodePos; Message( $4 ); Function( 0 ); } + | VarId ArrayIndex ':' IDENTIFIER { GenPCode1( _ARRAYAT ); $$ = $4; _lMessageFix = functions.pLast->lPCodePos; Message( $4 ); Function( 0 ); } | ObjFunCall IDENTIFIER { $$ = $2; _lMessageFix = functions.pLast->lPCodePos; Message( $2 ); Function( 0 ); } | ObjFunArray ':' IDENTIFIER { $$ = $3; _lMessageFix = functions.pLast->lPCodePos; Message( $3 ); Function( 0 ); } | ObjectMethod ':' IDENTIFIER { $$ = $3; _lMessageFix = functions.pLast->lPCodePos; Message( $3 ); Function( 0 ); } | ObjectData ':' IDENTIFIER { $$ = $3; _lMessageFix = functions.pLast->lPCodePos; Message( $3 ); Function( 0 ); } - | ObjectData ArrayIndex ':' IDENTIFIER { $$ = $4; _lMessageFix = functions.pLast->lPCodePos; Message( $4 ); Function( 0 ); } + | ObjectData ArrayIndex ':' IDENTIFIER { GenPCode1( _ARRAYAT ); $$ = $4; _lMessageFix = functions.pLast->lPCodePos; Message( $4 ); Function( 0 ); } ; ObjectMethod : IdSend IDENTIFIER { Message( $2 ); } '(' MethParams ')' { Function( $5 ); } - | VarId ArrayIndex ':' MethCall { Function( $4 ); } + | VarId ArrayIndex ':' MethCall { Function( $4 ); GenPCode1( _ARRAYAT ); } | ObjFunCall MethCall { Function( $2 ); } | ObjFunArray ':' MethCall { Function( $3 ); } | ObjectData ':' MethCall { Function( $3 ); } - | ObjectData ArrayIndex ':' MethCall { Function( $4 ); } + | ObjectData ArrayIndex ':' MethCall { Function( $4 ); { GenPCode1( _ARRAYAT ); } } | ObjectMethod ':' MethCall { Function( $3 ); } ; diff --git a/harbour/source/rtl/msgxxx.c b/harbour/source/rtl/msgxxx.c index 588010f934..6c23ef08a9 100644 --- a/harbour/source/rtl/msgxxx.c +++ b/harbour/source/rtl/msgxxx.c @@ -6,7 +6,9 @@ #define HB_LANGUAGE UK #endif -#if (HB_LANGUAGE == DUT) +#if (HB_LANGUAGE == BAS) +#include "natmsg/msgbas.c" +#elif (HB_LANGUAGE == DUT) #include "natmsg/msgdut.c" #elif (HB_LANGUAGE == GAL) #include "natmsg/msggal.c" diff --git a/harbour/source/rtl/natmsg/msgbas.c b/harbour/source/rtl/natmsg/msgbas.c new file mode 100644 index 0000000000..a397eddce2 --- /dev/null +++ b/harbour/source/rtl/natmsg/msgbas.c @@ -0,0 +1,15 @@ +/* + * Language support unit for Basque + * + */ + +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" };