2017-09-08 16:00 UTC Viktor Szakats (vszakats users.noreply.github.com)

* *
    * partial sync with the 3.4 fork codebase. These are the things
      synces for the most part:
      - copyright headers
      - grammar/typos in comments and some readmes
      - comment/whitespace/decorations
      - variable scoping in C files
      - DO CASE/SWITCH and some other alternate syntax usage
      - minimal amount of human readable text in strings
      - minor code updates
      - HB_TRACE() void * casts for pointers and few other changes to
        avoid C compiler warnings
      - various other, minor code cleanups
      - only Harbour/C code/headers were touched in src, utils, contrib,
        include. No 3rd party code, no make files, and with just a few
        exceptions, no 'tests' code was touched.
      - certain components were not touched were 3.4 diverged too much
        already, like f.e. hbmk2, hbssl, hbcurl, hbexpat
      - the goal was that no actual program logic should be altered by
        these changes. Except some possible minor exceptions, any such
        change is probably a bug in this patch.
      It's a massive patch, if you find anything broken after it, please
      open an Issue with the details. Build test was done on macOS.
      The goal is make it easier to see what actual code/logic was changed
      in 3.4 compared to 3.2 and to make patches easier to apply in both
      ways.

src/macro/macro.y

@@ -165,7 +165,7 @@
    } valDouble;
    struct
    {
-      long     date;    /* to hold julian date */
+      long     date;    /* to hold Julian date */
       long     time;    /* to hold milliseconds */
    } valTimeStamp;
 }
@@ -188,9 +188,9 @@ extern void yyerror( PHB_MACRO, const char * );    /* parsing error management f
 %token EPSILON
 
 /*the lowest precedence*/
-/*postincrement and postdecrement*/
+/*post-increment and post-decrement*/
 %left   POST
-/*assigment - from right to left*/
+/*assignment - from right to left*/
 %right  INASSIGN
 %right  PLUSEQ MINUSEQ
 %right  MULTEQ DIVEQ MODEQ
@@ -207,7 +207,7 @@ extern void yyerror( PHB_MACRO, const char * );    /* parsing error management f
 %right  '*' '/' '%'
 %right  POWER
 %right  UNARY
-/*preincrement and predecrement*/
+/*pre-increment and pre-decrement*/
 %right  PRE
 /*special operators*/
 %right  ALIASOP '&' '@'
@@ -780,7 +780,7 @@ static PHB_EXPR hb_macroExprNew( HB_COMP_DECL, HB_EXPRTYPE iType )
 {
    PHB_EXPR pExpr;
 
-   HB_TRACE( HB_TR_DEBUG, ( "hb_macroExprNew(%p,%i)", HB_COMP_PARAM, iType ) );
+   HB_TRACE( HB_TR_DEBUG, ( "hb_macroExprNew(%p,%i)", ( void * ) HB_COMP_PARAM, iType ) );
 
    pExpr = hb_macroExprAlloc( HB_COMP_PARAM );
    pExpr->ExprType = iType;

src/macro/macro.yyc

@@ -3048,7 +3048,7 @@ static PHB_EXPR hb_macroExprNew( HB_COMP_DECL, HB_EXPRTYPE iType )
 {
    PHB_EXPR pExpr;
 
-   HB_TRACE( HB_TR_DEBUG, ( "hb_macroExprNew(%p,%i)", HB_COMP_PARAM, iType ) );
+   HB_TRACE( HB_TR_DEBUG, ( "hb_macroExprNew(%p,%i)", ( void * ) HB_COMP_PARAM, iType ) );
 
    pExpr = hb_macroExprAlloc( HB_COMP_PARAM );
    pExpr->ExprType = iType;

src/macro/macroa.c

@@ -1,5 +1,5 @@
 /* hbexpra.c is also included from ../compiler/expropta.c
- * However it produces a slighty different code if used in
+ * However it produces a slightly different code if used in
  * macro compiler (there is an additional parameter passed to some functions)
  */
 

src/macro/macrob.c

@@ -1,5 +1,5 @@
 /* hbexprb.c is also included from ../compiler/exproptb.c
- * However it produces a slighty different code if used in
+ * However it produces a slightly different code if used in
  * macro compiler (there is an additional parameter passed to some functions)
  */
 

src/macro/macrolex.c

@@ -1,5 +1,5 @@
 /*
- * small and MT safe lexer for macro compiler
+ * Small and MT safe lexer for macro compiler
  *
  * Copyright 2006 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
  *