fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-11-23 21:14 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/doc/man/harbour.1
  * harbour/source/compiler/hbusage.c
    + added description for -j switch

  * harbour/include/hbexprb.c
    * replaced // comments by /* */
    * accept <cContext> (domain) parameters of HB_i18nGettext() when
      number of parameters is two or more
      Should we generate compile time warning when wrong number of
      parameters is passed to this function or they are not literal
      strings? Maybe only after -j+ or sth like that?

  * harbour/include/hbclass.ch
  * harbour/include/tbrowse.ch
  * harbour/include/hbpers.ch
  * harbour/include/getexit.ch
    * replaced // comments by /* */
This commit is contained in:
Przemyslaw Czerpak
2007-11-23 20:14:30 +00:00
parent a3cbfe607f
commit 021bc664d5
8 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
harbour/ChangeLog
View File

@@ -8,6 +8,25 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2007-11-23 21:14 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/doc/man/harbour.1
* harbour/source/compiler/hbusage.c
+ added description for -j switch
* harbour/include/hbexprb.c
* replaced // comments by /* */
* accept <cContext> (domain) parameters of HB_i18nGettext() when
number of parameters is two or more
Should we generate compile time warning when wrong number of
parameters is passed to this function or they are not literal
strings? Maybe only after -j+ or sth like that?
* harbour/include/hbclass.ch
* harbour/include/tbrowse.ch
* harbour/include/hbpers.ch
* harbour/include/getexit.ch
* replaced // comments by /* */
2007-11-23 18:55 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
* harbour/source/include/hbexprb.c
* changed HB_i18nGettext() to hb_i18n_gettext(), to respect

2
harbour/doc/man/harbour.1
View File

@@ -38,6 +38,8 @@ output type: Windows/DOS OBJ32 (.obj)
output type: Harbour Portable Object (.hrb)
.IP "\fB-i<path>\fP" 10
#include file search path
.IP "\fB-j[<file>]\fP" 10
generate i18n gettex file (.pot)
.IP "\fB-k\fP" 10
compilation mode (type -k? for more data)
.IP "\fB-l\fP" 10

4
harbour/include/getexit.ch
View File

@@ -63,7 +63,7 @@
#define GE_WRITE 6
#define GE_ESCAPE 7
#define GE_WHEN 8 /* when clause unsatisfied */
#define GE_SHORTCUT 9 // introduced in x5.3
#define GE_MOUSEHIT 10 // introduced in x5.3
#define GE_SHORTCUT 9 /* introduced in x5.3 */
#define GE_MOUSEHIT 10 /* introduced in x5.3 */
#endif /* _GETEXIT_CH */

2
harbour/include/hbclass.ch
View File

@@ -442,7 +442,7 @@ DECLARE HBClass ;
#xcommand PROTECTED: => nScope := HB_OO_CLSTP_PROTECTED
// Classy compatibility... Added By JF Lefebvre (mafact) 2006/11/07
/* Classy compatibility... Added By JF Lefebvre (mafact) 2006/11/07 */
#xcommand METHOD <MethodName> [ AS <type> ] INLINE [Local <v>,] <Code,...> [<other>] => ;
MESSAGE <MethodName> [ AS <type> ] BLOCK {|Self [,<v>] | __HB_CLS_SYMBOL_UNUSED(Self), <Code>} [ <other>]

19
harbour/include/hbexprb.c
View File

@@ -1649,16 +1649,19 @@ static HB_EXPR_FUNC( hb_compExprUseFunCall )
{
HB_EXPR_PTR pArg = pParms->value.asList.pExprList;
// TODO: do we need to add empty string also?
// TODO: add context, line number
if( HB_COMP_PARAM->fI18n && pArg->ExprType == HB_ET_STRING && pArg->ulLength > 0 )
/* TODO: do we need to add empty string also? */
/* TODO: add context, line number */
if( HB_COMP_PARAM->fI18n && pArg->ExprType == HB_ET_STRING &&
pArg->ulLength > 0 )
{
if( usCount == 2 && pArg->pNext->ExprType == HB_ET_STRING && pArg->pNext->ulLength > 0 )
hb_compI18nAdd( HB_COMP_PARAM, pArg->value.asString.string,
pArg->pNext->value.asString.string, HB_COMP_PARAM->currLine );
else
hb_compI18nAdd( HB_COMP_PARAM, pArg->value.asString.string, NULL,
if( usCount >= 2 && pArg->pNext->ExprType == HB_ET_STRING &&
pArg->pNext->ulLength > 0 )
hb_compI18nAdd( HB_COMP_PARAM, pArg->value.asString.string,
pArg->pNext->value.asString.string,
HB_COMP_PARAM->currLine );
else
hb_compI18nAdd( HB_COMP_PARAM, pArg->value.asString.string,
NULL, HB_COMP_PARAM->currLine );
}
}
#endif

2
harbour/include/hbpers.ch
View File

@@ -60,6 +60,6 @@
#xcommand ARRAY <obj> LEN <nLen> => <obj> := Array( <nLen> )
#xcommand ENDARRAY => // Just used to ease the read of the ascii file
#xcommand ENDARRAY => /* Just used to ease the read of the ascii file */
#endif

7
harbour/include/tbrowse.ch
View File

@@ -53,13 +53,13 @@
#ifndef _TBROWSE_CH
#define _TBROWSE_CH
// tBrowse ApplyKey() method return codes
/* tBrowse ApplyKey() method return codes */
#define TBR_EXIT -1
#define TBR_CONTINUE 0
#define TBR_EXCEPTION 1
// tBrowse Styles
/* tBrowse Styles */
#define TBR_APPEND 1
#define TBR_APPENDING 2
@@ -69,7 +69,7 @@
#define TBR_CUSTOM 6
// tBcolumn Styles
/* tBcolumn Styles */
#define TBC_READWRITE 1
#define TBC_MOVE 2
@@ -77,4 +77,3 @@
#define TBC_CUSTOM 4
#endif

3
harbour/source/compiler/hbusage.c
View File

@@ -77,6 +77,9 @@ void hb_compPrintUsage( HB_COMP_DECL, char * szSelf )
"\n %cgw output type: Windows/DOS OBJ32 (.obj)",
"\n %cgh output type: Harbour Portable Object (.hrb)",
"\n %ci<path> #include file search path",
#ifdef HB_I18N_SUPPORT
"\n %cj[<file>] generate i18n gettex file (.pot)",
#endif
"\n %ck compilation mode (type -k? for more data)",
"\n %cl suppress line number information",
"\n %cm compile module only",