diff --git a/ChangeLog.txt b/ChangeLog.txt
index d409cf3915..6375bced4c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,15 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2014-10-05 11:45 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/compiler/harbour.y
+  * src/macro/macro.y
+    * update declaration depreciated in new bison version
+
+  * src/macro/macro.yyc
+  * src/macro/macro.yyh
+    * regenerated
+
 2014-10-04 21:25 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/gtqtc/gtqtc1.cpp
     + added support for decoded image data passed to HB_GTI_DISPIMAGE like
diff --git a/src/compiler/harbour.y b/src/compiler/harbour.y
index aa91b04c7c..b9252f5f5b 100644
--- a/src/compiler/harbour.y
+++ b/src/compiler/harbour.y
@@ -1,7 +1,7 @@
 %pure-parser
 %parse-param { PHB_COMP pComp }
 %lex-param   { PHB_COMP pComp }
-%name-prefix = "hb_comp_yy"
+%name-prefix "hb_comp_yy"
 %{
 /*
  * Harbour Project source code:
diff --git a/src/macro/macro.y b/src/macro/macro.y
index 21cf4efd4c..65cab693d2 100644
--- a/src/macro/macro.y
+++ b/src/macro/macro.y
@@ -1,7 +1,7 @@
 %pure-parser
 %parse-param { PHB_MACRO pMacro }
 %lex-param   { PHB_MACRO pMacro }
-%name-prefix = "hb_macro_yy"
+%name-prefix "hb_macro_yy"
 
 %{
 /*
diff --git a/src/macro/macro.yyc b/src/macro/macro.yyc
index 6775965dd1..ac2efe9a7c 100644
--- a/src/macro/macro.yyc
+++ b/src/macro/macro.yyc
@@ -2,7 +2,7 @@
 
 /* Bison implementation for Yacc-like parsers in C
 
-      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
 
    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
@@ -142,7 +142,7 @@
 
 /* to pacify some meaningless warnings */
 #if defined( __BORLANDC__ )
-#  if !defined( __STDC__ )
+#  if ! defined( __STDC__ )
 #     define __STDC__
 #  endif
 #  pragma warn -aus
@@ -189,9 +189,9 @@
    }
 
 #define HB_MACRO_IFENABLED( pSet, pExpr, flag ) \
-   if( HB_MACRO_DATA->supported & (flag) ) \
+   if( HB_MACRO_DATA->supported & ( flag ) ) \
    { \
-      pSet = (pExpr); \
+      pSet = ( pExpr ); \
    }\
    else \
    { \
@@ -208,7 +208,7 @@
 
 
 /* Line 268 of yacc.c  */
-#line 216 "macroy.c"
+#line 212 "macroy.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -283,7 +283,7 @@ typedef union YYSTYPE
 {
 
 /* Line 293 of yacc.c  */
-#line 143 "macro.y"
+#line 139 "macro.y"
 
    const char * string; /* to hold a string returned by lex */
    int       iNumber;   /* to hold a temporary integer number */
@@ -319,7 +319,7 @@ typedef union YYSTYPE
 
 
 /* Line 293 of yacc.c  */
-#line 327 "macroy.c"
+#line 323 "macroy.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -330,7 +330,7 @@ typedef union YYSTYPE
 /* Copy the second part of user declarations.  */
 
 /* Line 343 of yacc.c  */
-#line 176 "macro.y"
+#line 172 "macro.y"
 
 /* This must be placed after the above union - the union is
  * typedef-ined to YYSTYPE
@@ -342,7 +342,7 @@ extern void yyerror( PHB_MACRO, const char * );    /* parsing error management f
 
 
 /* Line 343 of yacc.c  */
-#line 350 "macroy.c"
+#line 346 "macroy.c"
 
 #ifdef short
 # undef short
@@ -709,27 +709,27 @@ static const yytype_int16 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   260,   260,   270,   278,   287,   288,   291,   294,   297,
-     302,   307,   312,   313,   318,   323,   328,   333,   334,   337,
-     338,   344,   347,   352,   355,   374,   379,   382,   389,   390,
-     395,   396,   397,   398,   399,   402,   403,   404,   407,   408,
-     409,   410,   411,   412,   413,   422,   423,   424,   425,   426,
-     431,   432,   433,   434,   435,   436,   437,   438,   439,   440,
-     441,   442,   443,   444,   445,   446,   447,   448,   449,   454,
-     457,   462,   472,   473,   476,   477,   480,   481,   482,   483,
-     484,   487,   488,   493,   496,   497,   498,   503,   507,   508,
-     509,   510,   511,   512,   513,   514,   515,   516,   517,   518,
-     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
-     529,   530,   531,   532,   533,   534,   535,   536,   539,   540,
-     543,   544,   547,   547,   561,   562,   566,   567,   570,   571,
-     572,   573,   574,   575,   576,   577,   578,   579,   580,   581,
-     582,   583,   584,   585,   586,   587,   588,   589,   590,   591,
-     597,   598,   604,   607,   608,   611,   612,   613,   616,   619,
-     622,   625,   628,   631,   634,   637,   638,   639,   640,   641,
-     642,   645,   646,   647,   648,   649,   650,   653,   654,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   668,   674,
-     675,   676,   679,   680,   684,   683,   691,   692,   697,   698,
-     699,   700,   703,   704,   707,   708,   711,   714,   718
+       0,   256,   256,   266,   274,   283,   284,   287,   290,   293,
+     298,   303,   308,   309,   314,   319,   324,   329,   330,   333,
+     334,   340,   343,   348,   351,   370,   375,   378,   385,   386,
+     391,   392,   393,   394,   395,   398,   399,   400,   403,   404,
+     405,   406,   407,   408,   409,   418,   419,   420,   421,   422,
+     427,   428,   429,   430,   431,   432,   433,   434,   435,   436,
+     437,   438,   439,   440,   441,   442,   443,   444,   445,   450,
+     453,   458,   468,   469,   472,   473,   476,   477,   478,   479,
+     480,   483,   484,   489,   492,   493,   494,   499,   503,   504,
+     505,   506,   507,   508,   509,   510,   511,   512,   513,   514,
+     515,   516,   517,   518,   519,   520,   521,   522,   523,   524,
+     525,   526,   527,   528,   529,   530,   531,   532,   535,   536,
+     539,   540,   543,   543,   557,   558,   562,   563,   566,   567,
+     568,   569,   570,   571,   572,   573,   574,   575,   576,   577,
+     578,   579,   580,   581,   582,   583,   584,   585,   586,   587,
+     593,   594,   600,   603,   604,   607,   608,   609,   612,   615,
+     618,   621,   624,   627,   630,   633,   634,   635,   636,   637,
+     638,   641,   642,   643,   644,   645,   646,   649,   650,   653,
+     654,   655,   656,   657,   658,   659,   660,   661,   664,   670,
+     671,   672,   675,   676,   680,   679,   687,   688,   693,   694,
+     695,   696,   699,   700,   703,   704,   707,   710,   714
 };
 #endif
 
@@ -2076,7 +2076,7 @@ yyreduce:
         case 2:
 
 /* Line 1806 of yacc.c  */
-#line 260 "macro.y"
+#line 256 "macro.y"
     {
                            HB_MACRO_DATA->exprType = hb_compExprType( (yyvsp[(1) - (1)].asExpr) );
                            if( HB_MACRO_DATA->Flags &  HB_MACRO_GEN_REFER )
@@ -2092,7 +2092,7 @@ yyreduce:
   case 3:
 
 /* Line 1806 of yacc.c  */
-#line 270 "macro.y"
+#line 266 "macro.y"
     {
                            HB_MACRO_DATA->exprType = hb_compExprType( (yyvsp[(1) - (1)].asExpr) );
                            if( HB_MACRO_DATA->Flags &  HB_MACRO_GEN_PUSH )
@@ -2106,7 +2106,7 @@ yyreduce:
   case 4:
 
 /* Line 1806 of yacc.c  */
-#line 278 "macro.y"
+#line 274 "macro.y"
     {
                   HB_TRACE( HB_TR_DEBUG, ( "macro -> invalid syntax: %s", HB_MACRO_DATA->string ) );
                   hb_macroError( EG_SYNTAX, HB_COMP_PARAM );
@@ -2117,133 +2117,133 @@ yyreduce:
   case 5:
 
 /* Line 1806 of yacc.c  */
-#line 287 "macro.y"
+#line 283 "macro.y"
     { (yyval.asExpr) = hb_compExprNewDouble( (yyvsp[(1) - (1)].valDouble).dNumber, (yyvsp[(1) - (1)].valDouble).bWidth, (yyvsp[(1) - (1)].valDouble).bDec, HB_COMP_PARAM ); }
     break;
 
   case 6:
 
 /* Line 1806 of yacc.c  */
-#line 288 "macro.y"
+#line 284 "macro.y"
     { (yyval.asExpr) = hb_compExprNewLong( (yyvsp[(1) - (1)].valLong).lNumber, HB_COMP_PARAM ); }
     break;
 
   case 7:
 
 /* Line 1806 of yacc.c  */
-#line 291 "macro.y"
+#line 287 "macro.y"
     { (yyval.asExpr) = hb_compExprNewDate( ( long ) (yyvsp[(1) - (1)].valLong).lNumber, HB_COMP_PARAM ); }
     break;
 
   case 8:
 
 /* Line 1806 of yacc.c  */
-#line 294 "macro.y"
+#line 290 "macro.y"
     { (yyval.asExpr) = hb_compExprNewTimeStamp( (yyvsp[(1) - (1)].valTimeStamp).date, (yyvsp[(1) - (1)].valTimeStamp).time, HB_COMP_PARAM ); }
     break;
 
   case 9:
 
 /* Line 1806 of yacc.c  */
-#line 297 "macro.y"
+#line 293 "macro.y"
     { (yyval.asExpr) = hb_compExprNewLong( (yyvsp[(1) - (2)].valLong).lNumber, HB_COMP_PARAM ); }
     break;
 
   case 10:
 
 /* Line 1806 of yacc.c  */
-#line 302 "macro.y"
+#line 298 "macro.y"
     { (yyval.asExpr) = hb_compExprNewNil( HB_COMP_PARAM ); }
     break;
 
   case 11:
 
 /* Line 1806 of yacc.c  */
-#line 307 "macro.y"
+#line 303 "macro.y"
     { (yyval.asExpr) = hb_compExprNewString( (yyvsp[(1) - (1)].valChar).string, (yyvsp[(1) - (1)].valChar).length, HB_FALSE, HB_COMP_PARAM ); }
     break;
 
   case 12:
 
 /* Line 1806 of yacc.c  */
-#line 312 "macro.y"
+#line 308 "macro.y"
     { (yyval.asExpr) = hb_compExprNewLogical( HB_TRUE, HB_COMP_PARAM ); }
     break;
 
   case 13:
 
 /* Line 1806 of yacc.c  */
-#line 313 "macro.y"
+#line 309 "macro.y"
     { (yyval.asExpr) = hb_compExprNewLogical( HB_FALSE, HB_COMP_PARAM ); }
     break;
 
   case 14:
 
 /* Line 1806 of yacc.c  */
-#line 318 "macro.y"
+#line 314 "macro.y"
     { (yyval.asExpr) = hb_compExprNewSelf( HB_COMP_PARAM ); }
     break;
 
   case 15:
 
 /* Line 1806 of yacc.c  */
-#line 323 "macro.y"
+#line 319 "macro.y"
     { (yyval.asExpr) = hb_compExprNewArray( (yyvsp[(2) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 16:
 
 /* Line 1806 of yacc.c  */
-#line 328 "macro.y"
+#line 324 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 17:
 
 /* Line 1806 of yacc.c  */
-#line 333 "macro.y"
+#line 329 "macro.y"
     { (yyval.asExpr) = hb_compExprNewHash( NULL, HB_COMP_PARAM ); }
     break;
 
   case 18:
 
 /* Line 1806 of yacc.c  */
-#line 334 "macro.y"
+#line 330 "macro.y"
     { (yyval.asExpr) = hb_compExprNewHash( (yyvsp[(2) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 19:
 
 /* Line 1806 of yacc.c  */
-#line 337 "macro.y"
+#line 333 "macro.y"
     { (yyval.asExpr) = hb_compExprAddListExpr( hb_compExprNewList( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr) ); }
     break;
 
   case 20:
 
 /* Line 1806 of yacc.c  */
-#line 338 "macro.y"
+#line 334 "macro.y"
     { (yyval.asExpr) = hb_compExprAddListExpr( hb_compExprAddListExpr( (yyvsp[(1) - (5)].asExpr), (yyvsp[(3) - (5)].asExpr) ), (yyvsp[(5) - (5)].asExpr) ); }
     break;
 
   case 21:
 
 /* Line 1806 of yacc.c  */
-#line 344 "macro.y"
+#line 340 "macro.y"
     { (yyval.asExpr) = hb_compExprNewVar( (yyvsp[(1) - (1)].string), HB_COMP_PARAM ); }
     break;
 
   case 22:
 
 /* Line 1806 of yacc.c  */
-#line 347 "macro.y"
+#line 343 "macro.y"
     { (yyval.asExpr) = hb_compExprNewAlias( (yyvsp[(1) - (2)].string), HB_COMP_PARAM ); }
     break;
 
   case 23:
 
 /* Line 1806 of yacc.c  */
-#line 352 "macro.y"
+#line 348 "macro.y"
     {  (yyval.asExpr) = hb_compExprNewMacro( NULL, '&', (yyvsp[(1) - (1)].string), HB_COMP_PARAM );
                                  HB_MACRO_CHECK( (yyval.asExpr) );
                               }
@@ -2252,7 +2252,7 @@ yyreduce:
   case 24:
 
 /* Line 1806 of yacc.c  */
-#line 355 "macro.y"
+#line 351 "macro.y"
     {  HB_BOOL fNewString;
                                  char * szVarName = hb_macroTextSymbol( (yyvsp[(1) - (1)].string), strlen( (yyvsp[(1) - (1)].string) ), &fNewString );
                                  if( szVarName )
@@ -2275,294 +2275,294 @@ yyreduce:
   case 25:
 
 /* Line 1806 of yacc.c  */
-#line 374 "macro.y"
+#line 370 "macro.y"
     { hb_compExprMacroAsAlias( (yyvsp[(1) - (2)].asExpr) ); }
     break;
 
   case 26:
 
 /* Line 1806 of yacc.c  */
-#line 379 "macro.y"
+#line 375 "macro.y"
     { (yyval.asExpr) = hb_compExprNewMacro( (yyvsp[(2) - (2)].asExpr), 0, NULL, HB_COMP_PARAM ); }
     break;
 
   case 28:
 
 /* Line 1806 of yacc.c  */
-#line 389 "macro.y"
+#line 385 "macro.y"
     { (yyval.asExpr) = hb_compExprNewAlias( "FIELD", HB_COMP_PARAM ); }
     break;
 
   case 29:
 
 /* Line 1806 of yacc.c  */
-#line 390 "macro.y"
+#line 386 "macro.y"
     { (yyval.asExpr) = (yyvsp[(3) - (3)].asExpr); }
     break;
 
   case 30:
 
 /* Line 1806 of yacc.c  */
-#line 395 "macro.y"
+#line 391 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 31:
 
 /* Line 1806 of yacc.c  */
-#line 396 "macro.y"
+#line 392 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 32:
 
 /* Line 1806 of yacc.c  */
-#line 397 "macro.y"
+#line 393 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 33:
 
 /* Line 1806 of yacc.c  */
-#line 398 "macro.y"
+#line 394 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 34:
 
 /* Line 1806 of yacc.c  */
-#line 399 "macro.y"
+#line 395 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 35:
 
 /* Line 1806 of yacc.c  */
-#line 402 "macro.y"
+#line 398 "macro.y"
     { (yyval.asExpr) = hb_compExprNewVar( (yyvsp[(1) - (1)].string), HB_COMP_PARAM ); }
     break;
 
   case 38:
 
 /* Line 1806 of yacc.c  */
-#line 407 "macro.y"
+#line 403 "macro.y"
     { (yyval.asExpr) = hb_compExprNewAliasVar( (yyvsp[(1) - (2)].asExpr), (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 39:
 
 /* Line 1806 of yacc.c  */
-#line 408 "macro.y"
+#line 404 "macro.y"
     { (yyval.asExpr) = hb_compExprNewAliasVar( (yyvsp[(1) - (2)].asExpr), (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 40:
 
 /* Line 1806 of yacc.c  */
-#line 409 "macro.y"
+#line 405 "macro.y"
     { (yyval.asExpr) = hb_compExprNewAliasVar( (yyvsp[(1) - (2)].asExpr), (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 41:
 
 /* Line 1806 of yacc.c  */
-#line 410 "macro.y"
+#line 406 "macro.y"
     { (yyval.asExpr) = hb_compExprNewAliasVar( (yyvsp[(1) - (2)].asExpr), (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 42:
 
 /* Line 1806 of yacc.c  */
-#line 411 "macro.y"
+#line 407 "macro.y"
     { (yyval.asExpr) = hb_compExprNewAliasVar( (yyvsp[(1) - (2)].asExpr), (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 43:
 
 /* Line 1806 of yacc.c  */
-#line 412 "macro.y"
+#line 408 "macro.y"
     { (yyval.asExpr) = hb_compExprNewAliasVar( (yyvsp[(1) - (2)].asExpr), (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 44:
 
 /* Line 1806 of yacc.c  */
-#line 413 "macro.y"
+#line 409 "macro.y"
     { (yyval.asExpr) = hb_compExprNewAliasVar( (yyvsp[(1) - (2)].asExpr), (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 45:
 
 /* Line 1806 of yacc.c  */
-#line 422 "macro.y"
+#line 418 "macro.y"
     { (yyval.asExpr) = hb_compExprNewAliasExpr( (yyvsp[(1) - (2)].asExpr), (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 46:
 
 /* Line 1806 of yacc.c  */
-#line 423 "macro.y"
+#line 419 "macro.y"
     { (yyval.asExpr) = hb_compExprNewAliasExpr( (yyvsp[(1) - (2)].asExpr), (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 47:
 
 /* Line 1806 of yacc.c  */
-#line 424 "macro.y"
+#line 420 "macro.y"
     { (yyval.asExpr) = hb_compExprNewAliasExpr( (yyvsp[(1) - (2)].asExpr), (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 48:
 
 /* Line 1806 of yacc.c  */
-#line 425 "macro.y"
+#line 421 "macro.y"
     { (yyval.asExpr) = hb_compExprNewAliasExpr( (yyvsp[(1) - (2)].asExpr), (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 49:
 
 /* Line 1806 of yacc.c  */
-#line 426 "macro.y"
+#line 422 "macro.y"
     { (yyval.asExpr) = hb_compExprNewAliasExpr( (yyvsp[(1) - (2)].asExpr), (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 50:
 
 /* Line 1806 of yacc.c  */
-#line 431 "macro.y"
+#line 427 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 51:
 
 /* Line 1806 of yacc.c  */
-#line 432 "macro.y"
+#line 428 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 52:
 
 /* Line 1806 of yacc.c  */
-#line 433 "macro.y"
+#line 429 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 53:
 
 /* Line 1806 of yacc.c  */
-#line 434 "macro.y"
+#line 430 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 54:
 
 /* Line 1806 of yacc.c  */
-#line 435 "macro.y"
+#line 431 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 55:
 
 /* Line 1806 of yacc.c  */
-#line 436 "macro.y"
+#line 432 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 56:
 
 /* Line 1806 of yacc.c  */
-#line 437 "macro.y"
+#line 433 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 57:
 
 /* Line 1806 of yacc.c  */
-#line 438 "macro.y"
+#line 434 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 58:
 
 /* Line 1806 of yacc.c  */
-#line 439 "macro.y"
+#line 435 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 59:
 
 /* Line 1806 of yacc.c  */
-#line 440 "macro.y"
+#line 436 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 60:
 
 /* Line 1806 of yacc.c  */
-#line 441 "macro.y"
+#line 437 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 61:
 
 /* Line 1806 of yacc.c  */
-#line 442 "macro.y"
+#line 438 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 62:
 
 /* Line 1806 of yacc.c  */
-#line 443 "macro.y"
+#line 439 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 63:
 
 /* Line 1806 of yacc.c  */
-#line 444 "macro.y"
+#line 440 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 64:
 
 /* Line 1806 of yacc.c  */
-#line 445 "macro.y"
+#line 441 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 65:
 
 /* Line 1806 of yacc.c  */
-#line 446 "macro.y"
+#line 442 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 66:
 
 /* Line 1806 of yacc.c  */
-#line 447 "macro.y"
+#line 443 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 67:
 
 /* Line 1806 of yacc.c  */
-#line 448 "macro.y"
+#line 444 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 68:
 
 /* Line 1806 of yacc.c  */
-#line 449 "macro.y"
+#line 445 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 69:
 
 /* Line 1806 of yacc.c  */
-#line 454 "macro.y"
+#line 450 "macro.y"
     { (yyval.asExpr) = hb_macroExprNewFunCall( hb_compExprNewFunName( (yyvsp[(1) - (4)].string), HB_COMP_PARAM ), (yyvsp[(3) - (4)].asExpr), HB_COMP_PARAM );
                                             HB_MACRO_CHECK( (yyval.asExpr) );
                                           }
@@ -2571,7 +2571,7 @@ yyreduce:
   case 70:
 
 /* Line 1806 of yacc.c  */
-#line 457 "macro.y"
+#line 453 "macro.y"
     { (yyval.asExpr) = hb_macroExprNewFunCall( (yyvsp[(1) - (4)].asExpr), (yyvsp[(3) - (4)].asExpr), HB_COMP_PARAM );
                                             HB_MACRO_CHECK( (yyval.asExpr) );
                                           }
@@ -2580,7 +2580,7 @@ yyreduce:
   case 71:
 
 /* Line 1806 of yacc.c  */
-#line 462 "macro.y"
+#line 458 "macro.y"
     {  if( hb_compExprParamListLen( (yyvsp[(4) - (5)].asExpr) ) != 0 )
                                                 {
                                                    hb_macroError( EG_SYNTAX, HB_COMP_PARAM );
@@ -2594,140 +2594,140 @@ yyreduce:
   case 72:
 
 /* Line 1806 of yacc.c  */
-#line 472 "macro.y"
+#line 468 "macro.y"
     { (yyval.asExpr) = hb_compExprNewArgList( (yyvsp[(1) - (1)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 73:
 
 /* Line 1806 of yacc.c  */
-#line 473 "macro.y"
+#line 469 "macro.y"
     { (yyval.asExpr) = hb_compExprAddListExpr( (yyvsp[(1) - (3)].asExpr), (yyvsp[(3) - (3)].asExpr) ); }
     break;
 
   case 76:
 
 /* Line 1806 of yacc.c  */
-#line 480 "macro.y"
+#line 476 "macro.y"
     { (yyval.asExpr) = hb_compExprNewVarRef( (yyvsp[(2) - (2)].string), HB_COMP_PARAM ); }
     break;
 
   case 77:
 
 /* Line 1806 of yacc.c  */
-#line 481 "macro.y"
+#line 477 "macro.y"
     { (yyval.asExpr) = hb_compExprNewRef( (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 78:
 
 /* Line 1806 of yacc.c  */
-#line 482 "macro.y"
+#line 478 "macro.y"
     { (yyval.asExpr) = hb_compExprNewRef( (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 79:
 
 /* Line 1806 of yacc.c  */
-#line 483 "macro.y"
+#line 479 "macro.y"
     { (yyval.asExpr) = hb_compExprNewRef( (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 80:
 
 /* Line 1806 of yacc.c  */
-#line 484 "macro.y"
+#line 480 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); (yyval.asExpr)->value.asList.reference = HB_TRUE; }
     break;
 
   case 81:
 
 /* Line 1806 of yacc.c  */
-#line 487 "macro.y"
+#line 483 "macro.y"
     { (yyval.asExpr) = hb_compExprNewArgRef( HB_COMP_PARAM ); }
     break;
 
   case 83:
 
 /* Line 1806 of yacc.c  */
-#line 493 "macro.y"
+#line 489 "macro.y"
     { (yyval.asExpr) = hb_compExprNewMethodObject( (yyvsp[(3) - (3)].asExpr), (yyvsp[(1) - (3)].asExpr) ); }
     break;
 
   case 84:
 
 /* Line 1806 of yacc.c  */
-#line 496 "macro.y"
+#line 492 "macro.y"
     { (yyval.asExpr) = hb_compExprNewSend( (yyvsp[(1) - (1)].string), HB_COMP_PARAM ); }
     break;
 
   case 85:
 
 /* Line 1806 of yacc.c  */
-#line 497 "macro.y"
+#line 493 "macro.y"
     { (yyval.asExpr) = hb_compExprNewMacroSend( (yyvsp[(1) - (1)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 86:
 
 /* Line 1806 of yacc.c  */
-#line 498 "macro.y"
+#line 494 "macro.y"
     { (yyval.asExpr) = hb_compExprNewMacroSend( (yyvsp[(1) - (1)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 87:
 
 /* Line 1806 of yacc.c  */
-#line 503 "macro.y"
+#line 499 "macro.y"
     { (yyval.asExpr) = hb_compExprNewMethodCall( (yyvsp[(1) - (4)].asExpr), (yyvsp[(3) - (4)].asExpr) ); }
     break;
 
   case 110:
 
 /* Line 1806 of yacc.c  */
-#line 529 "macro.y"
+#line 525 "macro.y"
     { HB_MACRO_IFENABLED( (yyval.asExpr), (yyvsp[(1) - (1)].asExpr), HB_SM_HARBOUR ); }
     break;
 
   case 111:
 
 /* Line 1806 of yacc.c  */
-#line 530 "macro.y"
+#line 526 "macro.y"
     { HB_MACRO_IFENABLED( (yyval.asExpr), (yyvsp[(1) - (1)].asExpr), HB_SM_HARBOUR ); }
     break;
 
   case 112:
 
 /* Line 1806 of yacc.c  */
-#line 531 "macro.y"
+#line 527 "macro.y"
     { HB_MACRO_IFENABLED( (yyval.asExpr), (yyvsp[(1) - (1)].asExpr), HB_SM_HARBOUR ); }
     break;
 
   case 118:
 
 /* Line 1806 of yacc.c  */
-#line 539 "macro.y"
+#line 535 "macro.y"
     { (yyval.asExpr) = (yyvsp[(1) - (1)].asExpr); HB_MACRO_CHECK( (yyval.asExpr) ); }
     break;
 
   case 119:
 
 /* Line 1806 of yacc.c  */
-#line 540 "macro.y"
+#line 536 "macro.y"
     { (yyval.asExpr) = (yyvsp[(1) - (1)].asExpr); HB_MACRO_CHECK( (yyval.asExpr) ); }
     break;
 
   case 120:
 
 /* Line 1806 of yacc.c  */
-#line 543 "macro.y"
+#line 539 "macro.y"
     { (yyval.asExpr) = hb_compExprNewArgRef( HB_COMP_PARAM ); }
     break;
 
   case 122:
 
 /* Line 1806 of yacc.c  */
-#line 547 "macro.y"
+#line 543 "macro.y"
     {
                                        if( !( HB_MACRO_DATA->Flags & HB_MACRO_GEN_LIST ) )
                                        {
@@ -2741,7 +2741,7 @@ yyreduce:
   case 123:
 
 /* Line 1806 of yacc.c  */
-#line 555 "macro.y"
+#line 551 "macro.y"
     {
                                        HB_MACRO_DATA->uiListElements = 1;
                                        (yyval.asExpr) = hb_compExprAddListExpr( ( HB_MACRO_DATA->Flags & HB_MACRO_GEN_PARE ) ? hb_compExprNewList( (yyvsp[(1) - (4)].asExpr), HB_COMP_PARAM ) : hb_compExprNewArgList( (yyvsp[(1) - (4)].asExpr), HB_COMP_PARAM ), (yyvsp[(4) - (4)].asExpr) );
@@ -2751,7 +2751,7 @@ yyreduce:
   case 125:
 
 /* Line 1806 of yacc.c  */
-#line 562 "macro.y"
+#line 558 "macro.y"
     { HB_MACRO_DATA->uiListElements++;
                                                   (yyval.asExpr) = hb_compExprAddListExpr( (yyvsp[(1) - (3)].asExpr), (yyvsp[(3) - (3)].asExpr) ); }
     break;
@@ -2759,371 +2759,371 @@ yyreduce:
   case 126:
 
 /* Line 1806 of yacc.c  */
-#line 566 "macro.y"
+#line 562 "macro.y"
     { (yyval.asExpr) = hb_compExprNewEmpty( HB_COMP_PARAM ); }
     break;
 
   case 148:
 
 /* Line 1806 of yacc.c  */
-#line 590 "macro.y"
+#line 586 "macro.y"
     { HB_MACRO_IFENABLED( (yyval.asExpr), (yyvsp[(1) - (1)].asExpr), HB_SM_HARBOUR ); }
     break;
 
   case 150:
 
 /* Line 1806 of yacc.c  */
-#line 597 "macro.y"
+#line 593 "macro.y"
     { (yyval.asExpr) = hb_compExprNewPostInc( (yyvsp[(0) - (1)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 151:
 
 /* Line 1806 of yacc.c  */
-#line 598 "macro.y"
+#line 594 "macro.y"
     { (yyval.asExpr) = hb_compExprNewPostDec( (yyvsp[(0) - (1)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 152:
 
 /* Line 1806 of yacc.c  */
-#line 604 "macro.y"
+#line 600 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 153:
 
 /* Line 1806 of yacc.c  */
-#line 607 "macro.y"
+#line 603 "macro.y"
     { (yyval.asExpr) = hb_compExprNewPreInc( (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 154:
 
 /* Line 1806 of yacc.c  */
-#line 608 "macro.y"
+#line 604 "macro.y"
     { (yyval.asExpr) = hb_compExprNewPreDec( (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 155:
 
 /* Line 1806 of yacc.c  */
-#line 611 "macro.y"
+#line 607 "macro.y"
     { (yyval.asExpr) = hb_compExprNewNot( (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 156:
 
 /* Line 1806 of yacc.c  */
-#line 612 "macro.y"
+#line 608 "macro.y"
     { (yyval.asExpr) = hb_compExprNewNegate( (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 157:
 
 /* Line 1806 of yacc.c  */
-#line 613 "macro.y"
+#line 609 "macro.y"
     { (yyval.asExpr) = (yyvsp[(2) - (2)].asExpr); }
     break;
 
   case 158:
 
 /* Line 1806 of yacc.c  */
-#line 616 "macro.y"
+#line 612 "macro.y"
     { (yyval.asExpr) = hb_compExprAssign( (yyvsp[(1) - (3)].asExpr), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 159:
 
 /* Line 1806 of yacc.c  */
-#line 619 "macro.y"
+#line 615 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewPlusEq( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 160:
 
 /* Line 1806 of yacc.c  */
-#line 622 "macro.y"
+#line 618 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewMinusEq( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 161:
 
 /* Line 1806 of yacc.c  */
-#line 625 "macro.y"
+#line 621 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewMultEq( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 162:
 
 /* Line 1806 of yacc.c  */
-#line 628 "macro.y"
+#line 624 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewDivEq( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 163:
 
 /* Line 1806 of yacc.c  */
-#line 631 "macro.y"
+#line 627 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewModEq( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 164:
 
 /* Line 1806 of yacc.c  */
-#line 634 "macro.y"
+#line 630 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewExpEq( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 171:
 
 /* Line 1806 of yacc.c  */
-#line 645 "macro.y"
+#line 641 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewPlus( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 172:
 
 /* Line 1806 of yacc.c  */
-#line 646 "macro.y"
+#line 642 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewMinus( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 173:
 
 /* Line 1806 of yacc.c  */
-#line 647 "macro.y"
+#line 643 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewMult( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 174:
 
 /* Line 1806 of yacc.c  */
-#line 648 "macro.y"
+#line 644 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewDiv( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 175:
 
 /* Line 1806 of yacc.c  */
-#line 649 "macro.y"
+#line 645 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewMod( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 176:
 
 /* Line 1806 of yacc.c  */
-#line 650 "macro.y"
+#line 646 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewPower( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 177:
 
 /* Line 1806 of yacc.c  */
-#line 653 "macro.y"
+#line 649 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewAnd( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 178:
 
 /* Line 1806 of yacc.c  */
-#line 654 "macro.y"
+#line 650 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewOr( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 179:
 
 /* Line 1806 of yacc.c  */
-#line 657 "macro.y"
+#line 653 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewEQ( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 180:
 
 /* Line 1806 of yacc.c  */
-#line 658 "macro.y"
+#line 654 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewLT( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 181:
 
 /* Line 1806 of yacc.c  */
-#line 659 "macro.y"
+#line 655 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewGT( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 182:
 
 /* Line 1806 of yacc.c  */
-#line 660 "macro.y"
+#line 656 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewLE( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 183:
 
 /* Line 1806 of yacc.c  */
-#line 661 "macro.y"
+#line 657 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewGE( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 184:
 
 /* Line 1806 of yacc.c  */
-#line 662 "macro.y"
+#line 658 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewNE( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 185:
 
 /* Line 1806 of yacc.c  */
-#line 663 "macro.y"
+#line 659 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewNE( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 186:
 
 /* Line 1806 of yacc.c  */
-#line 664 "macro.y"
+#line 660 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewIN( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 187:
 
 /* Line 1806 of yacc.c  */
-#line 665 "macro.y"
+#line 661 "macro.y"
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewEqual( (yyvsp[(1) - (3)].asExpr), HB_COMP_PARAM ), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 189:
 
 /* Line 1806 of yacc.c  */
-#line 674 "macro.y"
+#line 670 "macro.y"
     { (yyval.asExpr) = hb_macroExprNewArrayAt( (yyvsp[(0) - (2)].asExpr), (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 190:
 
 /* Line 1806 of yacc.c  */
-#line 675 "macro.y"
+#line 671 "macro.y"
     { (yyval.asExpr) = hb_macroExprNewArrayAt( (yyvsp[(1) - (3)].asExpr), (yyvsp[(3) - (3)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 191:
 
 /* Line 1806 of yacc.c  */
-#line 676 "macro.y"
+#line 672 "macro.y"
     { (yyval.asExpr) = hb_macroExprNewArrayAt( (yyvsp[(1) - (4)].asExpr), (yyvsp[(4) - (4)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 192:
 
 /* Line 1806 of yacc.c  */
-#line 679 "macro.y"
+#line 675 "macro.y"
     { (yyval.asExpr) = hb_compExprNewList( (yyvsp[(1) - (1)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 193:
 
 /* Line 1806 of yacc.c  */
-#line 680 "macro.y"
+#line 676 "macro.y"
     { (yyval.asExpr) = hb_compExprAddListExpr( (yyvsp[(1) - (3)].asExpr), (yyvsp[(3) - (3)].asExpr) ); }
     break;
 
   case 194:
 
 /* Line 1806 of yacc.c  */
-#line 684 "macro.y"
+#line 680 "macro.y"
     { (yyval.asExpr) = hb_compExprNewCodeBlock( NULL, 0, 0, HB_COMP_PARAM ); }
     break;
 
   case 195:
 
 /* Line 1806 of yacc.c  */
-#line 686 "macro.y"
+#line 682 "macro.y"
     { (yyval.asExpr) = (yyvsp[(3) - (7)].asExpr); }
     break;
 
   case 196:
 
 /* Line 1806 of yacc.c  */
-#line 691 "macro.y"
+#line 687 "macro.y"
     { (yyval.asExpr) = hb_compExprAddCodeblockExpr( (yyvsp[(-2) - (1)].asExpr), (yyvsp[(1) - (1)].asExpr) ); }
     break;
 
   case 197:
 
 /* Line 1806 of yacc.c  */
-#line 692 "macro.y"
+#line 688 "macro.y"
     { (yyval.asExpr) = hb_compExprAddCodeblockExpr( (yyvsp[(-2) - (3)].asExpr), (yyvsp[(3) - (3)].asExpr) ); }
     break;
 
   case 198:
 
 /* Line 1806 of yacc.c  */
-#line 697 "macro.y"
+#line 693 "macro.y"
     { (yyval.asExpr) = NULL; }
     break;
 
   case 199:
 
 /* Line 1806 of yacc.c  */
-#line 698 "macro.y"
+#line 694 "macro.y"
     { (yyval.asExpr) = NULL; (yyvsp[(0) - (1)].asExpr)->value.asCodeblock.flags |= HB_BLOCK_VPARAMS; }
     break;
 
   case 200:
 
 /* Line 1806 of yacc.c  */
-#line 699 "macro.y"
+#line 695 "macro.y"
     { (yyval.asExpr) = (yyvsp[(1) - (1)].asExpr);   }
     break;
 
   case 201:
 
 /* Line 1806 of yacc.c  */
-#line 700 "macro.y"
+#line 696 "macro.y"
     { (yyval.asExpr) = (yyvsp[(1) - (3)].asExpr);   (yyvsp[(0) - (3)].asExpr)->value.asCodeblock.flags |= HB_BLOCK_VPARAMS; }
     break;
 
   case 202:
 
 /* Line 1806 of yacc.c  */
-#line 703 "macro.y"
+#line 699 "macro.y"
     { (yyval.asExpr) = hb_compExprCBVarAdd( (yyvsp[(0) - (1)].asExpr), (yyvsp[(1) - (1)].string), ' ', HB_COMP_PARAM ); }
     break;
 
   case 203:
 
 /* Line 1806 of yacc.c  */
-#line 704 "macro.y"
+#line 700 "macro.y"
     { (yyval.asExpr) = hb_compExprCBVarAdd( (yyvsp[(0) - (3)].asExpr), (yyvsp[(3) - (3)].string), ' ', HB_COMP_PARAM ); HB_MACRO_CHECK( (yyval.asExpr) ); }
     break;
 
   case 204:
 
 /* Line 1806 of yacc.c  */
-#line 707 "macro.y"
+#line 703 "macro.y"
     { (yyval.asExpr) = hb_compExprNewList( (yyvsp[(2) - (2)].asExpr), HB_COMP_PARAM ); }
     break;
 
   case 205:
 
 /* Line 1806 of yacc.c  */
-#line 708 "macro.y"
+#line 704 "macro.y"
     { (yyval.asExpr) = hb_compExprAddListExpr( (yyvsp[(1) - (3)].asExpr), (yyvsp[(3) - (3)].asExpr) ); }
     break;
 
   case 208:
 
 /* Line 1806 of yacc.c  */
-#line 719 "macro.y"
+#line 715 "macro.y"
     { (yyval.asExpr) = hb_compExprNewIIF( hb_compExprAddListExpr( hb_compExprAddListExpr( hb_compExprNewList( (yyvsp[(3) - (8)].asExpr), HB_COMP_PARAM ), (yyvsp[(5) - (8)].asExpr) ), (yyvsp[(7) - (8)].asExpr) ) ); }
     break;
 
 
 
 /* Line 1806 of yacc.c  */
-#line 3131 "macroy.c"
+#line 3127 "macroy.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -3354,7 +3354,7 @@ yyreturn:
 
 
 /* Line 2067 of yacc.c  */
-#line 722 "macro.y"
+#line 718 "macro.y"
 
 
 
@@ -3383,7 +3383,7 @@ HB_MEXPR, * PHB_MEXPR;
 typedef struct HB_MIDENT_
 {
    char * Identifier;
-   struct HB_MIDENT_ *pPrev;
+   struct HB_MIDENT_ * pPrev;
 }
 HB_MIDENT, * PHB_MIDENT;
 
@@ -3394,7 +3394,7 @@ static PHB_EXPR hb_macroExprAlloc( HB_COMP_DECL )
 {
    PHB_MEXPR pMExpr = ( PHB_MEXPR ) HB_MACRO_DATA->pExprLst;
 
-   if( !pMExpr || pMExpr->count >= HB_MEXPR_PREALLOC )
+   if( ! pMExpr || pMExpr->count >= HB_MEXPR_PREALLOC )
    {
       pMExpr = ( PHB_MEXPR ) hb_xgrab( sizeof( HB_MEXPR ) );
       pMExpr->pPrev = ( PHB_MEXPR ) HB_MACRO_DATA->pExprLst;
@@ -3407,6 +3407,7 @@ static PHB_EXPR hb_macroExprAlloc( HB_COMP_DECL )
 char * hb_macroIdentNew( HB_COMP_DECL, char * szIdent )
 {
    PHB_MIDENT pMIdent = ( PHB_MIDENT ) hb_xgrab( sizeof( HB_MIDENT ) );
+
    pMIdent->Identifier = szIdent;
    pMIdent->pPrev = ( PHB_MIDENT ) HB_MACRO_DATA->pIdentLst;
    HB_MACRO_DATA->pIdentLst = ( void * ) pMIdent;
@@ -3555,7 +3556,7 @@ int hb_macro_yylex( YYSTYPE * yylval_ptr, PHB_MACRO pMacro )
 {
    PHB_PP_TOKEN pToken = hb_pp_lexGet( ( PHB_PP_STATE ) pMacro->pLex );
 
-   if( !pToken )
+   if( ! pToken )
       return 0;
 
    switch( HB_PP_TOKEN_TYPE( pToken->type ) )
@@ -3627,9 +3628,9 @@ int hb_macro_yylex( YYSTYPE * yylval_ptr, PHB_MACRO pMacro )
          return NUM_DATE;
 
       case HB_PP_TOKEN_TIMESTAMP:
-         if( !hb_timeStampStrGetDT( pToken->value,
-                                    &yylval_ptr->valTimeStamp.date,
-                                    &yylval_ptr->valTimeStamp.time ) )
+         if( ! hb_timeStampStrGetDT( pToken->value,
+                                     &yylval_ptr->valTimeStamp.date,
+                                     &yylval_ptr->valTimeStamp.time ) )
          {
             hb_macroError( EG_SYNTAX, pMacro );
          }
diff --git a/src/macro/macro.yyh b/src/macro/macro.yyh
index 618f250c29..e8c0a4bb61 100644
--- a/src/macro/macro.yyh
+++ b/src/macro/macro.yyh
@@ -2,7 +2,7 @@
 
 /* Bison interface for Yacc-like parsers in C
 
-      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
 
    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
@@ -85,7 +85,7 @@ typedef union YYSTYPE
 {
 
 /* Line 2068 of yacc.c  */
-#line 143 "macro.y"
+#line 139 "macro.y"
 
    const char * string; /* to hold a string returned by lex */
    int       iNumber;   /* to hold a temporary integer number */