diff --git a/ChangeLog.txt b/ChangeLog.txt
index e1c95d574b..42bd7a1f41 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,26 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2017-03-24 20:02 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * include/hbcomp.h
+  * src/compiler/hbmain.c
+    * changed hb_compVariableScope() to static function
+
+  * src/compiler/harbour.y
+    ! added protection against GPF when nested function/procedure is
+      declared inside extended block code
+
+  * src/compiler/harbour.yyc
+  * src/macro/macro.yyc
+  * src/macro/macro.yyh
+    * regenerated
+
+  * include/hbexprb.c
+    * minor simplification
+
+  * include/hbexpra.c
+    * use HB_SIZEOFARRAY() macro
+
 2017-03-23 12:15 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/compiler/harbour.y
     * create real function in internal memory instead of dummy flow control
diff --git a/include/hbcomp.h b/include/hbcomp.h
index f3b0f93b13..99b27d5a92 100644
--- a/include/hbcomp.h
+++ b/include/hbcomp.h
@@ -84,7 +84,6 @@ extern void hb_compParserRun( HB_COMP_DECL );
 #define HB_VSCOMP_TH_STATIC  ( HB_VSCOMP_STATIC | HB_VSCOMP_THREAD )
 
 /* return detailed information about a class of variable  */
-extern int hb_compVariableScope( HB_COMP_DECL, const char * );
 #define HB_VS_UNDECLARED      0
 /* variables declared in a current codeblock/function/procedure */
 #define HB_VS_CBLOCAL_VAR     1     /* func/proc local variables and parameters used in codeblock (detached) */
diff --git a/include/hbexpra.c b/include/hbexpra.c
index 4d9e06e78b..24942fe807 100644
--- a/include/hbexpra.c
+++ b/include/hbexpra.c
@@ -569,13 +569,11 @@ static const char * s_szStaticFun[] = {
    "__BREAKBLOCK"
 };
 
-#define STATIC_FUNCTIONS  ( sizeof( s_szStaticFun ) / sizeof( char * ) )
-
 static HB_BOOL hb_compStaticFunction( const char * szName )
 {
    unsigned int ui;
 
-   for( ui = 0; ui < STATIC_FUNCTIONS; ++ui )
+   for( ui = 0; ui < HB_SIZEOFARRAY( s_szStaticFun ); ++ui )
    {
       if( strcmp( szName, s_szStaticFun[ ui ] ) == 0 )
          return HB_TRUE;
diff --git a/include/hbexprb.c b/include/hbexprb.c
index 9105684ffa..26417920d1 100644
--- a/include/hbexprb.c
+++ b/include/hbexprb.c
@@ -1137,16 +1137,11 @@ static HB_EXPR_FUNC( hb_compExprUseList )
          break;
 
       case HB_EA_DELETE:
-         if( pSelf->value.asList.pExprList )
+         while( pSelf->value.asList.pExprList )
          {
-            PHB_EXPR pNext, pExpr = pSelf->value.asList.pExprList;
-            while( pExpr )
-            {
-               pNext = pExpr->pNext;    /* store next expression */
-               HB_COMP_EXPR_FREE( pExpr );
-               pExpr = pNext;
-            }
-            pSelf->value.asList.pExprList = NULL;
+            PHB_EXPR pExpr = pSelf->value.asList.pExprList;
+            pSelf->value.asList.pExprList = pExpr->pNext;
+            HB_COMP_EXPR_FREE( pExpr );
          }
          break;
    }
diff --git a/src/compiler/harbour.y b/src/compiler/harbour.y
index d7f893dfcf..b12cfb96c2 100644
--- a/src/compiler/harbour.y
+++ b/src/compiler/harbour.y
@@ -1058,12 +1058,17 @@ CodeBlock   : BlockHead
             }
             EmptyStats '}'
             {  /* 6 */
-               hb_compCodeBlockEnd( HB_COMP_PARAM );
-               $$ = hb_compExprSetCodeblockBody( $1,
-                     HB_COMP_PARAM->functions.pLast->pCode + $<sNumber>3,
-                     HB_COMP_PARAM->functions.pLast->nPCodePos - $<sNumber>3 );
-               HB_COMP_PARAM->functions.pLast->nPCodePos = $<sNumber>3;
-               HB_COMP_PARAM->lastLine = $<sNumber>2;
+               /* protection against nested function/procedure inside extended block */
+               if( HB_COMP_PARAM->iErrorCount == 0 ||
+                   HB_COMP_PARAM->functions.pLast->funFlags & HB_FUNF_EXTBLOCK )
+               {
+                  hb_compCodeBlockEnd( HB_COMP_PARAM );
+                  $$ = hb_compExprSetCodeblockBody( $1,
+                          HB_COMP_PARAM->functions.pLast->pCode + $<sNumber>3,
+                          HB_COMP_PARAM->functions.pLast->nPCodePos - $<sNumber>3 );
+                  HB_COMP_PARAM->functions.pLast->nPCodePos = $<sNumber>3;
+                  HB_COMP_PARAM->lastLine = $<sNumber>2;
+               }
             }
             ;
 
diff --git a/src/compiler/harbour.yyc b/src/compiler/harbour.yyc
index fb286eb2ce..e0af6b9177 100644
--- a/src/compiler/harbour.yyc
+++ b/src/compiler/harbour.yyc
@@ -744,34 +744,34 @@ static const yytype_uint16 yyrline[] =
      974,   977,   978,   981,   982,   983,   984,   985,   986,   987,
      988,   989,   992,   998,   999,  1000,  1003,  1004,  1007,  1007,
     1013,  1014,  1015,  1016,  1019,  1020,  1023,  1024,  1028,  1031,
-    1027,  1034,  1033,  1070,  1071,  1073,  1076,  1085,  1089,  1092,
-    1092,  1094,  1094,  1096,  1096,  1098,  1098,  1108,  1109,  1112,
-    1113,  1121,  1122,  1124,  1128,  1135,  1153,  1153,  1182,  1188,
-    1191,  1192,  1193,  1196,  1196,  1203,  1204,  1207,  1208,  1211,
-    1211,  1214,  1215,  1218,  1218,  1237,  1237,  1238,  1239,  1240,
-    1241,  1241,  1244,  1245,  1248,  1249,  1250,  1251,  1254,  1254,
-    1273,  1273,  1328,  1329,  1330,  1331,  1334,  1335,  1336,  1337,
-    1338,  1339,  1340,  1343,  1344,  1347,  1350,  1351,  1352,  1353,
-    1354,  1355,  1358,  1359,  1360,  1361,  1362,  1363,  1366,  1367,
-    1368,  1369,  1370,  1371,  1372,  1373,  1376,  1379,  1382,  1385,
-    1388,  1391,  1394,  1397,  1398,  1399,  1400,  1404,  1406,  1403,
-    1411,  1411,  1415,  1417,  1415,  1425,  1427,  1425,  1436,  1444,
-    1445,  1446,  1447,  1448,  1449,  1450,  1451,  1454,  1458,  1462,
-    1465,  1471,  1478,  1479,  1480,  1481,  1482,  1483,  1484,  1485,
-    1488,  1488,  1491,  1492,  1500,  1501,  1500,  1512,  1513,  1512,
-    1525,  1525,  1525,  1527,  1527,  1532,  1537,  1531,  1551,  1560,
-    1564,  1565,  1566,  1567,  1568,  1569,  1570,  1571,  1575,  1588,
-    1593,  1574,  1641,  1642,  1645,  1646,  1649,  1657,  1658,  1659,
-    1660,  1661,  1662,  1663,  1664,  1665,  1668,  1669,  1672,  1673,
-    1676,  1677,  1680,  1681,  1686,  1692,  1702,  1685,  1721,  1722,
-    1726,  1725,  1738,  1745,  1753,  1754,  1755,  1756,  1757,  1758,
-    1759,  1760,  1764,  1763,  1774,  1775,  1784,  1784,  1787,  1787,
-    1790,  1792,  1795,  1795,  1795,  1800,  1808,  1819,  1829,  1799,
-    1860,  1861,  1862,  1863,  1864,  1865,  1866,  1867,  1870,  1871,
-    1879,  1880,  1883,  1892,  1893,  1894,  1897,  1908,  1926,  1930,
-    1938,  1939,  1942,  1943,  1944,  1945,  1946,  1949,  1950,  1951,
-    1952,  1953,  1957,  1956,  1979,  1980,  1981,  1982,  1983,  1984,
-    1985,  1986,  1989,  1990
+    1027,  1034,  1033,  1075,  1076,  1078,  1081,  1090,  1094,  1097,
+    1097,  1099,  1099,  1101,  1101,  1103,  1103,  1113,  1114,  1117,
+    1118,  1126,  1127,  1129,  1133,  1140,  1158,  1158,  1187,  1193,
+    1196,  1197,  1198,  1201,  1201,  1208,  1209,  1212,  1213,  1216,
+    1216,  1219,  1220,  1223,  1223,  1242,  1242,  1243,  1244,  1245,
+    1246,  1246,  1249,  1250,  1253,  1254,  1255,  1256,  1259,  1259,
+    1278,  1278,  1333,  1334,  1335,  1336,  1339,  1340,  1341,  1342,
+    1343,  1344,  1345,  1348,  1349,  1352,  1355,  1356,  1357,  1358,
+    1359,  1360,  1363,  1364,  1365,  1366,  1367,  1368,  1371,  1372,
+    1373,  1374,  1375,  1376,  1377,  1378,  1381,  1384,  1387,  1390,
+    1393,  1396,  1399,  1402,  1403,  1404,  1405,  1409,  1411,  1408,
+    1416,  1416,  1420,  1422,  1420,  1430,  1432,  1430,  1441,  1449,
+    1450,  1451,  1452,  1453,  1454,  1455,  1456,  1459,  1463,  1467,
+    1470,  1476,  1483,  1484,  1485,  1486,  1487,  1488,  1489,  1490,
+    1493,  1493,  1496,  1497,  1505,  1506,  1505,  1517,  1518,  1517,
+    1530,  1530,  1530,  1532,  1532,  1537,  1542,  1536,  1556,  1565,
+    1569,  1570,  1571,  1572,  1573,  1574,  1575,  1576,  1580,  1593,
+    1598,  1579,  1646,  1647,  1650,  1651,  1654,  1662,  1663,  1664,
+    1665,  1666,  1667,  1668,  1669,  1670,  1673,  1674,  1677,  1678,
+    1681,  1682,  1685,  1686,  1691,  1697,  1707,  1690,  1726,  1727,
+    1731,  1730,  1743,  1750,  1758,  1759,  1760,  1761,  1762,  1763,
+    1764,  1765,  1769,  1768,  1779,  1780,  1789,  1789,  1792,  1792,
+    1795,  1797,  1800,  1800,  1800,  1805,  1813,  1824,  1834,  1804,
+    1865,  1866,  1867,  1868,  1869,  1870,  1871,  1872,  1875,  1876,
+    1884,  1885,  1888,  1897,  1898,  1899,  1902,  1913,  1931,  1935,
+    1943,  1944,  1947,  1948,  1949,  1950,  1951,  1954,  1955,  1956,
+    1957,  1958,  1962,  1961,  1984,  1985,  1986,  1987,  1988,  1989,
+    1990,  1991,  1994,  1995
 };
 #endif
 
@@ -5441,60 +5441,65 @@ yyreduce:
   case 382:
 #line 1060 "harbour.y" /* yacc.c:1646  */
     {  /* 6 */
-               hb_compCodeBlockEnd( HB_COMP_PARAM );
-               (yyval.asExpr) = hb_compExprSetCodeblockBody( (yyvsp[-4].asExpr),
-                     HB_COMP_PARAM->functions.pLast->pCode + (yyvsp[-2].sNumber),
-                     HB_COMP_PARAM->functions.pLast->nPCodePos - (yyvsp[-2].sNumber) );
-               HB_COMP_PARAM->functions.pLast->nPCodePos = (yyvsp[-2].sNumber);
-               HB_COMP_PARAM->lastLine = (yyvsp[-3].sNumber);
+               /* protection against nested function/procedure inside extended block */
+               if( HB_COMP_PARAM->iErrorCount == 0 ||
+                   HB_COMP_PARAM->functions.pLast->funFlags & HB_FUNF_EXTBLOCK )
+               {
+                  hb_compCodeBlockEnd( HB_COMP_PARAM );
+                  (yyval.asExpr) = hb_compExprSetCodeblockBody( (yyvsp[-4].asExpr),
+                          HB_COMP_PARAM->functions.pLast->pCode + (yyvsp[-2].sNumber),
+                          HB_COMP_PARAM->functions.pLast->nPCodePos - (yyvsp[-2].sNumber) );
+                  HB_COMP_PARAM->functions.pLast->nPCodePos = (yyvsp[-2].sNumber);
+                  HB_COMP_PARAM->lastLine = (yyvsp[-3].sNumber);
+               }
             }
-#line 5452 "harboury.c" /* yacc.c:1646  */
+#line 5457 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 383:
-#line 1070 "harbour.y" /* yacc.c:1646  */
+#line 1075 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewList( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 5458 "harboury.c" /* yacc.c:1646  */
+#line 5463 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 384:
-#line 1071 "harbour.y" /* yacc.c:1646  */
+#line 1076 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddListExpr( (yyvsp[-2].asExpr), (yyvsp[0].asExpr) ); }
-#line 5464 "harboury.c" /* yacc.c:1646  */
+#line 5469 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 385:
-#line 1073 "harbour.y" /* yacc.c:1646  */
+#line 1078 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[-1].asExpr); }
-#line 5470 "harboury.c" /* yacc.c:1646  */
+#line 5475 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 387:
-#line 1086 "harbour.y" /* yacc.c:1646  */
+#line 1091 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewIIF( hb_compExprAddListExpr( hb_compExprAddListExpr( hb_compExprNewList( (yyvsp[-5].asExpr), HB_COMP_PARAM ), (yyvsp[-3].asExpr) ), (yyvsp[-1].asExpr) ) ); }
-#line 5476 "harboury.c" /* yacc.c:1646  */
+#line 5481 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 389:
-#line 1092 "harbour.y" /* yacc.c:1646  */
+#line 1097 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->iVarScope = HB_VSCOMP_LOCAL; hb_compLinePush( HB_COMP_PARAM ); }
-#line 5482 "harboury.c" /* yacc.c:1646  */
+#line 5487 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 391:
-#line 1094 "harbour.y" /* yacc.c:1646  */
+#line 1099 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->iVarScope = HB_VSCOMP_STATIC; hb_compLinePush( HB_COMP_PARAM ); }
-#line 5488 "harboury.c" /* yacc.c:1646  */
+#line 5493 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 393:
-#line 1096 "harbour.y" /* yacc.c:1646  */
+#line 1101 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->iVarScope = HB_VSCOMP_TH_STATIC; hb_compLinePush( HB_COMP_PARAM ); }
-#line 5494 "harboury.c" /* yacc.c:1646  */
+#line 5499 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 395:
-#line 1098 "harbour.y" /* yacc.c:1646  */
+#line 1103 "harbour.y" /* yacc.c:1646  */
     { if( HB_COMP_PARAM->functions.pLast->funFlags & HB_FUNF_USES_LOCAL_PARAMS )
                            hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'E', HB_COMP_ERR_PARAMETERS_NOT_ALLOWED, NULL, NULL );
                         else
@@ -5503,64 +5508,64 @@ yyreduce:
                            HB_COMP_PARAM->iVarScope = ( HB_VSCOMP_PRIVATE | HB_VSCOMP_PARAMETER );
                         }
                       }
-#line 5507 "harboury.c" /* yacc.c:1646  */
+#line 5512 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 396:
-#line 1105 "harbour.y" /* yacc.c:1646  */
+#line 1110 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->iVarScope = HB_VSCOMP_NONE; }
-#line 5513 "harboury.c" /* yacc.c:1646  */
+#line 5518 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 397:
-#line 1108 "harbour.y" /* yacc.c:1646  */
+#line 1113 "harbour.y" /* yacc.c:1646  */
     { (yyval.iNumber) = 1; }
-#line 5519 "harboury.c" /* yacc.c:1646  */
+#line 5524 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 398:
-#line 1109 "harbour.y" /* yacc.c:1646  */
+#line 1114 "harbour.y" /* yacc.c:1646  */
     { (yyval.iNumber)++; }
-#line 5525 "harboury.c" /* yacc.c:1646  */
+#line 5530 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 399:
-#line 1112 "harbour.y" /* yacc.c:1646  */
+#line 1117 "harbour.y" /* yacc.c:1646  */
     { (yyval.iNumber) = 1; }
-#line 5531 "harboury.c" /* yacc.c:1646  */
+#line 5536 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 400:
-#line 1113 "harbour.y" /* yacc.c:1646  */
+#line 1118 "harbour.y" /* yacc.c:1646  */
     { (yyval.iNumber)++; }
-#line 5537 "harboury.c" /* yacc.c:1646  */
+#line 5542 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 402:
-#line 1123 "harbour.y" /* yacc.c:1646  */
+#line 1128 "harbour.y" /* yacc.c:1646  */
     { hb_compRTVariableAdd( HB_COMP_PARAM, hb_compExprNewRTVar( NULL, (yyvsp[-1].asExpr), HB_COMP_PARAM ), HB_FALSE ); }
-#line 5543 "harboury.c" /* yacc.c:1646  */
+#line 5548 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 403:
-#line 1125 "harbour.y" /* yacc.c:1646  */
+#line 1130 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_EXPR_FREE( hb_compExprGenPush( (yyvsp[0].asExpr), HB_COMP_PARAM ) );
                  hb_compRTVariableAdd( HB_COMP_PARAM, hb_compExprNewRTVar( NULL, (yyvsp[-3].asExpr), HB_COMP_PARAM ), HB_TRUE );
                }
-#line 5551 "harboury.c" /* yacc.c:1646  */
+#line 5556 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 404:
-#line 1129 "harbour.y" /* yacc.c:1646  */
+#line 1134 "harbour.y" /* yacc.c:1646  */
     {
                   HB_COMP_EXPR_FREE( hb_compArrayDimPush( (yyvsp[-1].asExpr), HB_COMP_PARAM ) );
                   hb_compRTVariableAdd( HB_COMP_PARAM, hb_compExprNewRTVar( NULL, (yyvsp[-2].asExpr), HB_COMP_PARAM ), HB_TRUE );
                }
-#line 5560 "harboury.c" /* yacc.c:1646  */
+#line 5565 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 405:
-#line 1136 "harbour.y" /* yacc.c:1646  */
+#line 1141 "harbour.y" /* yacc.c:1646  */
     {
                   hb_compVariableAdd( HB_COMP_PARAM, (yyvsp[-1].string), (yyvsp[0].asVarType) );
                   if( HB_COMP_PARAM->iVarScope & HB_VSCOMP_STATIC )
@@ -5578,19 +5583,19 @@ yyreduce:
                      HB_COMP_EXPR_FREE( hb_compExprGenPush( hb_compExprNewNil( HB_COMP_PARAM ), HB_COMP_PARAM ) );
                   }
                }
-#line 5582 "harboury.c" /* yacc.c:1646  */
+#line 5587 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 406:
-#line 1153 "harbour.y" /* yacc.c:1646  */
+#line 1158 "harbour.y" /* yacc.c:1646  */
     { (yyval.iNumber) = HB_COMP_PARAM->iVarScope;
                                 hb_compVariableAdd( HB_COMP_PARAM, (yyvsp[-1].string), (yyvsp[0].asVarType) );
                               }
-#line 5590 "harboury.c" /* yacc.c:1646  */
+#line 5595 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 407:
-#line 1157 "harbour.y" /* yacc.c:1646  */
+#line 1162 "harbour.y" /* yacc.c:1646  */
     {
                   HB_COMP_PARAM->iVarScope = (yyvsp[-2].iNumber);
                   if( HB_COMP_PARAM->iVarScope & HB_VSCOMP_STATIC )
@@ -5615,97 +5620,97 @@ yyreduce:
                   }
                   HB_COMP_PARAM->iVarScope = (yyvsp[-2].iNumber);
                }
-#line 5619 "harboury.c" /* yacc.c:1646  */
+#line 5624 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 408:
-#line 1182 "harbour.y" /* yacc.c:1646  */
+#line 1187 "harbour.y" /* yacc.c:1646  */
     { hb_compVariableDim( (yyvsp[-2].string), (yyvsp[-1].asExpr), HB_COMP_PARAM ); }
-#line 5625 "harboury.c" /* yacc.c:1646  */
+#line 5630 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 410:
-#line 1191 "harbour.y" /* yacc.c:1646  */
+#line 1196 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewArgList( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 5631 "harboury.c" /* yacc.c:1646  */
+#line 5636 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 411:
-#line 1192 "harbour.y" /* yacc.c:1646  */
+#line 1197 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddListExpr( (yyvsp[-2].asExpr), (yyvsp[0].asExpr) ); }
-#line 5637 "harboury.c" /* yacc.c:1646  */
+#line 5642 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 412:
-#line 1193 "harbour.y" /* yacc.c:1646  */
+#line 1198 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddListExpr( (yyvsp[-3].asExpr), (yyvsp[0].asExpr) ); }
-#line 5643 "harboury.c" /* yacc.c:1646  */
+#line 5648 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 413:
-#line 1196 "harbour.y" /* yacc.c:1646  */
+#line 1201 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->iVarScope = HB_VSCOMP_FIELD; }
-#line 5649 "harboury.c" /* yacc.c:1646  */
+#line 5654 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 414:
-#line 1198 "harbour.y" /* yacc.c:1646  */
+#line 1203 "harbour.y" /* yacc.c:1646  */
     {
                if( (yyvsp[-1].string) ) hb_compFieldSetAlias( HB_COMP_PARAM, (yyvsp[-1].string), (yyvsp[-2].iNumber) );
              }
-#line 5657 "harboury.c" /* yacc.c:1646  */
+#line 5662 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 415:
-#line 1203 "harbour.y" /* yacc.c:1646  */
+#line 1208 "harbour.y" /* yacc.c:1646  */
     { (yyval.iNumber) = hb_compFieldsCount( HB_COMP_PARAM ); hb_compVariableAdd( HB_COMP_PARAM, (yyvsp[-1].string), (yyvsp[0].asVarType) ); }
-#line 5663 "harboury.c" /* yacc.c:1646  */
+#line 5668 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 416:
-#line 1204 "harbour.y" /* yacc.c:1646  */
+#line 1209 "harbour.y" /* yacc.c:1646  */
     { hb_compVariableAdd( HB_COMP_PARAM, (yyvsp[-1].string), (yyvsp[0].asVarType) ); }
-#line 5669 "harboury.c" /* yacc.c:1646  */
+#line 5674 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 417:
-#line 1207 "harbour.y" /* yacc.c:1646  */
+#line 1212 "harbour.y" /* yacc.c:1646  */
     { (yyval.string) = NULL; }
-#line 5675 "harboury.c" /* yacc.c:1646  */
+#line 5680 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 418:
-#line 1208 "harbour.y" /* yacc.c:1646  */
+#line 1213 "harbour.y" /* yacc.c:1646  */
     { (yyval.string) = (yyvsp[0].string); }
-#line 5681 "harboury.c" /* yacc.c:1646  */
+#line 5686 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 419:
-#line 1211 "harbour.y" /* yacc.c:1646  */
+#line 1216 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->iVarScope = HB_VSCOMP_MEMVAR; }
-#line 5687 "harboury.c" /* yacc.c:1646  */
+#line 5692 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 421:
-#line 1214 "harbour.y" /* yacc.c:1646  */
+#line 1219 "harbour.y" /* yacc.c:1646  */
     { hb_compVariableAdd( HB_COMP_PARAM, (yyvsp[-1].string), (yyvsp[0].asVarType) ); }
-#line 5693 "harboury.c" /* yacc.c:1646  */
+#line 5698 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 422:
-#line 1215 "harbour.y" /* yacc.c:1646  */
+#line 1220 "harbour.y" /* yacc.c:1646  */
     { hb_compVariableAdd( HB_COMP_PARAM, (yyvsp[-1].string), (yyvsp[0].asVarType) ); }
-#line 5699 "harboury.c" /* yacc.c:1646  */
+#line 5704 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 423:
-#line 1218 "harbour.y" /* yacc.c:1646  */
+#line 1223 "harbour.y" /* yacc.c:1646  */
     { hb_compDeclaredAdd( HB_COMP_PARAM, (yyvsp[-1].string) ); HB_COMP_PARAM->szDeclaredFun = (yyvsp[-1].string); }
-#line 5705 "harboury.c" /* yacc.c:1646  */
+#line 5710 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 424:
-#line 1219 "harbour.y" /* yacc.c:1646  */
+#line 1224 "harbour.y" /* yacc.c:1646  */
     {
                if( HB_COMP_PARAM->pLastDeclared )
                {
@@ -5724,59 +5729,59 @@ yyreduce:
                HB_COMP_PARAM->szDeclaredFun = NULL;
                HB_COMP_PARAM->iVarScope = HB_VSCOMP_NONE;
              }
-#line 5728 "harboury.c" /* yacc.c:1646  */
+#line 5733 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 425:
-#line 1237 "harbour.y" /* yacc.c:1646  */
+#line 1242 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->pLastClass = hb_compClassAdd( HB_COMP_PARAM, (yyvsp[0].string), NULL ); }
-#line 5734 "harboury.c" /* yacc.c:1646  */
+#line 5739 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 426:
-#line 1237 "harbour.y" /* yacc.c:1646  */
+#line 1242 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->iVarScope = HB_VSCOMP_NONE; }
-#line 5740 "harboury.c" /* yacc.c:1646  */
+#line 5745 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 427:
-#line 1238 "harbour.y" /* yacc.c:1646  */
+#line 1243 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->pLastClass = hb_compClassAdd( HB_COMP_PARAM, (yyvsp[-1].string), NULL ); HB_COMP_PARAM->iVarScope = HB_VSCOMP_NONE; }
-#line 5746 "harboury.c" /* yacc.c:1646  */
+#line 5751 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 428:
-#line 1239 "harbour.y" /* yacc.c:1646  */
+#line 1244 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->pLastClass = hb_compClassAdd( HB_COMP_PARAM, (yyvsp[-2].string), (yyvsp[-1].string) ); HB_COMP_PARAM->iVarScope = HB_VSCOMP_NONE; }
-#line 5752 "harboury.c" /* yacc.c:1646  */
+#line 5757 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 429:
-#line 1240 "harbour.y" /* yacc.c:1646  */
+#line 1245 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->iVarScope = HB_VSCOMP_NONE; }
-#line 5758 "harboury.c" /* yacc.c:1646  */
+#line 5763 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 430:
-#line 1241 "harbour.y" /* yacc.c:1646  */
+#line 1246 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->cDataListType = (yyvsp[0].asVarType)->cVarType; }
-#line 5764 "harboury.c" /* yacc.c:1646  */
+#line 5769 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 431:
-#line 1241 "harbour.y" /* yacc.c:1646  */
+#line 1246 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->cDataListType = 0; HB_COMP_PARAM->iVarScope = HB_VSCOMP_NONE; }
-#line 5770 "harboury.c" /* yacc.c:1646  */
+#line 5775 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 438:
-#line 1254 "harbour.y" /* yacc.c:1646  */
+#line 1259 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->pLastMethod = hb_compMethodAdd( HB_COMP_PARAM, HB_COMP_PARAM->pLastClass, (yyvsp[-1].string) ); }
-#line 5776 "harboury.c" /* yacc.c:1646  */
+#line 5781 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 439:
-#line 1255 "harbour.y" /* yacc.c:1646  */
+#line 1260 "harbour.y" /* yacc.c:1646  */
     {
                if( HB_COMP_PARAM->pLastMethod )
                {
@@ -5793,17 +5798,17 @@ yyreduce:
                }
                HB_COMP_PARAM->pLastMethod = NULL;
              }
-#line 5797 "harboury.c" /* yacc.c:1646  */
+#line 5802 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 440:
-#line 1273 "harbour.y" /* yacc.c:1646  */
+#line 1278 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->pLastMethod = hb_compMethodAdd( HB_COMP_PARAM, HB_COMP_PARAM->pLastClass, (yyvsp[0].string) ); }
-#line 5803 "harboury.c" /* yacc.c:1646  */
+#line 5808 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 441:
-#line 1274 "harbour.y" /* yacc.c:1646  */
+#line 1279 "harbour.y" /* yacc.c:1646  */
     {
                if( HB_COMP_PARAM->pLastMethod )
                {
@@ -5856,357 +5861,357 @@ yyreduce:
 
                HB_COMP_PARAM->pLastMethod = NULL;
              }
-#line 5860 "harboury.c" /* yacc.c:1646  */
+#line 5865 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 455:
-#line 1347 "harbour.y" /* yacc.c:1646  */
+#line 1352 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_EXPR_FREE( (yyvsp[0].asExpr) ); }
-#line 5866 "harboury.c" /* yacc.c:1646  */
+#line 5871 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 456:
-#line 1350 "harbour.y" /* yacc.c:1646  */
+#line 1355 "harbour.y" /* yacc.c:1646  */
     { hb_compDeclaredParameterAdd( HB_COMP_PARAM, (yyvsp[-1].string), (yyvsp[0].asVarType) ); }
-#line 5872 "harboury.c" /* yacc.c:1646  */
+#line 5877 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 457:
-#line 1351 "harbour.y" /* yacc.c:1646  */
+#line 1356 "harbour.y" /* yacc.c:1646  */
     { hb_compDeclaredParameterAdd( HB_COMP_PARAM, (yyvsp[-1].string), hb_compVarTypeNew( HB_COMP_PARAM, (yyvsp[0].asVarType)->cVarType + HB_VT_OFFSET_BYREF, NULL ) ); }
-#line 5878 "harboury.c" /* yacc.c:1646  */
+#line 5883 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 458:
-#line 1352 "harbour.y" /* yacc.c:1646  */
+#line 1357 "harbour.y" /* yacc.c:1646  */
     { hb_compDeclaredParameterAdd( HB_COMP_PARAM, (yyvsp[-3].string), hb_compVarTypeNew( HB_COMP_PARAM, 'F', NULL ) ); }
-#line 5884 "harboury.c" /* yacc.c:1646  */
+#line 5889 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 459:
-#line 1353 "harbour.y" /* yacc.c:1646  */
+#line 1358 "harbour.y" /* yacc.c:1646  */
     { hb_compDeclaredParameterAdd( HB_COMP_PARAM, (yyvsp[-1].string), (yyvsp[0].asVarType) ); }
-#line 5890 "harboury.c" /* yacc.c:1646  */
+#line 5895 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 460:
-#line 1354 "harbour.y" /* yacc.c:1646  */
+#line 1359 "harbour.y" /* yacc.c:1646  */
     { hb_compDeclaredParameterAdd( HB_COMP_PARAM, (yyvsp[-1].string), hb_compVarTypeNew( HB_COMP_PARAM, (yyvsp[0].asVarType)->cVarType + HB_VT_OFFSET_BYREF, NULL ) ); }
-#line 5896 "harboury.c" /* yacc.c:1646  */
+#line 5901 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 461:
-#line 1355 "harbour.y" /* yacc.c:1646  */
+#line 1360 "harbour.y" /* yacc.c:1646  */
     { hb_compDeclaredParameterAdd( HB_COMP_PARAM, (yyvsp[-3].string), hb_compVarTypeNew( HB_COMP_PARAM, 'F', NULL ) ); }
-#line 5902 "harboury.c" /* yacc.c:1646  */
+#line 5907 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 462:
-#line 1358 "harbour.y" /* yacc.c:1646  */
+#line 1363 "harbour.y" /* yacc.c:1646  */
     { hb_compDeclaredParameterAdd( HB_COMP_PARAM, (yyvsp[-1].string), hb_compVarTypeNew( HB_COMP_PARAM, (yyvsp[0].asVarType)->cVarType + HB_VT_OFFSET_OPTIONAL, NULL ) ); }
-#line 5908 "harboury.c" /* yacc.c:1646  */
+#line 5913 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 463:
-#line 1359 "harbour.y" /* yacc.c:1646  */
+#line 1364 "harbour.y" /* yacc.c:1646  */
     { hb_compDeclaredParameterAdd( HB_COMP_PARAM, (yyvsp[-1].string), hb_compVarTypeNew( HB_COMP_PARAM, (yyvsp[0].asVarType)->cVarType + HB_VT_OFFSET_OPTIONAL + HB_VT_OFFSET_BYREF, NULL ) ); }
-#line 5914 "harboury.c" /* yacc.c:1646  */
+#line 5919 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 464:
-#line 1360 "harbour.y" /* yacc.c:1646  */
+#line 1365 "harbour.y" /* yacc.c:1646  */
     { hb_compDeclaredParameterAdd( HB_COMP_PARAM, (yyvsp[-3].string), hb_compVarTypeNew( HB_COMP_PARAM, 'F' + HB_VT_OFFSET_OPTIONAL + HB_VT_OFFSET_BYREF, NULL ) ); }
-#line 5920 "harboury.c" /* yacc.c:1646  */
+#line 5925 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 465:
-#line 1361 "harbour.y" /* yacc.c:1646  */
+#line 1366 "harbour.y" /* yacc.c:1646  */
     { hb_compDeclaredParameterAdd( HB_COMP_PARAM, (yyvsp[-1].string), hb_compVarTypeNew( HB_COMP_PARAM, (yyvsp[0].asVarType)->cVarType + HB_VT_OFFSET_OPTIONAL, NULL ) ); }
-#line 5926 "harboury.c" /* yacc.c:1646  */
+#line 5931 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 466:
-#line 1362 "harbour.y" /* yacc.c:1646  */
+#line 1367 "harbour.y" /* yacc.c:1646  */
     { hb_compDeclaredParameterAdd( HB_COMP_PARAM, (yyvsp[-1].string), hb_compVarTypeNew( HB_COMP_PARAM, (yyvsp[0].asVarType)->cVarType + HB_VT_OFFSET_OPTIONAL + HB_VT_OFFSET_BYREF, NULL ) ); }
-#line 5932 "harboury.c" /* yacc.c:1646  */
+#line 5937 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 467:
-#line 1363 "harbour.y" /* yacc.c:1646  */
+#line 1368 "harbour.y" /* yacc.c:1646  */
     { hb_compDeclaredParameterAdd( HB_COMP_PARAM, (yyvsp[-3].string), hb_compVarTypeNew( HB_COMP_PARAM, 'F' + HB_VT_OFFSET_OPTIONAL + HB_VT_OFFSET_BYREF, NULL ) ); }
-#line 5938 "harboury.c" /* yacc.c:1646  */
+#line 5943 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 476:
-#line 1376 "harbour.y" /* yacc.c:1646  */
+#line 1381 "harbour.y" /* yacc.c:1646  */
     { hb_compErrStru( HB_COMP_PARAM, HB_COMP_ERR_NEXTFOR ); }
-#line 5944 "harboury.c" /* yacc.c:1646  */
+#line 5949 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 477:
-#line 1379 "harbour.y" /* yacc.c:1646  */
+#line 1384 "harbour.y" /* yacc.c:1646  */
     { hb_compErrStru( HB_COMP_PARAM, HB_COMP_ERR_ENDCASE ); }
-#line 5950 "harboury.c" /* yacc.c:1646  */
+#line 5955 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 478:
-#line 1382 "harbour.y" /* yacc.c:1646  */
+#line 1387 "harbour.y" /* yacc.c:1646  */
     { hb_compErrStru( HB_COMP_PARAM, HB_COMP_ERR_ENDIF ); }
-#line 5956 "harboury.c" /* yacc.c:1646  */
+#line 5961 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 479:
-#line 1385 "harbour.y" /* yacc.c:1646  */
+#line 1390 "harbour.y" /* yacc.c:1646  */
     { hb_compErrStru( HB_COMP_PARAM, HB_COMP_ERR_ENDWITH ); }
-#line 5962 "harboury.c" /* yacc.c:1646  */
+#line 5967 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 480:
-#line 1388 "harbour.y" /* yacc.c:1646  */
+#line 1393 "harbour.y" /* yacc.c:1646  */
     { hb_compErrStru( HB_COMP_PARAM, HB_COMP_ERR_ENDSEQ ); }
-#line 5968 "harboury.c" /* yacc.c:1646  */
+#line 5973 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 481:
-#line 1391 "harbour.y" /* yacc.c:1646  */
+#line 1396 "harbour.y" /* yacc.c:1646  */
     { hb_compErrStru( HB_COMP_PARAM, HB_COMP_ERR_ENDDO ); }
-#line 5974 "harboury.c" /* yacc.c:1646  */
+#line 5979 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 482:
-#line 1394 "harbour.y" /* yacc.c:1646  */
+#line 1399 "harbour.y" /* yacc.c:1646  */
     { hb_compErrStru( HB_COMP_PARAM, HB_COMP_ERR_ENDSWITCH ); }
-#line 5980 "harboury.c" /* yacc.c:1646  */
+#line 5985 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 483:
-#line 1397 "harbour.y" /* yacc.c:1646  */
+#line 1402 "harbour.y" /* yacc.c:1646  */
     { hb_compGenJumpHere( (yyvsp[-1].sNumber), HB_COMP_PARAM ); }
-#line 5986 "harboury.c" /* yacc.c:1646  */
+#line 5991 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 484:
-#line 1398 "harbour.y" /* yacc.c:1646  */
+#line 1403 "harbour.y" /* yacc.c:1646  */
     { hb_compGenJumpHere( (yyvsp[-2].sNumber), HB_COMP_PARAM ); }
-#line 5992 "harboury.c" /* yacc.c:1646  */
+#line 5997 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 485:
-#line 1399 "harbour.y" /* yacc.c:1646  */
+#line 1404 "harbour.y" /* yacc.c:1646  */
     { hb_compGenJumpHere( (yyvsp[-2].sNumber), HB_COMP_PARAM ); hb_compElseIfFix( HB_COMP_PARAM, (yyvsp[-1].pVoid) ); }
-#line 5998 "harboury.c" /* yacc.c:1646  */
+#line 6003 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 486:
-#line 1400 "harbour.y" /* yacc.c:1646  */
+#line 1405 "harbour.y" /* yacc.c:1646  */
     { hb_compGenJumpHere( (yyvsp[-3].sNumber), HB_COMP_PARAM ); hb_compElseIfFix( HB_COMP_PARAM, (yyvsp[-2].pVoid) ); }
-#line 6004 "harboury.c" /* yacc.c:1646  */
+#line 6009 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 487:
-#line 1404 "harbour.y" /* yacc.c:1646  */
+#line 1409 "harbour.y" /* yacc.c:1646  */
     { ++HB_COMP_PARAM->functions.pLast->wIfCounter; hb_compLinePushIfInside( HB_COMP_PARAM ); }
-#line 6010 "harboury.c" /* yacc.c:1646  */
+#line 6015 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 488:
-#line 1406 "harbour.y" /* yacc.c:1646  */
+#line 1411 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_EXPR_FREE( hb_compExprGenPush( (yyvsp[-2].asExpr), HB_COMP_PARAM ) ); (yyval.sNumber) = hb_compGenJumpFalse( 0, HB_COMP_PARAM ); }
-#line 6016 "harboury.c" /* yacc.c:1646  */
+#line 6021 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 489:
-#line 1408 "harbour.y" /* yacc.c:1646  */
+#line 1413 "harbour.y" /* yacc.c:1646  */
     { (yyval.sNumber) = hb_compGenJump( 0, HB_COMP_PARAM ); hb_compGenJumpHere( (yyvsp[-1].sNumber), HB_COMP_PARAM ); }
-#line 6022 "harboury.c" /* yacc.c:1646  */
+#line 6027 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 490:
-#line 1411 "harbour.y" /* yacc.c:1646  */
+#line 1416 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->functions.pLast->funFlags &= ~ HB_FUNF_BREAK_CODE; }
-#line 6028 "harboury.c" /* yacc.c:1646  */
+#line 6033 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 492:
-#line 1415 "harbour.y" /* yacc.c:1646  */
+#line 1420 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->functions.pLast->funFlags &= ~ HB_FUNF_BREAK_CODE; hb_compLinePush( HB_COMP_PARAM ); }
-#line 6034 "harboury.c" /* yacc.c:1646  */
+#line 6039 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 493:
-#line 1417 "harbour.y" /* yacc.c:1646  */
+#line 1422 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_EXPR_FREE( hb_compExprGenPush( (yyvsp[-1].asExpr), HB_COMP_PARAM ) );
                   (yyval.sNumber) = hb_compGenJumpFalse( 0, HB_COMP_PARAM );
                }
-#line 6042 "harboury.c" /* yacc.c:1646  */
+#line 6047 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 494:
-#line 1421 "harbour.y" /* yacc.c:1646  */
+#line 1426 "harbour.y" /* yacc.c:1646  */
     { (yyval.pVoid) = hb_compElseIfGen( HB_COMP_PARAM, NULL, hb_compGenJump( 0, HB_COMP_PARAM ) );
                   hb_compGenJumpHere( (yyvsp[-1].sNumber), HB_COMP_PARAM );
                }
-#line 6050 "harboury.c" /* yacc.c:1646  */
+#line 6055 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 495:
-#line 1425 "harbour.y" /* yacc.c:1646  */
+#line 1430 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->functions.pLast->funFlags &= ~ HB_FUNF_BREAK_CODE; hb_compLinePush( HB_COMP_PARAM ); }
-#line 6056 "harboury.c" /* yacc.c:1646  */
+#line 6061 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 496:
-#line 1427 "harbour.y" /* yacc.c:1646  */
+#line 1432 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_EXPR_FREE( hb_compExprGenPush( (yyvsp[-1].asExpr), HB_COMP_PARAM ) );
                   (yyval.sNumber) = hb_compGenJumpFalse( 0, HB_COMP_PARAM );
                }
-#line 6064 "harboury.c" /* yacc.c:1646  */
+#line 6069 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 497:
-#line 1431 "harbour.y" /* yacc.c:1646  */
+#line 1436 "harbour.y" /* yacc.c:1646  */
     { (yyval.pVoid) = hb_compElseIfGen( HB_COMP_PARAM, (yyvsp[-6].pVoid), hb_compGenJump( 0, HB_COMP_PARAM ) );
                   hb_compGenJumpHere( (yyvsp[-1].sNumber), HB_COMP_PARAM );
                }
-#line 6072 "harboury.c" /* yacc.c:1646  */
+#line 6077 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 498:
-#line 1437 "harbour.y" /* yacc.c:1646  */
+#line 1442 "harbour.y" /* yacc.c:1646  */
     {
                   if( HB_COMP_PARAM->functions.pLast->wIfCounter )
                      --HB_COMP_PARAM->functions.pLast->wIfCounter;
                   HB_COMP_PARAM->functions.pLast->funFlags &= ~ ( HB_FUNF_WITH_RETURN | HB_FUNF_BREAK_CODE );
                }
-#line 6082 "harboury.c" /* yacc.c:1646  */
+#line 6087 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 507:
-#line 1456 "harbour.y" /* yacc.c:1646  */
+#line 1461 "harbour.y" /* yacc.c:1646  */
     { hb_compElseIfFix( HB_COMP_PARAM, (yyvsp[-1].pVoid) ); }
-#line 6088 "harboury.c" /* yacc.c:1646  */
+#line 6093 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 510:
-#line 1468 "harbour.y" /* yacc.c:1646  */
+#line 1473 "harbour.y" /* yacc.c:1646  */
     { hb_compElseIfFix( HB_COMP_PARAM, (yyvsp[-2].pVoid) ); }
-#line 6094 "harboury.c" /* yacc.c:1646  */
+#line 6099 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 511:
-#line 1472 "harbour.y" /* yacc.c:1646  */
+#line 1477 "harbour.y" /* yacc.c:1646  */
     {  if( HB_COMP_PARAM->functions.pLast->wCaseCounter )
                      --HB_COMP_PARAM->functions.pLast->wCaseCounter;
                   HB_COMP_PARAM->functions.pLast->funFlags &= ~ ( HB_FUNF_WITH_RETURN | HB_FUNF_BREAK_CODE );
                }
-#line 6103 "harboury.c" /* yacc.c:1646  */
+#line 6108 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 520:
-#line 1488 "harbour.y" /* yacc.c:1646  */
+#line 1493 "harbour.y" /* yacc.c:1646  */
     { ++HB_COMP_PARAM->functions.pLast->wCaseCounter; hb_compLinePushIfDebugger( HB_COMP_PARAM );}
-#line 6109 "harboury.c" /* yacc.c:1646  */
+#line 6114 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 523:
-#line 1492 "harbour.y" /* yacc.c:1646  */
+#line 1497 "harbour.y" /* yacc.c:1646  */
     {
                         if( (yyvsp[0].lNumber) > 0 )
                         {
                            hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'E', HB_COMP_ERR_MAYHEM_IN_CASE, NULL, NULL );
                         }
                      }
-#line 6120 "harboury.c" /* yacc.c:1646  */
+#line 6125 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 524:
-#line 1500 "harbour.y" /* yacc.c:1646  */
+#line 1505 "harbour.y" /* yacc.c:1646  */
     { hb_compLinePushIfInside( HB_COMP_PARAM ); }
-#line 6126 "harboury.c" /* yacc.c:1646  */
+#line 6131 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 525:
-#line 1501 "harbour.y" /* yacc.c:1646  */
+#line 1506 "harbour.y" /* yacc.c:1646  */
     {
                   HB_COMP_EXPR_FREE( hb_compExprGenPush( (yyvsp[-1].asExpr), HB_COMP_PARAM ) );
                   (yyval.sNumber) = hb_compGenJumpFalse( 0, HB_COMP_PARAM );
                }
-#line 6135 "harboury.c" /* yacc.c:1646  */
+#line 6140 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 526:
-#line 1506 "harbour.y" /* yacc.c:1646  */
+#line 1511 "harbour.y" /* yacc.c:1646  */
     {
                   HB_COMP_PARAM->functions.pLast->funFlags &= ~ HB_FUNF_BREAK_CODE;
                   (yyval.pVoid) = hb_compElseIfGen( HB_COMP_PARAM, NULL, hb_compGenJump( 0, HB_COMP_PARAM ) );
                   hb_compGenJumpHere( (yyvsp[-1].sNumber), HB_COMP_PARAM );
                }
-#line 6145 "harboury.c" /* yacc.c:1646  */
+#line 6150 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 527:
-#line 1512 "harbour.y" /* yacc.c:1646  */
+#line 1517 "harbour.y" /* yacc.c:1646  */
     { hb_compLinePushIfInside( HB_COMP_PARAM ); }
-#line 6151 "harboury.c" /* yacc.c:1646  */
+#line 6156 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 528:
-#line 1513 "harbour.y" /* yacc.c:1646  */
+#line 1518 "harbour.y" /* yacc.c:1646  */
     {
                   HB_COMP_EXPR_FREE( hb_compExprGenPush( (yyvsp[-1].asExpr), HB_COMP_PARAM ) );
                   (yyval.sNumber) = hb_compGenJumpFalse( 0, HB_COMP_PARAM );
                }
-#line 6160 "harboury.c" /* yacc.c:1646  */
+#line 6165 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 529:
-#line 1518 "harbour.y" /* yacc.c:1646  */
+#line 1523 "harbour.y" /* yacc.c:1646  */
     {
                   HB_COMP_PARAM->functions.pLast->funFlags &= ~ HB_FUNF_BREAK_CODE;
                   (yyval.pVoid) = hb_compElseIfGen( HB_COMP_PARAM, (yyvsp[-6].pVoid), hb_compGenJump( 0, HB_COMP_PARAM ) );
                   hb_compGenJumpHere( (yyvsp[-1].sNumber), HB_COMP_PARAM );
                }
-#line 6170 "harboury.c" /* yacc.c:1646  */
+#line 6175 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 530:
-#line 1525 "harbour.y" /* yacc.c:1646  */
+#line 1530 "harbour.y" /* yacc.c:1646  */
     {hb_compLinePushIfDebugger( HB_COMP_PARAM ); }
-#line 6176 "harboury.c" /* yacc.c:1646  */
+#line 6181 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 531:
-#line 1525 "harbour.y" /* yacc.c:1646  */
+#line 1530 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->functions.pLast->funFlags &= ~ HB_FUNF_BREAK_CODE; }
-#line 6182 "harboury.c" /* yacc.c:1646  */
+#line 6187 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 533:
-#line 1527 "harbour.y" /* yacc.c:1646  */
+#line 1532 "harbour.y" /* yacc.c:1646  */
     { hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'E', HB_COMP_ERR_MAYHEM_IN_CASE, NULL, NULL ); }
-#line 6188 "harboury.c" /* yacc.c:1646  */
+#line 6193 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 535:
-#line 1532 "harbour.y" /* yacc.c:1646  */
+#line 1537 "harbour.y" /* yacc.c:1646  */
     {
                   HB_COMP_EXPR_FREE( hb_compExprGenPush( (yyvsp[-1].asExpr), HB_COMP_PARAM ) );
                   (yyval.sNumber) = hb_compGenJumpFalse( 0, HB_COMP_PARAM );
                }
-#line 6197 "harboury.c" /* yacc.c:1646  */
+#line 6202 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 536:
-#line 1537 "harbour.y" /* yacc.c:1646  */
+#line 1542 "harbour.y" /* yacc.c:1646  */
     {
                   hb_compLoopHere( HB_COMP_PARAM );
                   hb_compGenJump( (yyvsp[-4].sNumber) - HB_COMP_PARAM->functions.pLast->nPCodePos, HB_COMP_PARAM );
                }
-#line 6206 "harboury.c" /* yacc.c:1646  */
+#line 6211 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 537:
-#line 1542 "harbour.y" /* yacc.c:1646  */
+#line 1547 "harbour.y" /* yacc.c:1646  */
     {
                   hb_compGenJumpHere( (yyvsp[-3].sNumber), HB_COMP_PARAM );
                   if( HB_COMP_PARAM->functions.pLast->wWhileCounter )
@@ -6214,28 +6219,28 @@ yyreduce:
                   hb_compLoopEnd( HB_COMP_PARAM );
                   HB_COMP_PARAM->functions.pLast->funFlags &= ~ HB_FUNF_WITH_RETURN;
                }
-#line 6218 "harboury.c" /* yacc.c:1646  */
+#line 6223 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 538:
-#line 1552 "harbour.y" /* yacc.c:1646  */
+#line 1557 "harbour.y" /* yacc.c:1646  */
     {
                   (yyval.sNumber) = HB_COMP_PARAM->functions.pLast->nPCodePos;
                   hb_compLinePushIfInside( HB_COMP_PARAM );
                   ++HB_COMP_PARAM->functions.pLast->wWhileCounter;
                   hb_compLoopStart( HB_COMP_PARAM, HB_TRUE );
                }
-#line 6229 "harboury.c" /* yacc.c:1646  */
+#line 6234 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 539:
-#line 1561 "harbour.y" /* yacc.c:1646  */
+#line 1566 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->functions.pLast->funFlags &= ~ HB_FUNF_BREAK_CODE; }
-#line 6235 "harboury.c" /* yacc.c:1646  */
+#line 6240 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 548:
-#line 1575 "harbour.y" /* yacc.c:1646  */
+#line 1580 "harbour.y" /* yacc.c:1646  */
     {                                      /* 5 */
                   hb_compLinePushIfInside( HB_COMP_PARAM );
                   (yyvsp[-3].iNumber) = HB_COMP_PARAM->currLine;
@@ -6248,28 +6253,28 @@ yyreduce:
                      hb_compForStart( HB_COMP_PARAM, hb_compExprAsSymbol( (yyvsp[-2].asExpr) ), 0 );
                   }
                }
-#line 6252 "harboury.c" /* yacc.c:1646  */
+#line 6257 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 549:
-#line 1588 "harbour.y" /* yacc.c:1646  */
+#line 1593 "harbour.y" /* yacc.c:1646  */
     {                                      /* 9 */
                   hb_compLoopStart( HB_COMP_PARAM, HB_TRUE );
                   (yyval.sNumber) = hb_compGenJump( 0, HB_COMP_PARAM );
                }
-#line 6261 "harboury.c" /* yacc.c:1646  */
+#line 6266 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 550:
-#line 1593 "harbour.y" /* yacc.c:1646  */
+#line 1598 "harbour.y" /* yacc.c:1646  */
     {                                      /* 11 */
                   (yyval.sNumber) = HB_COMP_PARAM->functions.pLast->nPCodePos;
                }
-#line 6269 "harboury.c" /* yacc.c:1646  */
+#line 6274 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 551:
-#line 1597 "harbour.y" /* yacc.c:1646  */
+#line 1602 "harbour.y" /* yacc.c:1646  */
     {
                   int iSign, iLine;
 
@@ -6312,85 +6317,85 @@ yyreduce:
                   HB_COMP_EXPR_FREE( (yyvsp[-7].asExpr) );  /* deletes $5, $2, $4 */
                   HB_COMP_PARAM->functions.pLast->funFlags &= ~ ( HB_FUNF_WITH_RETURN | HB_FUNF_BREAK_CODE );
                }
-#line 6316 "harboury.c" /* yacc.c:1646  */
+#line 6321 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 554:
-#line 1645 "harbour.y" /* yacc.c:1646  */
+#line 1650 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = NULL; }
-#line 6322 "harboury.c" /* yacc.c:1646  */
+#line 6327 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 555:
-#line 1646 "harbour.y" /* yacc.c:1646  */
+#line 1651 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprReduce( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 6328 "harboury.c" /* yacc.c:1646  */
+#line 6333 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 556:
-#line 1650 "harbour.y" /* yacc.c:1646  */
+#line 1655 "harbour.y" /* yacc.c:1646  */
     {
                      hb_compLinePush( HB_COMP_PARAM );
                      if( HB_COMP_PARAM->functions.pLast->wForCounter )
                         --HB_COMP_PARAM->functions.pLast->wForCounter;
                   }
-#line 6338 "harboury.c" /* yacc.c:1646  */
+#line 6343 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 566:
-#line 1668 "harbour.y" /* yacc.c:1646  */
+#line 1673 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewVarRef( (yyvsp[0].string), HB_COMP_PARAM ); }
-#line 6344 "harboury.c" /* yacc.c:1646  */
+#line 6349 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 567:
-#line 1669 "harbour.y" /* yacc.c:1646  */
+#line 1674 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewRef( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 6350 "harboury.c" /* yacc.c:1646  */
+#line 6355 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 568:
-#line 1672 "harbour.y" /* yacc.c:1646  */
+#line 1677 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewArgList( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 6356 "harboury.c" /* yacc.c:1646  */
+#line 6361 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 569:
-#line 1673 "harbour.y" /* yacc.c:1646  */
+#line 1678 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddListExpr( (yyvsp[-2].asExpr), (yyvsp[0].asExpr) ); }
-#line 6362 "harboury.c" /* yacc.c:1646  */
+#line 6367 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 570:
-#line 1676 "harbour.y" /* yacc.c:1646  */
+#line 1681 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewVarRef( (yyvsp[0].string), HB_COMP_PARAM ); }
-#line 6368 "harboury.c" /* yacc.c:1646  */
+#line 6373 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 572:
-#line 1680 "harbour.y" /* yacc.c:1646  */
+#line 1685 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewArgList( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 6374 "harboury.c" /* yacc.c:1646  */
+#line 6379 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 573:
-#line 1681 "harbour.y" /* yacc.c:1646  */
+#line 1686 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddListExpr( (yyvsp[-2].asExpr), (yyvsp[0].asExpr) ); }
-#line 6380 "harboury.c" /* yacc.c:1646  */
+#line 6385 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 574:
-#line 1686 "harbour.y" /* yacc.c:1646  */
+#line 1691 "harbour.y" /* yacc.c:1646  */
     {
                 ++HB_COMP_PARAM->functions.pLast->wForCounter;    /* 5 */
                 hb_compLinePushIfInside( HB_COMP_PARAM );
                 hb_compDebugStart();
              }
-#line 6390 "harboury.c" /* yacc.c:1646  */
+#line 6395 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 575:
-#line 1692 "harbour.y" /* yacc.c:1646  */
+#line 1697 "harbour.y" /* yacc.c:1646  */
     {
                 /* 7 */
                 (yyvsp[-4].asExpr) = hb_compExprReduce( (yyvsp[-4].asExpr), HB_COMP_PARAM );
@@ -6400,20 +6405,20 @@ yyreduce:
                 hb_compLoopStart( HB_COMP_PARAM, HB_TRUE );
                 (yyval.sNumber) = HB_COMP_PARAM->functions.pLast->nPCodePos;
              }
-#line 6404 "harboury.c" /* yacc.c:1646  */
+#line 6409 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 576:
-#line 1702 "harbour.y" /* yacc.c:1646  */
+#line 1707 "harbour.y" /* yacc.c:1646  */
     {
                 /* 9 */
                 (yyval.sNumber) = hb_compGenJumpFalse( 0, HB_COMP_PARAM );
              }
-#line 6413 "harboury.c" /* yacc.c:1646  */
+#line 6418 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 577:
-#line 1707 "harbour.y" /* yacc.c:1646  */
+#line 1712 "harbour.y" /* yacc.c:1646  */
     {
                 hb_compLoopHere( HB_COMP_PARAM );
                 hb_compEnumNext( HB_COMP_PARAM, (yyvsp[-8].asExpr), (yyvsp[-4].iNumber) );
@@ -6426,122 +6431,122 @@ yyreduce:
                 HB_COMP_EXPR_FREE( (yyvsp[-8].asExpr) );
                 HB_COMP_EXPR_FREE( (yyvsp[-6].asExpr) );
              }
-#line 6430 "harboury.c" /* yacc.c:1646  */
+#line 6435 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 578:
-#line 1721 "harbour.y" /* yacc.c:1646  */
+#line 1726 "harbour.y" /* yacc.c:1646  */
     { (yyval.iNumber) =  1; }
-#line 6436 "harboury.c" /* yacc.c:1646  */
+#line 6441 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 579:
-#line 1722 "harbour.y" /* yacc.c:1646  */
+#line 1727 "harbour.y" /* yacc.c:1646  */
     { (yyval.iNumber) = -1; }
-#line 6442 "harboury.c" /* yacc.c:1646  */
+#line 6447 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 580:
-#line 1726 "harbour.y" /* yacc.c:1646  */
+#line 1731 "harbour.y" /* yacc.c:1646  */
     {
                   hb_compLoopStart( HB_COMP_PARAM, HB_FALSE );
                   hb_compSwitchStart( HB_COMP_PARAM, (yyvsp[0].asExpr) );
                   hb_compGenJump( 0, HB_COMP_PARAM );
                }
-#line 6452 "harboury.c" /* yacc.c:1646  */
+#line 6457 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 581:
-#line 1733 "harbour.y" /* yacc.c:1646  */
+#line 1738 "harbour.y" /* yacc.c:1646  */
     {
                   hb_compSwitchEnd( HB_COMP_PARAM );
                   hb_compLoopEnd( HB_COMP_PARAM );
                }
-#line 6461 "harboury.c" /* yacc.c:1646  */
+#line 6466 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 582:
-#line 1740 "harbour.y" /* yacc.c:1646  */
+#line 1745 "harbour.y" /* yacc.c:1646  */
     {
                   HB_COMP_EXPR_FREE( (yyvsp[-1].asExpr) );
                }
-#line 6469 "harboury.c" /* yacc.c:1646  */
+#line 6474 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 583:
-#line 1746 "harbour.y" /* yacc.c:1646  */
+#line 1751 "harbour.y" /* yacc.c:1646  */
     {
                   if( HB_COMP_PARAM->functions.pLast->wSwitchCounter )
                      --HB_COMP_PARAM->functions.pLast->wSwitchCounter;
                   HB_COMP_PARAM->functions.pLast->funFlags &= ~ ( HB_FUNF_WITH_RETURN | HB_FUNF_BREAK_CODE );
                }
-#line 6479 "harboury.c" /* yacc.c:1646  */
+#line 6484 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 592:
-#line 1764 "harbour.y" /* yacc.c:1646  */
+#line 1769 "harbour.y" /* yacc.c:1646  */
     {
                   ++HB_COMP_PARAM->functions.pLast->wSwitchCounter;
                   hb_compLinePushIfInside( HB_COMP_PARAM );
                }
-#line 6488 "harboury.c" /* yacc.c:1646  */
+#line 6493 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 593:
-#line 1769 "harbour.y" /* yacc.c:1646  */
+#line 1774 "harbour.y" /* yacc.c:1646  */
     {
                   (yyval.asExpr) = hb_compExprReduce( (yyvsp[-1].asExpr), HB_COMP_PARAM );
                }
-#line 6496 "harboury.c" /* yacc.c:1646  */
+#line 6501 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 595:
-#line 1776 "harbour.y" /* yacc.c:1646  */
+#line 1781 "harbour.y" /* yacc.c:1646  */
     {
                   if( (yyvsp[0].lNumber) > 0 )
                   {
                      hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'E', HB_COMP_ERR_MAYHEM_IN_CASE, NULL, NULL );
                   }
                }
-#line 6507 "harboury.c" /* yacc.c:1646  */
+#line 6512 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 596:
-#line 1784 "harbour.y" /* yacc.c:1646  */
+#line 1789 "harbour.y" /* yacc.c:1646  */
     { hb_compSwitchAdd( HB_COMP_PARAM, (yyvsp[0].asExpr) ); hb_compLinePush( HB_COMP_PARAM ); }
-#line 6513 "harboury.c" /* yacc.c:1646  */
+#line 6518 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 598:
-#line 1787 "harbour.y" /* yacc.c:1646  */
+#line 1792 "harbour.y" /* yacc.c:1646  */
     { hb_compSwitchAdd( HB_COMP_PARAM, (yyvsp[0].asExpr) ); hb_compLinePush( HB_COMP_PARAM ); }
-#line 6519 "harboury.c" /* yacc.c:1646  */
+#line 6524 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 602:
-#line 1795 "harbour.y" /* yacc.c:1646  */
+#line 1800 "harbour.y" /* yacc.c:1646  */
     { hb_compSwitchAdd( HB_COMP_PARAM, NULL ); hb_compLinePush( HB_COMP_PARAM ); }
-#line 6525 "harboury.c" /* yacc.c:1646  */
+#line 6530 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 603:
-#line 1795 "harbour.y" /* yacc.c:1646  */
+#line 1800 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->functions.pLast->funFlags &= ~ HB_FUNF_BREAK_CODE; }
-#line 6531 "harboury.c" /* yacc.c:1646  */
+#line 6536 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 605:
-#line 1800 "harbour.y" /* yacc.c:1646  */
+#line 1805 "harbour.y" /* yacc.c:1646  */
     {              /* 2 */
                   hb_compLinePushIfInside( HB_COMP_PARAM );
                   ++HB_COMP_PARAM->functions.pLast->wSeqCounter;
                   (yyval.sNumber) = hb_compSequenceBegin( HB_COMP_PARAM );
                }
-#line 6541 "harboury.c" /* yacc.c:1646  */
+#line 6546 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 606:
-#line 1808 "harbour.y" /* yacc.c:1646  */
+#line 1813 "harbour.y" /* yacc.c:1646  */
     {              /* 6 */
                   /* Set jump address for HB_P_SEQBEGIN opcode - this address
                    * will be used in BREAK code if there is no RECOVER clause
@@ -6552,11 +6557,11 @@ yyreduce:
                   (yyval.sNumber) = hb_compSequenceEnd( HB_COMP_PARAM );
                   (yyvsp[-1].lNumber) = hb_compLoopCount( HB_COMP_PARAM );
                }
-#line 6556 "harboury.c" /* yacc.c:1646  */
+#line 6561 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 607:
-#line 1819 "harbour.y" /* yacc.c:1646  */
+#line 1824 "harbour.y" /* yacc.c:1646  */
     {              /* 8 */
                   /* Replace END address with RECOVER address in
                    * HB_P_SEQBEGIN opcode if there is RECOVER clause
@@ -6566,11 +6571,11 @@ yyreduce:
                   else if( HB_COMP_PARAM->functions.pLast->wSeqCounter )
                      --HB_COMP_PARAM->functions.pLast->wSeqCounter;
                }
-#line 6570 "harboury.c" /* yacc.c:1646  */
+#line 6575 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 608:
-#line 1829 "harbour.y" /* yacc.c:1646  */
+#line 1834 "harbour.y" /* yacc.c:1646  */
     {              /* 10 */
                   long lLoopCount = hb_compLoopCount( HB_COMP_PARAM );
                   HB_COMP_PARAM->functions.pLast->funFlags &= ~ ( HB_FUNF_WITH_RETURN | HB_FUNF_BREAK_CODE );
@@ -6599,50 +6604,50 @@ yyreduce:
                   hb_compSequenceFinish( HB_COMP_PARAM, (yyvsp[-7].sNumber), (yyvsp[-3].sNumber), (yyvsp[0].sNumber),
                                          (yyvsp[-4].lNumber) != 0, (yyvsp[-2].sNumber) != 0, (yyvsp[-5].lNumber) == lLoopCount );
                }
-#line 6603 "harboury.c" /* yacc.c:1646  */
+#line 6608 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 618:
-#line 1870 "harbour.y" /* yacc.c:1646  */
+#line 1875 "harbour.y" /* yacc.c:1646  */
     { (yyval.sNumber) = 0; }
-#line 6609 "harboury.c" /* yacc.c:1646  */
+#line 6614 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 619:
-#line 1872 "harbour.y" /* yacc.c:1646  */
+#line 1877 "harbour.y" /* yacc.c:1646  */
     {
                   HB_COMP_EXPR_FREE( hb_compExprGenPush( (yyvsp[0].asExpr), HB_COMP_PARAM ) );
                   hb_compGenPCode1( HB_P_SEQBLOCK, HB_COMP_PARAM );
                   (yyval.sNumber) = HB_COMP_PARAM->functions.pLast->nPCodePos;
                }
-#line 6619 "harboury.c" /* yacc.c:1646  */
+#line 6624 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 620:
-#line 1879 "harbour.y" /* yacc.c:1646  */
+#line 1884 "harbour.y" /* yacc.c:1646  */
     { (yyval.sNumber) = 0; }
-#line 6625 "harboury.c" /* yacc.c:1646  */
+#line 6630 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 622:
-#line 1884 "harbour.y" /* yacc.c:1646  */
+#line 1889 "harbour.y" /* yacc.c:1646  */
     {
                   HB_COMP_PARAM->functions.pLast->funFlags &= ~ ( HB_FUNF_WITH_RETURN | HB_FUNF_BREAK_CODE );
                   (yyval.sNumber) = HB_COMP_PARAM->functions.pLast->nPCodePos;
                   ++HB_COMP_PARAM->functions.pLast->wAlwaysCounter;
                   hb_compSequenceAlways( HB_COMP_PARAM );
                }
-#line 6636 "harboury.c" /* yacc.c:1646  */
+#line 6641 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 623:
-#line 1892 "harbour.y" /* yacc.c:1646  */
+#line 1897 "harbour.y" /* yacc.c:1646  */
     { (yyval.sNumber) = 0; HB_COMP_PARAM->functions.pLast->funFlags &= ~ HB_FUNF_BREAK_CODE; }
-#line 6642 "harboury.c" /* yacc.c:1646  */
+#line 6647 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 626:
-#line 1898 "harbour.y" /* yacc.c:1646  */
+#line 1903 "harbour.y" /* yacc.c:1646  */
     {
                   HB_COMP_PARAM->functions.pLast->funFlags &= ~ HB_FUNF_BREAK_CODE;
                   (yyval.sNumber) = HB_COMP_PARAM->functions.pLast->nPCodePos;
@@ -6651,11 +6656,11 @@ yyreduce:
                   hb_compLinePushIfInside( HB_COMP_PARAM );
                   hb_compGenPCode2( HB_P_SEQRECOVER, HB_P_POP, HB_COMP_PARAM );
                }
-#line 6655 "harboury.c" /* yacc.c:1646  */
+#line 6660 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 627:
-#line 1909 "harbour.y" /* yacc.c:1646  */
+#line 1914 "harbour.y" /* yacc.c:1646  */
     {
                   HB_COMP_PARAM->functions.pLast->funFlags &= ~ HB_FUNF_BREAK_CODE;
                   (yyval.sNumber) = HB_COMP_PARAM->functions.pLast->nPCodePos;
@@ -6665,77 +6670,77 @@ yyreduce:
                   hb_compGenPCode1( HB_P_SEQRECOVER, HB_COMP_PARAM );
                   hb_compGenPopVar( (yyvsp[0].string), HB_COMP_PARAM );
                }
-#line 6669 "harboury.c" /* yacc.c:1646  */
+#line 6674 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 628:
-#line 1927 "harbour.y" /* yacc.c:1646  */
+#line 1932 "harbour.y" /* yacc.c:1646  */
     {
                   (yyval.asExpr) = hb_compExprNewFunCall( (yyvsp[-1].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM );
                }
-#line 6677 "harboury.c" /* yacc.c:1646  */
+#line 6682 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 629:
-#line 1931 "harbour.y" /* yacc.c:1646  */
+#line 1936 "harbour.y" /* yacc.c:1646  */
     {
                   hb_compModuleAdd( HB_COMP_PARAM, (yyvsp[-1].string), HB_FALSE );
                   /* DOIDENT is the only one identifier which can be returned in lower letters */
                   (yyval.asExpr) = hb_compExprNewFunCall( hb_compExprNewFunName( hb_compIdentifierNew( HB_COMP_PARAM, hb_strupr( hb_strdup( (yyvsp[-1].string) ) ), HB_IDENT_FREE ), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM );
                }
-#line 6687 "harboury.c" /* yacc.c:1646  */
+#line 6692 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 630:
-#line 1938 "harbour.y" /* yacc.c:1646  */
+#line 1943 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = NULL; }
-#line 6693 "harboury.c" /* yacc.c:1646  */
+#line 6698 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 631:
-#line 1939 "harbour.y" /* yacc.c:1646  */
+#line 1944 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 6699 "harboury.c" /* yacc.c:1646  */
+#line 6704 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 632:
-#line 1942 "harbour.y" /* yacc.c:1646  */
+#line 1947 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddListExpr( hb_compExprNewArgList( hb_compExprNewNil( HB_COMP_PARAM ), HB_COMP_PARAM ), hb_compExprNewNil( HB_COMP_PARAM ) ); }
-#line 6705 "harboury.c" /* yacc.c:1646  */
+#line 6710 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 633:
-#line 1943 "harbour.y" /* yacc.c:1646  */
+#line 1948 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddListExpr( hb_compExprNewArgList( hb_compExprNewNil( HB_COMP_PARAM ), HB_COMP_PARAM ), (yyvsp[0].asExpr) ); }
-#line 6711 "harboury.c" /* yacc.c:1646  */
+#line 6716 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 634:
-#line 1944 "harbour.y" /* yacc.c:1646  */
+#line 1949 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewArgList( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 6717 "harboury.c" /* yacc.c:1646  */
+#line 6722 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 635:
-#line 1945 "harbour.y" /* yacc.c:1646  */
+#line 1950 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddListExpr( (yyvsp[-1].asExpr), hb_compExprNewNil( HB_COMP_PARAM ) ); }
-#line 6723 "harboury.c" /* yacc.c:1646  */
+#line 6728 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 636:
-#line 1946 "harbour.y" /* yacc.c:1646  */
+#line 1951 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddListExpr( (yyvsp[-2].asExpr), (yyvsp[0].asExpr) ); }
-#line 6729 "harboury.c" /* yacc.c:1646  */
+#line 6734 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 637:
-#line 1949 "harbour.y" /* yacc.c:1646  */
+#line 1954 "harbour.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewVarRef( (yyvsp[0].string), HB_COMP_PARAM ); }
-#line 6735 "harboury.c" /* yacc.c:1646  */
+#line 6740 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 642:
-#line 1957 "harbour.y" /* yacc.c:1646  */
+#line 1962 "harbour.y" /* yacc.c:1646  */
     {
                   hb_compLinePushIfInside( HB_COMP_PARAM );
                   HB_COMP_EXPR_FREE( hb_compExprGenPush( (yyvsp[-1].asExpr), HB_COMP_PARAM ) );
@@ -6743,11 +6748,11 @@ yyreduce:
                   hb_compGenPCode1( HB_P_WITHOBJECTSTART, HB_COMP_PARAM );
                   HB_COMP_PARAM->functions.pLast->wWithObjectCnt++;
                }
-#line 6747 "harboury.c" /* yacc.c:1646  */
+#line 6752 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 643:
-#line 1966 "harbour.y" /* yacc.c:1646  */
+#line 1971 "harbour.y" /* yacc.c:1646  */
     {  if( HB_COMP_PARAM->functions.pLast->wWithObjectCnt )
                     --HB_COMP_PARAM->functions.pLast->wWithObjectCnt;
                   if( (yyvsp[-1].lNumber) )
@@ -6759,17 +6764,17 @@ yyreduce:
                      hb_compGenPCode1( HB_P_POP, HB_COMP_PARAM );
                   }
                }
-#line 6763 "harboury.c" /* yacc.c:1646  */
+#line 6768 "harboury.c" /* yacc.c:1646  */
     break;
 
   case 652:
-#line 1989 "harbour.y" /* yacc.c:1646  */
+#line 1994 "harbour.y" /* yacc.c:1646  */
     { HB_COMP_PARAM->fError = HB_FALSE; }
-#line 6769 "harboury.c" /* yacc.c:1646  */
+#line 6774 "harboury.c" /* yacc.c:1646  */
     break;
 
 
-#line 6773 "harboury.c" /* yacc.c:1646  */
+#line 6778 "harboury.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -6997,7 +7002,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 1993 "harbour.y" /* yacc.c:1906  */
+#line 1998 "harbour.y" /* yacc.c:1906  */
 
 
 /*
diff --git a/src/compiler/hbmain.c b/src/compiler/hbmain.c
index 10348f9998..1b750cddf7 100644
--- a/src/compiler/hbmain.c
+++ b/src/compiler/hbmain.c
@@ -895,7 +895,7 @@ const char * hb_compStaticVariableName( HB_COMP_DECL, HB_USHORT wVar )
    return pVar ? pVar->szName : NULL;
 }
 
-int hb_compVariableScope( HB_COMP_DECL, const char * szVarName )
+static int hb_compVariableScope( HB_COMP_DECL, const char * szVarName )
 {
    int iScope;
 
diff --git a/src/macro/macro.yyc b/src/macro/macro.yyc
index 909bb7f007..747fbb1c59 100644
--- a/src/macro/macro.yyc
+++ b/src/macro/macro.yyc
@@ -201,7 +201,7 @@
 #endif
 
 
-#line 207 "macroy.c" /* yacc.c:339  */
+#line 205 "macroy.c" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -282,7 +282,7 @@ extern int hb_macro_yydebug;
 typedef union YYSTYPE YYSTYPE;
 union YYSTYPE
 {
-#line 142 "macro.y" /* yacc.c:355  */
+#line 140 "macro.y" /* yacc.c:355  */
 
    const char * string; /* to hold a string returned by lex */
    int       iNumber;   /* to hold a temporary integer number */
@@ -315,7 +315,7 @@ union YYSTYPE
       long     time;    /* to hold milliseconds */
    } valTimeStamp;
 
-#line 321 "macroy.c" /* yacc.c:355  */
+#line 319 "macroy.c" /* yacc.c:355  */
 };
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
@@ -328,7 +328,7 @@ int hb_macro_yyparse (PHB_MACRO pMacro);
 #endif /* !YY_HB_MACRO_YY_MACROY_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
-#line 175 "macro.y" /* yacc.c:358  */
+#line 173 "macro.y" /* yacc.c:358  */
 
 /* This must be placed after the above union - the union is
  * typedef-ined to YYSTYPE
@@ -338,7 +338,7 @@ extern int  yyparse( PHB_MACRO );            /* main yacc parsing function */
 extern void yyerror( PHB_MACRO, const char * );    /* parsing error management function */
 
 
-#line 344 "macroy.c" /* yacc.c:358  */
+#line 342 "macroy.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -639,27 +639,27 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   259,   259,   269,   277,   286,   287,   290,   293,   296,
-     301,   306,   311,   312,   317,   322,   327,   332,   333,   336,
-     337,   343,   346,   351,   354,   373,   378,   381,   388,   389,
-     394,   395,   396,   397,   398,   401,   402,   403,   406,   407,
-     408,   409,   410,   411,   412,   421,   422,   423,   424,   425,
-     430,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-     440,   441,   442,   443,   444,   445,   446,   447,   448,   453,
-     456,   461,   471,   472,   475,   476,   479,   480,   481,   482,
-     483,   486,   487,   492,   495,   496,   497,   502,   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,   533,   534,   535,   538,   539,
-     542,   543,   546,   546,   560,   561,   565,   566,   569,   570,
-     571,   572,   573,   574,   575,   576,   577,   578,   579,   580,
-     581,   582,   583,   584,   585,   586,   587,   588,   589,   590,
-     596,   597,   603,   606,   607,   610,   611,   612,   615,   618,
-     621,   624,   627,   630,   633,   636,   637,   638,   639,   640,
-     641,   644,   645,   646,   647,   648,   649,   652,   653,   656,
-     657,   658,   659,   660,   661,   662,   663,   664,   667,   673,
-     674,   675,   678,   679,   683,   682,   690,   691,   696,   697,
-     698,   699,   702,   703,   706,   707,   710,   713,   717
+       0,   257,   257,   267,   275,   284,   285,   288,   291,   294,
+     299,   304,   309,   310,   315,   320,   325,   330,   331,   334,
+     335,   341,   344,   349,   352,   371,   376,   379,   386,   387,
+     392,   393,   394,   395,   396,   399,   400,   401,   404,   405,
+     406,   407,   408,   409,   410,   419,   420,   421,   422,   423,
+     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,   440,   441,   442,   443,   444,   445,   446,   451,
+     454,   459,   469,   470,   473,   474,   477,   478,   479,   480,
+     481,   484,   485,   490,   493,   494,   495,   500,   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,   533,   536,   537,
+     540,   541,   544,   544,   558,   559,   563,   564,   567,   568,
+     569,   570,   571,   572,   573,   574,   575,   576,   577,   578,
+     579,   580,   581,   582,   583,   584,   585,   586,   587,   588,
+     594,   595,   601,   604,   605,   608,   609,   610,   613,   616,
+     619,   622,   625,   628,   631,   634,   635,   636,   637,   638,
+     639,   642,   643,   644,   645,   646,   647,   650,   651,   654,
+     655,   656,   657,   658,   659,   660,   661,   662,   665,   671,
+     672,   673,   676,   677,   681,   680,   688,   689,   694,   695,
+     696,   697,   700,   701,   704,   705,   708,   711,   715
 };
 #endif
 
@@ -1849,7 +1849,7 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 259 "macro.y" /* yacc.c:1646  */
+#line 257 "macro.y" /* yacc.c:1646  */
     {
                            HB_MACRO_DATA->exprType = hb_compExprType( (yyvsp[0].asExpr) );
                            if( HB_MACRO_DATA->Flags &  HB_MACRO_GEN_REFER )
@@ -1860,11 +1860,11 @@ yyreduce:
                               hb_macroExprGenPop( (yyvsp[0].asExpr), HB_COMP_PARAM );
                            hb_macroGenPCode1( HB_P_ENDPROC, HB_COMP_PARAM );
                         }
-#line 1866 "macroy.c" /* yacc.c:1646  */
+#line 1864 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 3:
-#line 269 "macro.y" /* yacc.c:1646  */
+#line 267 "macro.y" /* yacc.c:1646  */
     {
                            HB_MACRO_DATA->exprType = hb_compExprType( (yyvsp[0].asExpr) );
                            if( HB_MACRO_DATA->Flags &  HB_MACRO_GEN_PUSH )
@@ -1873,137 +1873,137 @@ yyreduce:
                               hb_macroError( EG_SYNTAX, HB_COMP_PARAM );
                            hb_macroGenPCode1( HB_P_ENDPROC, HB_COMP_PARAM );
                         }
-#line 1879 "macroy.c" /* yacc.c:1646  */
+#line 1877 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 4:
-#line 277 "macro.y" /* yacc.c:1646  */
+#line 275 "macro.y" /* yacc.c:1646  */
     {
                   HB_TRACE( HB_TR_DEBUG, ( "macro -> invalid syntax: %s", HB_MACRO_DATA->string ) );
                   hb_macroError( EG_SYNTAX, HB_COMP_PARAM );
                   HB_MACRO_ABORT;
                }
-#line 1889 "macroy.c" /* yacc.c:1646  */
+#line 1887 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 5:
-#line 286 "macro.y" /* yacc.c:1646  */
+#line 284 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewDouble( (yyvsp[0].valDouble).dNumber, (yyvsp[0].valDouble).bWidth, (yyvsp[0].valDouble).bDec, HB_COMP_PARAM ); }
-#line 1895 "macroy.c" /* yacc.c:1646  */
+#line 1893 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 287 "macro.y" /* yacc.c:1646  */
+#line 285 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewLong( (yyvsp[0].valLong).lNumber, HB_COMP_PARAM ); }
-#line 1901 "macroy.c" /* yacc.c:1646  */
+#line 1899 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 290 "macro.y" /* yacc.c:1646  */
+#line 288 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewDate( ( long ) (yyvsp[0].valLong).lNumber, HB_COMP_PARAM ); }
-#line 1907 "macroy.c" /* yacc.c:1646  */
+#line 1905 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 293 "macro.y" /* yacc.c:1646  */
+#line 291 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewTimeStamp( (yyvsp[0].valTimeStamp).date, (yyvsp[0].valTimeStamp).time, HB_COMP_PARAM ); }
-#line 1913 "macroy.c" /* yacc.c:1646  */
+#line 1911 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 296 "macro.y" /* yacc.c:1646  */
+#line 294 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewLong( (yyvsp[-1].valLong).lNumber, HB_COMP_PARAM ); }
-#line 1919 "macroy.c" /* yacc.c:1646  */
+#line 1917 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 301 "macro.y" /* yacc.c:1646  */
+#line 299 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewNil( HB_COMP_PARAM ); }
-#line 1925 "macroy.c" /* yacc.c:1646  */
+#line 1923 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 306 "macro.y" /* yacc.c:1646  */
+#line 304 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewString( (yyvsp[0].valChar).string, (yyvsp[0].valChar).length, HB_FALSE, HB_COMP_PARAM ); }
-#line 1931 "macroy.c" /* yacc.c:1646  */
+#line 1929 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 311 "macro.y" /* yacc.c:1646  */
+#line 309 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewLogical( HB_TRUE, HB_COMP_PARAM ); }
-#line 1937 "macroy.c" /* yacc.c:1646  */
+#line 1935 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 13:
-#line 312 "macro.y" /* yacc.c:1646  */
+#line 310 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewLogical( HB_FALSE, HB_COMP_PARAM ); }
-#line 1943 "macroy.c" /* yacc.c:1646  */
+#line 1941 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 14:
-#line 317 "macro.y" /* yacc.c:1646  */
+#line 315 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewSelf( HB_COMP_PARAM ); }
-#line 1949 "macroy.c" /* yacc.c:1646  */
+#line 1947 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 15:
-#line 322 "macro.y" /* yacc.c:1646  */
+#line 320 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewArray( (yyvsp[-1].asExpr), HB_COMP_PARAM ); }
-#line 1955 "macroy.c" /* yacc.c:1646  */
+#line 1953 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 16:
-#line 327 "macro.y" /* yacc.c:1646  */
+#line 325 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 1961 "macroy.c" /* yacc.c:1646  */
+#line 1959 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 17:
-#line 332 "macro.y" /* yacc.c:1646  */
+#line 330 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewHash( NULL, HB_COMP_PARAM ); }
-#line 1967 "macroy.c" /* yacc.c:1646  */
+#line 1965 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 333 "macro.y" /* yacc.c:1646  */
+#line 331 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewHash( (yyvsp[-1].asExpr), HB_COMP_PARAM ); }
-#line 1973 "macroy.c" /* yacc.c:1646  */
+#line 1971 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 336 "macro.y" /* yacc.c:1646  */
+#line 334 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddListExpr( hb_compExprNewList( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr) ); }
-#line 1979 "macroy.c" /* yacc.c:1646  */
+#line 1977 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 337 "macro.y" /* yacc.c:1646  */
+#line 335 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddListExpr( hb_compExprAddListExpr( (yyvsp[-4].asExpr), (yyvsp[-2].asExpr) ), (yyvsp[0].asExpr) ); }
-#line 1985 "macroy.c" /* yacc.c:1646  */
+#line 1983 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 21:
-#line 343 "macro.y" /* yacc.c:1646  */
+#line 341 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewVar( (yyvsp[0].string), HB_COMP_PARAM ); }
-#line 1991 "macroy.c" /* yacc.c:1646  */
+#line 1989 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 22:
-#line 346 "macro.y" /* yacc.c:1646  */
+#line 344 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewAlias( (yyvsp[-1].string), HB_COMP_PARAM ); }
-#line 1997 "macroy.c" /* yacc.c:1646  */
+#line 1995 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 23:
-#line 351 "macro.y" /* yacc.c:1646  */
+#line 349 "macro.y" /* yacc.c:1646  */
     {  (yyval.asExpr) = hb_compExprNewMacro( NULL, '&', (yyvsp[0].string), HB_COMP_PARAM );
                                  HB_MACRO_CHECK( (yyval.asExpr) );
                               }
-#line 2005 "macroy.c" /* yacc.c:1646  */
+#line 2003 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 24:
-#line 354 "macro.y" /* yacc.c:1646  */
+#line 352 "macro.y" /* yacc.c:1646  */
     {  HB_BOOL fNewString;
                                  char * szVarName = hb_macroTextSymbol( (yyvsp[0].string), strlen( (yyvsp[0].string) ), &fNewString );
                                  if( szVarName )
@@ -2021,273 +2021,273 @@ yyreduce:
                                     YYABORT;
                                  }
                               }
-#line 2027 "macroy.c" /* yacc.c:1646  */
+#line 2025 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 25:
-#line 373 "macro.y" /* yacc.c:1646  */
+#line 371 "macro.y" /* yacc.c:1646  */
     { hb_compExprMacroAsAlias( (yyvsp[-1].asExpr) ); }
-#line 2033 "macroy.c" /* yacc.c:1646  */
+#line 2031 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 26:
-#line 378 "macro.y" /* yacc.c:1646  */
+#line 376 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewMacro( (yyvsp[0].asExpr), 0, NULL, HB_COMP_PARAM ); }
-#line 2039 "macroy.c" /* yacc.c:1646  */
+#line 2037 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 28:
-#line 388 "macro.y" /* yacc.c:1646  */
+#line 386 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewAlias( "FIELD", HB_COMP_PARAM ); }
-#line 2045 "macroy.c" /* yacc.c:1646  */
+#line 2043 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 29:
-#line 389 "macro.y" /* yacc.c:1646  */
+#line 387 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2051 "macroy.c" /* yacc.c:1646  */
+#line 2049 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 30:
-#line 394 "macro.y" /* yacc.c:1646  */
+#line 392 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2057 "macroy.c" /* yacc.c:1646  */
+#line 2055 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 31:
-#line 395 "macro.y" /* yacc.c:1646  */
+#line 393 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2063 "macroy.c" /* yacc.c:1646  */
+#line 2061 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 32:
-#line 396 "macro.y" /* yacc.c:1646  */
+#line 394 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2069 "macroy.c" /* yacc.c:1646  */
+#line 2067 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 33:
-#line 397 "macro.y" /* yacc.c:1646  */
+#line 395 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2075 "macroy.c" /* yacc.c:1646  */
+#line 2073 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 34:
-#line 398 "macro.y" /* yacc.c:1646  */
+#line 396 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2081 "macroy.c" /* yacc.c:1646  */
+#line 2079 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 35:
-#line 401 "macro.y" /* yacc.c:1646  */
+#line 399 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewVar( (yyvsp[0].string), HB_COMP_PARAM ); }
-#line 2087 "macroy.c" /* yacc.c:1646  */
+#line 2085 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 38:
-#line 406 "macro.y" /* yacc.c:1646  */
+#line 404 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewAliasVar( (yyvsp[-1].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2093 "macroy.c" /* yacc.c:1646  */
+#line 2091 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 39:
-#line 407 "macro.y" /* yacc.c:1646  */
+#line 405 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewAliasVar( (yyvsp[-1].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2099 "macroy.c" /* yacc.c:1646  */
+#line 2097 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 40:
-#line 408 "macro.y" /* yacc.c:1646  */
+#line 406 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewAliasVar( (yyvsp[-1].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2105 "macroy.c" /* yacc.c:1646  */
+#line 2103 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 41:
-#line 409 "macro.y" /* yacc.c:1646  */
+#line 407 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewAliasVar( (yyvsp[-1].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2111 "macroy.c" /* yacc.c:1646  */
+#line 2109 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 42:
-#line 410 "macro.y" /* yacc.c:1646  */
+#line 408 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewAliasVar( (yyvsp[-1].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2117 "macroy.c" /* yacc.c:1646  */
+#line 2115 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 43:
-#line 411 "macro.y" /* yacc.c:1646  */
+#line 409 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewAliasVar( (yyvsp[-1].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2123 "macroy.c" /* yacc.c:1646  */
+#line 2121 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 44:
-#line 412 "macro.y" /* yacc.c:1646  */
+#line 410 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewAliasVar( (yyvsp[-1].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2129 "macroy.c" /* yacc.c:1646  */
+#line 2127 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 45:
-#line 421 "macro.y" /* yacc.c:1646  */
+#line 419 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewAliasExpr( (yyvsp[-1].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2135 "macroy.c" /* yacc.c:1646  */
+#line 2133 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 46:
-#line 422 "macro.y" /* yacc.c:1646  */
+#line 420 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewAliasExpr( (yyvsp[-1].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2141 "macroy.c" /* yacc.c:1646  */
+#line 2139 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 423 "macro.y" /* yacc.c:1646  */
+#line 421 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewAliasExpr( (yyvsp[-1].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2147 "macroy.c" /* yacc.c:1646  */
+#line 2145 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 48:
-#line 424 "macro.y" /* yacc.c:1646  */
+#line 422 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewAliasExpr( (yyvsp[-1].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2153 "macroy.c" /* yacc.c:1646  */
+#line 2151 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 49:
-#line 425 "macro.y" /* yacc.c:1646  */
+#line 423 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewAliasExpr( (yyvsp[-1].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2159 "macroy.c" /* yacc.c:1646  */
+#line 2157 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 50:
-#line 430 "macro.y" /* yacc.c:1646  */
+#line 428 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2165 "macroy.c" /* yacc.c:1646  */
+#line 2163 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 51:
-#line 431 "macro.y" /* yacc.c:1646  */
+#line 429 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2171 "macroy.c" /* yacc.c:1646  */
+#line 2169 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 52:
-#line 432 "macro.y" /* yacc.c:1646  */
+#line 430 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2177 "macroy.c" /* yacc.c:1646  */
+#line 2175 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 53:
-#line 433 "macro.y" /* yacc.c:1646  */
+#line 431 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2183 "macroy.c" /* yacc.c:1646  */
+#line 2181 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 54:
-#line 434 "macro.y" /* yacc.c:1646  */
+#line 432 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2189 "macroy.c" /* yacc.c:1646  */
+#line 2187 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 55:
-#line 435 "macro.y" /* yacc.c:1646  */
+#line 433 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2195 "macroy.c" /* yacc.c:1646  */
+#line 2193 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 56:
-#line 436 "macro.y" /* yacc.c:1646  */
+#line 434 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2201 "macroy.c" /* yacc.c:1646  */
+#line 2199 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 57:
-#line 437 "macro.y" /* yacc.c:1646  */
+#line 435 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2207 "macroy.c" /* yacc.c:1646  */
+#line 2205 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 58:
-#line 438 "macro.y" /* yacc.c:1646  */
+#line 436 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2213 "macroy.c" /* yacc.c:1646  */
+#line 2211 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 59:
-#line 439 "macro.y" /* yacc.c:1646  */
+#line 437 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2219 "macroy.c" /* yacc.c:1646  */
+#line 2217 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 60:
-#line 440 "macro.y" /* yacc.c:1646  */
+#line 438 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2225 "macroy.c" /* yacc.c:1646  */
+#line 2223 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 61:
-#line 441 "macro.y" /* yacc.c:1646  */
+#line 439 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2231 "macroy.c" /* yacc.c:1646  */
+#line 2229 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 62:
-#line 442 "macro.y" /* yacc.c:1646  */
+#line 440 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2237 "macroy.c" /* yacc.c:1646  */
+#line 2235 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 63:
-#line 443 "macro.y" /* yacc.c:1646  */
+#line 441 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2243 "macroy.c" /* yacc.c:1646  */
+#line 2241 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 64:
-#line 444 "macro.y" /* yacc.c:1646  */
+#line 442 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2249 "macroy.c" /* yacc.c:1646  */
+#line 2247 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 65:
-#line 445 "macro.y" /* yacc.c:1646  */
+#line 443 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2255 "macroy.c" /* yacc.c:1646  */
+#line 2253 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 66:
-#line 446 "macro.y" /* yacc.c:1646  */
+#line 444 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2261 "macroy.c" /* yacc.c:1646  */
+#line 2259 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 67:
-#line 447 "macro.y" /* yacc.c:1646  */
+#line 445 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2267 "macroy.c" /* yacc.c:1646  */
+#line 2265 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 68:
-#line 448 "macro.y" /* yacc.c:1646  */
+#line 446 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2273 "macroy.c" /* yacc.c:1646  */
+#line 2271 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 69:
-#line 453 "macro.y" /* yacc.c:1646  */
+#line 451 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_macroExprNewFunCall( hb_compExprNewFunName( (yyvsp[-3].string), HB_COMP_PARAM ), (yyvsp[-1].asExpr), HB_COMP_PARAM );
                                             HB_MACRO_CHECK( (yyval.asExpr) );
                                           }
-#line 2281 "macroy.c" /* yacc.c:1646  */
+#line 2279 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 70:
-#line 456 "macro.y" /* yacc.c:1646  */
+#line 454 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_macroExprNewFunCall( (yyvsp[-3].asExpr), (yyvsp[-1].asExpr), HB_COMP_PARAM );
                                             HB_MACRO_CHECK( (yyval.asExpr) );
                                           }
-#line 2289 "macroy.c" /* yacc.c:1646  */
+#line 2287 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 71:
-#line 461 "macro.y" /* yacc.c:1646  */
+#line 459 "macro.y" /* yacc.c:1646  */
     {  if( hb_compExprParamListLen( (yyvsp[-1].asExpr) ) != 0 )
                                                 {
                                                    hb_macroError( EG_SYNTAX, HB_COMP_PARAM );
@@ -2296,125 +2296,125 @@ yyreduce:
                                                 else
                                                    (yyval.asExpr) = hb_compExprNewFunRef( (yyvsp[-3].string), HB_COMP_PARAM );
                                              }
-#line 2302 "macroy.c" /* yacc.c:1646  */
+#line 2300 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 72:
-#line 471 "macro.y" /* yacc.c:1646  */
+#line 469 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewArgList( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2308 "macroy.c" /* yacc.c:1646  */
+#line 2306 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 73:
-#line 472 "macro.y" /* yacc.c:1646  */
+#line 470 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddListExpr( (yyvsp[-2].asExpr), (yyvsp[0].asExpr) ); }
-#line 2314 "macroy.c" /* yacc.c:1646  */
+#line 2312 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 76:
-#line 479 "macro.y" /* yacc.c:1646  */
+#line 477 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewVarRef( (yyvsp[0].string), HB_COMP_PARAM ); }
-#line 2320 "macroy.c" /* yacc.c:1646  */
+#line 2318 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 77:
-#line 480 "macro.y" /* yacc.c:1646  */
+#line 478 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewRef( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2326 "macroy.c" /* yacc.c:1646  */
+#line 2324 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 78:
-#line 481 "macro.y" /* yacc.c:1646  */
+#line 479 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewRef( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2332 "macroy.c" /* yacc.c:1646  */
+#line 2330 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 79:
-#line 482 "macro.y" /* yacc.c:1646  */
+#line 480 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewRef( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2338 "macroy.c" /* yacc.c:1646  */
+#line 2336 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 80:
-#line 483 "macro.y" /* yacc.c:1646  */
+#line 481 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); (yyval.asExpr)->value.asList.reference = HB_TRUE; }
-#line 2344 "macroy.c" /* yacc.c:1646  */
+#line 2342 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 81:
-#line 486 "macro.y" /* yacc.c:1646  */
+#line 484 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewArgRef( HB_COMP_PARAM ); }
-#line 2350 "macroy.c" /* yacc.c:1646  */
+#line 2348 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 83:
-#line 492 "macro.y" /* yacc.c:1646  */
+#line 490 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewMethodObject( (yyvsp[0].asExpr), (yyvsp[-2].asExpr) ); }
-#line 2356 "macroy.c" /* yacc.c:1646  */
+#line 2354 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 84:
-#line 495 "macro.y" /* yacc.c:1646  */
+#line 493 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewSend( (yyvsp[0].string), HB_COMP_PARAM ); }
-#line 2362 "macroy.c" /* yacc.c:1646  */
+#line 2360 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 85:
-#line 496 "macro.y" /* yacc.c:1646  */
+#line 494 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewMacroSend( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2368 "macroy.c" /* yacc.c:1646  */
+#line 2366 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 86:
-#line 497 "macro.y" /* yacc.c:1646  */
+#line 495 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewMacroSend( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2374 "macroy.c" /* yacc.c:1646  */
+#line 2372 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 87:
-#line 502 "macro.y" /* yacc.c:1646  */
+#line 500 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewMethodCall( (yyvsp[-3].asExpr), (yyvsp[-1].asExpr) ); }
-#line 2380 "macroy.c" /* yacc.c:1646  */
+#line 2378 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 110:
-#line 528 "macro.y" /* yacc.c:1646  */
+#line 526 "macro.y" /* yacc.c:1646  */
     { HB_MACRO_IFENABLED( (yyval.asExpr), (yyvsp[0].asExpr), HB_SM_HARBOUR ); }
-#line 2386 "macroy.c" /* yacc.c:1646  */
+#line 2384 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 111:
-#line 529 "macro.y" /* yacc.c:1646  */
+#line 527 "macro.y" /* yacc.c:1646  */
     { HB_MACRO_IFENABLED( (yyval.asExpr), (yyvsp[0].asExpr), HB_SM_HARBOUR ); }
-#line 2392 "macroy.c" /* yacc.c:1646  */
+#line 2390 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 112:
-#line 530 "macro.y" /* yacc.c:1646  */
+#line 528 "macro.y" /* yacc.c:1646  */
     { HB_MACRO_IFENABLED( (yyval.asExpr), (yyvsp[0].asExpr), HB_SM_HARBOUR ); }
-#line 2398 "macroy.c" /* yacc.c:1646  */
+#line 2396 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 118:
-#line 538 "macro.y" /* yacc.c:1646  */
+#line 536 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); HB_MACRO_CHECK( (yyval.asExpr) ); }
-#line 2404 "macroy.c" /* yacc.c:1646  */
+#line 2402 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 119:
-#line 539 "macro.y" /* yacc.c:1646  */
+#line 537 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); HB_MACRO_CHECK( (yyval.asExpr) ); }
-#line 2410 "macroy.c" /* yacc.c:1646  */
+#line 2408 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 120:
-#line 542 "macro.y" /* yacc.c:1646  */
+#line 540 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewArgRef( HB_COMP_PARAM ); }
-#line 2416 "macroy.c" /* yacc.c:1646  */
+#line 2414 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 122:
-#line 546 "macro.y" /* yacc.c:1646  */
+#line 544 "macro.y" /* yacc.c:1646  */
     {
                                        if( !( HB_MACRO_DATA->Flags & HB_MACRO_GEN_LIST ) )
                                        {
@@ -2423,339 +2423,339 @@ yyreduce:
                                           YYABORT;
                                        }
                                     }
-#line 2429 "macroy.c" /* yacc.c:1646  */
+#line 2427 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 123:
-#line 554 "macro.y" /* yacc.c:1646  */
+#line 552 "macro.y" /* yacc.c:1646  */
     {
                                        HB_MACRO_DATA->uiListElements = 1;
                                        (yyval.asExpr) = hb_compExprAddListExpr( ( HB_MACRO_DATA->Flags & HB_MACRO_GEN_PARE ) ? hb_compExprNewList( (yyvsp[-3].asExpr), HB_COMP_PARAM ) : hb_compExprNewArgList( (yyvsp[-3].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr) );
                                     }
-#line 2438 "macroy.c" /* yacc.c:1646  */
+#line 2436 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 125:
-#line 561 "macro.y" /* yacc.c:1646  */
+#line 559 "macro.y" /* yacc.c:1646  */
     { HB_MACRO_DATA->uiListElements++;
                                                   (yyval.asExpr) = hb_compExprAddListExpr( (yyvsp[-2].asExpr), (yyvsp[0].asExpr) ); }
-#line 2445 "macroy.c" /* yacc.c:1646  */
+#line 2443 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 126:
-#line 565 "macro.y" /* yacc.c:1646  */
+#line 563 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewEmpty( HB_COMP_PARAM ); }
-#line 2451 "macroy.c" /* yacc.c:1646  */
+#line 2449 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 148:
-#line 589 "macro.y" /* yacc.c:1646  */
+#line 587 "macro.y" /* yacc.c:1646  */
     { HB_MACRO_IFENABLED( (yyval.asExpr), (yyvsp[0].asExpr), HB_SM_HARBOUR ); }
-#line 2457 "macroy.c" /* yacc.c:1646  */
+#line 2455 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 150:
-#line 596 "macro.y" /* yacc.c:1646  */
+#line 594 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewPostInc( (yyvsp[-1].asExpr), HB_COMP_PARAM ); }
-#line 2463 "macroy.c" /* yacc.c:1646  */
+#line 2461 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 151:
-#line 597 "macro.y" /* yacc.c:1646  */
+#line 595 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewPostDec( (yyvsp[-1].asExpr), HB_COMP_PARAM ); }
-#line 2469 "macroy.c" /* yacc.c:1646  */
+#line 2467 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 152:
-#line 603 "macro.y" /* yacc.c:1646  */
+#line 601 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2475 "macroy.c" /* yacc.c:1646  */
+#line 2473 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 153:
-#line 606 "macro.y" /* yacc.c:1646  */
+#line 604 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewPreInc( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2481 "macroy.c" /* yacc.c:1646  */
+#line 2479 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 154:
-#line 607 "macro.y" /* yacc.c:1646  */
+#line 605 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewPreDec( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2487 "macroy.c" /* yacc.c:1646  */
+#line 2485 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 155:
-#line 610 "macro.y" /* yacc.c:1646  */
+#line 608 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewNot( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2493 "macroy.c" /* yacc.c:1646  */
+#line 2491 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 156:
-#line 611 "macro.y" /* yacc.c:1646  */
+#line 609 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewNegate( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2499 "macroy.c" /* yacc.c:1646  */
+#line 2497 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 157:
-#line 612 "macro.y" /* yacc.c:1646  */
+#line 610 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr); }
-#line 2505 "macroy.c" /* yacc.c:1646  */
+#line 2503 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 158:
-#line 615 "macro.y" /* yacc.c:1646  */
+#line 613 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAssign( (yyvsp[-2].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2511 "macroy.c" /* yacc.c:1646  */
+#line 2509 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 159:
-#line 618 "macro.y" /* yacc.c:1646  */
+#line 616 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewPlusEq( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2517 "macroy.c" /* yacc.c:1646  */
+#line 2515 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 160:
-#line 621 "macro.y" /* yacc.c:1646  */
+#line 619 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewMinusEq( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2523 "macroy.c" /* yacc.c:1646  */
+#line 2521 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 161:
-#line 624 "macro.y" /* yacc.c:1646  */
+#line 622 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewMultEq( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2529 "macroy.c" /* yacc.c:1646  */
+#line 2527 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 162:
-#line 627 "macro.y" /* yacc.c:1646  */
+#line 625 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewDivEq( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2535 "macroy.c" /* yacc.c:1646  */
+#line 2533 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 163:
-#line 630 "macro.y" /* yacc.c:1646  */
+#line 628 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewModEq( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2541 "macroy.c" /* yacc.c:1646  */
+#line 2539 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 164:
-#line 633 "macro.y" /* yacc.c:1646  */
+#line 631 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewExpEq( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2547 "macroy.c" /* yacc.c:1646  */
+#line 2545 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 171:
-#line 644 "macro.y" /* yacc.c:1646  */
+#line 642 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewPlus( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2553 "macroy.c" /* yacc.c:1646  */
+#line 2551 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 172:
-#line 645 "macro.y" /* yacc.c:1646  */
+#line 643 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewMinus( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2559 "macroy.c" /* yacc.c:1646  */
+#line 2557 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 173:
-#line 646 "macro.y" /* yacc.c:1646  */
+#line 644 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewMult( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2565 "macroy.c" /* yacc.c:1646  */
+#line 2563 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 174:
-#line 647 "macro.y" /* yacc.c:1646  */
+#line 645 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewDiv( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2571 "macroy.c" /* yacc.c:1646  */
+#line 2569 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 175:
-#line 648 "macro.y" /* yacc.c:1646  */
+#line 646 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewMod( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2577 "macroy.c" /* yacc.c:1646  */
+#line 2575 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 176:
-#line 649 "macro.y" /* yacc.c:1646  */
+#line 647 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewPower( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2583 "macroy.c" /* yacc.c:1646  */
+#line 2581 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 177:
-#line 652 "macro.y" /* yacc.c:1646  */
+#line 650 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewAnd( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2589 "macroy.c" /* yacc.c:1646  */
+#line 2587 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 178:
-#line 653 "macro.y" /* yacc.c:1646  */
+#line 651 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewOr( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2595 "macroy.c" /* yacc.c:1646  */
+#line 2593 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 179:
-#line 656 "macro.y" /* yacc.c:1646  */
+#line 654 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewEQ( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2601 "macroy.c" /* yacc.c:1646  */
+#line 2599 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 180:
-#line 657 "macro.y" /* yacc.c:1646  */
+#line 655 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewLT( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2607 "macroy.c" /* yacc.c:1646  */
+#line 2605 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 181:
-#line 658 "macro.y" /* yacc.c:1646  */
+#line 656 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewGT( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2613 "macroy.c" /* yacc.c:1646  */
+#line 2611 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 182:
-#line 659 "macro.y" /* yacc.c:1646  */
+#line 657 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewLE( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2619 "macroy.c" /* yacc.c:1646  */
+#line 2617 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 183:
-#line 660 "macro.y" /* yacc.c:1646  */
+#line 658 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewGE( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2625 "macroy.c" /* yacc.c:1646  */
+#line 2623 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 184:
-#line 661 "macro.y" /* yacc.c:1646  */
+#line 659 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewNE( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2631 "macroy.c" /* yacc.c:1646  */
+#line 2629 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 185:
-#line 662 "macro.y" /* yacc.c:1646  */
+#line 660 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewNE( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2637 "macroy.c" /* yacc.c:1646  */
+#line 2635 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 186:
-#line 663 "macro.y" /* yacc.c:1646  */
+#line 661 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewIN( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2643 "macroy.c" /* yacc.c:1646  */
+#line 2641 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 187:
-#line 664 "macro.y" /* yacc.c:1646  */
+#line 662 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprSetOperand( hb_compExprNewEqual( (yyvsp[-2].asExpr), HB_COMP_PARAM ), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2649 "macroy.c" /* yacc.c:1646  */
+#line 2647 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 189:
-#line 673 "macro.y" /* yacc.c:1646  */
+#line 671 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_macroExprNewArrayAt( (yyvsp[-2].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2655 "macroy.c" /* yacc.c:1646  */
+#line 2653 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 190:
-#line 674 "macro.y" /* yacc.c:1646  */
+#line 672 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_macroExprNewArrayAt( (yyvsp[-2].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2661 "macroy.c" /* yacc.c:1646  */
+#line 2659 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 191:
-#line 675 "macro.y" /* yacc.c:1646  */
+#line 673 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_macroExprNewArrayAt( (yyvsp[-3].asExpr), (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2667 "macroy.c" /* yacc.c:1646  */
+#line 2665 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 192:
-#line 678 "macro.y" /* yacc.c:1646  */
+#line 676 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewList( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2673 "macroy.c" /* yacc.c:1646  */
+#line 2671 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 193:
-#line 679 "macro.y" /* yacc.c:1646  */
+#line 677 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddListExpr( (yyvsp[-2].asExpr), (yyvsp[0].asExpr) ); }
-#line 2679 "macroy.c" /* yacc.c:1646  */
+#line 2677 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 194:
-#line 683 "macro.y" /* yacc.c:1646  */
+#line 681 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewCodeBlock( NULL, 0, 0, HB_COMP_PARAM ); }
-#line 2685 "macroy.c" /* yacc.c:1646  */
+#line 2683 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 195:
-#line 685 "macro.y" /* yacc.c:1646  */
+#line 683 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[-4].asExpr); }
-#line 2691 "macroy.c" /* yacc.c:1646  */
+#line 2689 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 196:
-#line 690 "macro.y" /* yacc.c:1646  */
+#line 688 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddCodeblockExpr( (yyvsp[(-2) - (1)].asExpr), (yyvsp[0].asExpr) ); }
-#line 2697 "macroy.c" /* yacc.c:1646  */
+#line 2695 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 197:
-#line 691 "macro.y" /* yacc.c:1646  */
+#line 689 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddCodeblockExpr( (yyvsp[(-2) - (3)].asExpr), (yyvsp[0].asExpr) ); }
-#line 2703 "macroy.c" /* yacc.c:1646  */
+#line 2701 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 198:
-#line 696 "macro.y" /* yacc.c:1646  */
+#line 694 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = NULL; }
-#line 2709 "macroy.c" /* yacc.c:1646  */
+#line 2707 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 199:
-#line 697 "macro.y" /* yacc.c:1646  */
+#line 695 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = NULL; (yyvsp[-1].asExpr)->value.asCodeblock.flags |= HB_BLOCK_VPARAMS; }
-#line 2715 "macroy.c" /* yacc.c:1646  */
+#line 2713 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 200:
-#line 698 "macro.y" /* yacc.c:1646  */
+#line 696 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[0].asExpr);   }
-#line 2721 "macroy.c" /* yacc.c:1646  */
+#line 2719 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 201:
-#line 699 "macro.y" /* yacc.c:1646  */
+#line 697 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = (yyvsp[-2].asExpr);   (yyvsp[-3].asExpr)->value.asCodeblock.flags |= HB_BLOCK_VPARAMS; }
-#line 2727 "macroy.c" /* yacc.c:1646  */
+#line 2725 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 202:
-#line 702 "macro.y" /* yacc.c:1646  */
+#line 700 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprCBVarAdd( (yyvsp[-1].asExpr), (yyvsp[0].string), ' ', HB_COMP_PARAM ); }
-#line 2733 "macroy.c" /* yacc.c:1646  */
+#line 2731 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 203:
-#line 703 "macro.y" /* yacc.c:1646  */
+#line 701 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprCBVarAdd( (yyvsp[-3].asExpr), (yyvsp[0].string), ' ', HB_COMP_PARAM ); HB_MACRO_CHECK( (yyval.asExpr) ); }
-#line 2739 "macroy.c" /* yacc.c:1646  */
+#line 2737 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 204:
-#line 706 "macro.y" /* yacc.c:1646  */
+#line 704 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewList( (yyvsp[0].asExpr), HB_COMP_PARAM ); }
-#line 2745 "macroy.c" /* yacc.c:1646  */
+#line 2743 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 205:
-#line 707 "macro.y" /* yacc.c:1646  */
+#line 705 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprAddListExpr( (yyvsp[-2].asExpr), (yyvsp[0].asExpr) ); }
-#line 2751 "macroy.c" /* yacc.c:1646  */
+#line 2749 "macroy.c" /* yacc.c:1646  */
     break;
 
   case 208:
-#line 718 "macro.y" /* yacc.c:1646  */
+#line 716 "macro.y" /* yacc.c:1646  */
     { (yyval.asExpr) = hb_compExprNewIIF( hb_compExprAddListExpr( hb_compExprAddListExpr( hb_compExprNewList( (yyvsp[-5].asExpr), HB_COMP_PARAM ), (yyvsp[-3].asExpr) ), (yyvsp[-1].asExpr) ) ); }
-#line 2757 "macroy.c" /* yacc.c:1646  */
+#line 2755 "macroy.c" /* yacc.c:1646  */
     break;
 
 
-#line 2761 "macroy.c" /* yacc.c:1646  */
+#line 2759 "macroy.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -2983,7 +2983,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 721 "macro.y" /* yacc.c:1906  */
+#line 719 "macro.y" /* yacc.c:1906  */
 
 
 
diff --git a/src/macro/macro.yyh b/src/macro/macro.yyh
index e2bf5b1d0d..2568e15eb0 100644
--- a/src/macro/macro.yyh
+++ b/src/macro/macro.yyh
@@ -91,7 +91,7 @@ extern int hb_macro_yydebug;
 typedef union YYSTYPE YYSTYPE;
 union YYSTYPE
 {
-#line 142 "macro.y" /* yacc.c:1909  */
+#line 140 "macro.y" /* yacc.c:1909  */
 
    const char * string; /* to hold a string returned by lex */
    int       iNumber;   /* to hold a temporary integer number */