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

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

Browse Source 
* *
    * 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.
This commit is contained in:
Viktor Szakats
2017-09-08 16:25:13 +00:00
parent d55bdd18b7
commit 5a2a287752
916 changed files with 10432 additions and 13266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/pp/pplib.c
View File

@@ -44,9 +44,8 @@
*
*/
#include "hbpp.h"
#include "hbapi.h"
#include "hbpp.h"
#include "hbapiitm.h"
#include "hbapifs.h"
#include "hbapierr.h"
@@ -58,7 +57,7 @@ static void hb_pp_ErrorMessage( void * cargo, const char * const szMsgTable[],
char cPrefix, int iCode,
const char * szParam1, const char * szParam2 )
{
HB_TRACE( HB_TR_DEBUG, ( "hb_pp_ErrorGen(%p, %p, %c, %d, %s, %s)", cargo, szMsgTable, cPrefix, iCode, szParam1, szParam2 ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_pp_ErrorGen(%p, %p, %c, %d, %s, %s)", cargo, ( const void * ) szMsgTable, cPrefix, iCode, szParam1, szParam2 ) );
HB_SYMBOL_UNUSED( cargo );
@@ -148,18 +147,19 @@ PHB_PP_STATE hb_pp_Param( int iParam )
/*
* initialize new PP context and return pointer to it.
* __pp_Init( [<cIncludePath>], [<cStdChFile> ] [, <lArchDefs>] ) -> <pPP>
* __pp_Init( [<cIncludePath>], [<cStdChFile> ] [, <lArchDefs>] ) --> <pPP>
* when <cStdChFile> is empty string ("") then no default rules are used
* only the dynamically created #defines like __HARBOUR__, __DATE__, __TIME__
*/
HB_FUNC( __PP_INIT )
{
PHB_PP_STATE * pStatePtr, pState = hb_pp_new();
PHB_PP_STATE pState = hb_pp_new();
if( pState )
{
PHB_PP_STATE * pStatePtr;
const char * szPath = hb_parc( 1 ), * szStdCh = hb_parc( 2 );
HB_BOOL fArchDefs = hb_parldef( 3, 1 );
HB_BOOL fArchDefs = hb_parldef( 3, HB_TRUE );
PHB_ITEM ppItem;
pStatePtr = ( PHB_PP_STATE * ) hb_gcAllocate( sizeof( PHB_PP_STATE ),
@@ -190,7 +190,7 @@ HB_FUNC( __PP_INIT )
/*
* add new (or replace previous) include paths.
* __pp_Path( <pPP>, <cPath> [, <lClearPrev>] ) -> NIL
* __pp_Path( <pPP>, <cPath> [, <lClearPrev>] ) --> NIL
*/
HB_FUNC( __PP_PATH )
{
@@ -202,7 +202,7 @@ HB_FUNC( __PP_PATH )
/*
* reset the PP context (remove all rules added by user or preprocessed code)
* __pp_Reset( <pPP> ) -> NIL
* __pp_Reset( <pPP> ) --> NIL
*/
HB_FUNC( __PP_RESET )
{
@@ -214,7 +214,7 @@ HB_FUNC( __PP_RESET )
/*
* preprocess and execute new preprocessor directive
* __pp_AddRule( <pPP>, <cDirective> ) -> <lOK>
* __pp_AddRule( <pPP>, <cDirective> ) --> <lOK>
*/
HB_FUNC( __PP_ADDRULE )
{
@@ -239,7 +239,7 @@ HB_FUNC( __PP_ADDRULE )
hb_pp_parseLine( pState, szText, &nLen );
/* probably for parsing #included files the old code was making
sth like that */
something like that */
do
{
if( hb_vmRequestQuery() != 0 )
@@ -256,7 +256,7 @@ HB_FUNC( __PP_ADDRULE )
/*
* preprocess given code and return result
* __pp_Process( <pPP>, <cCode> ) -> <cPreprocessedCode>
* __pp_Process( <pPP>, <cCode> ) --> <cPreprocessedCode>
*/
HB_FUNC( __PP_PROCESS )
{