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

11
include/hbregex.h
View File

@@ -1,5 +1,5 @@
/*
*
* Regex header
*
* Copyright 2007 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
*
@@ -83,16 +83,19 @@ typedef HB_REGEX * PHB_REGEX;
#define HB_REGMATCH_SIZE( n ) ( ( n ) * 3 )
#define HB_REGMATCH_SO( p, n ) ( p )[ ( n ) * 2 ]
#define HB_REGMATCH_EO( p, n ) ( p )[ ( n ) * 2 + 1 ]
#define HB_REGMATCH_UNSET ( -1 )
#elif defined( HB_POSIX_REGEX )
#define HB_REGMATCH regmatch_t
#define HB_REGMATCH_SIZE( n ) ( n )
#define HB_REGMATCH_SO( p, n ) ( p )[ n ].rm_so
#define HB_REGMATCH_EO( p, n ) ( p )[ n ].rm_eo
#define HB_REGMATCH_UNSET ( -1 )
#else
#define HB_REGMATCH int
#define HB_REGMATCH_SIZE( n ) ( ( n ) * 2 )
#define HB_REGMATCH_SO( p, n ) ( p )[ ( n ) * 2 ]
#define HB_REGMATCH_EO( p, n ) ( p )[ ( n ) * 2 + 1 ]
#define HB_REGMATCH_UNSET ( -1 )
#endif
typedef void ( * HB_REG_FREE )( PHB_REGEX );
@@ -103,10 +106,10 @@ extern void hb_regexInit( HB_REG_FREE pFree, HB_REG_COMP pComp, HB_REG_EXEC pExe
extern HB_BOOL hb_regexIs( PHB_ITEM pItem );
#ifndef REG_EXTENDED
# define REG_EXTENDED 0x00
#define REG_EXTENDED 0x00
#endif
#ifndef REG_NOSUB
# define REG_NOSUB 0x00
#define REG_NOSUB 0x00
#endif
#else
@@ -124,7 +127,7 @@ typedef void * PHB_REGEX;
#define HBREG_DOTALL 0x40
#ifndef REGEX_MAX_GROUPS
# define REGEX_MAX_GROUPS 16
#define REGEX_MAX_GROUPS 16
#endif
HB_EXTERN_BEGIN