From 6685b34dcb1dcb6c41b4d81426b6d7935697f8a4 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Tue, 15 Feb 2011 12:39:12 +0000
Subject: [PATCH] 2011-02-15 13:39 UTC+0100 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/src/compiler/gencc.c     * added
 workaround for C compilers which cannot compile very long       strings. This
 hack is not enabled by default and can be enabled       by
 __HB_CSTRING_SIZE_MAX[=<maxsize>] macro (by default <maxsize>       is 4KB).

---
 harbour/ChangeLog            |  7 +++++
 harbour/src/compiler/gencc.c | 61 +++++++++++++++++++++++++++---------
 2 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c17be67e94..8ced2e6acd 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-15 13:39 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/compiler/gencc.c
+    * added workaround for C compilers which cannot compile very long
+      strings. This hack is not enabled by default and can be enabled
+      by __HB_CSTRING_SIZE_MAX[=<maxsize>] macro (by default <maxsize>
+      is 4KB).
+
 2011-02-15 09:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/hbmk2_qt.hbs
     * Whitespace.
diff --git a/harbour/src/compiler/gencc.c b/harbour/src/compiler/gencc.c
index b2c368f40e..6f68304421 100644
--- a/harbour/src/compiler/gencc.c
+++ b/harbour/src/compiler/gencc.c
@@ -102,6 +102,45 @@ void hb_compGenCString( FILE * yyc, const HB_BYTE * pText, HB_SIZE nLen )
    fputc( '"', yyc );
 }
 
+static void hb_compGenCStrData( FILE * yyc, const HB_BYTE * pText, HB_SIZE nLen,
+                                int iMethod )
+{
+#ifdef __HB_CSTRING_SIZE_MAX
+   #if __HB_CSTRING_SIZE_MAX -0 < 1
+      #undef __HB_CSTRING_SIZE_MAX
+      #define __HB_CSTRING_SIZE_MAX   4096
+   #endif
+   if( nLen > __HB_CSTRING_SIZE_MAX )
+   {
+      HB_SIZE nPos;
+
+      fprintf( yyc, "\t{\tconst unsigned char str[ %" HB_PFS "u ] = {", nLen + 1 );
+      for( nPos = 0; nPos < nLen; nPos++ )
+      {
+         if( ( nPos & 0x0F ) == 0 )
+            fprintf( yyc, "\n\t\t" );
+         fprintf( yyc, "%d,", ( int ) pText[ nPos ] );
+      }
+      fprintf( yyc, "0 };\n\t\thb_xvmPushString" );
+      if( iMethod < 0 )
+         fprintf( yyc, "Const( " );
+      else
+         fprintf( yyc, "Hidden( %d, ", iMethod );
+      fprintf( yyc, "( const char * ) str,  %" HB_PFS "u );\n\t}\n", nLen );
+   }
+   else
+#endif
+   {
+      fprintf( yyc, "\thb_xvmPushString" );
+      if( iMethod < 0 )
+         fprintf( yyc, "Const( " );
+      else
+         fprintf( yyc, "Hidden( %d, ", iMethod );
+      hb_compGenCString( yyc, pText, nLen );
+      fprintf( yyc, ", %" HB_PFS "u );\n", nLen );
+   }
+}
+
 static void hb_gencc_copyLocals( FILE * yyc, int iLocal1, int iLocal2 )
 {
    if( iLocal1 != iLocal2 )
@@ -1359,15 +1398,13 @@ static HB_GENC_FUNC( hb_p_pushstrshort )
 
 static HB_GENC_FUNC( hb_p_pushstr )
 {
-   HB_USHORT usLen = HB_PCODE_MKUSHORT( &pFunc->pCode[ nPCodePos + 1 ] ) - 1;
+   HB_SIZE nLen = HB_PCODE_MKUSHORT( &pFunc->pCode[ nPCodePos + 1 ] ) - 1;
 
    HB_GENC_LABEL();
 
-   fprintf( cargo->yyc, "\thb_xvmPushStringConst( " );
-   hb_compGenCString( cargo->yyc, &pFunc->pCode[ nPCodePos + 3 ], usLen );
-   fprintf( cargo->yyc, ", %hu );\n", usLen );
+   hb_compGenCStrData( cargo->yyc, &pFunc->pCode[ nPCodePos + 3 ], nLen, -1 );
 
-   return 4 + usLen;
+   return 4 + nLen;
 }
 
 static HB_GENC_FUNC( hb_p_pushstrlarge )
@@ -1376,25 +1413,21 @@ static HB_GENC_FUNC( hb_p_pushstrlarge )
 
    HB_GENC_LABEL();
 
-   fprintf( cargo->yyc, "\thb_xvmPushStringConst( " );
-   hb_compGenCString( cargo->yyc, &pFunc->pCode[ nPCodePos + 4 ], nLen );
-   fprintf( cargo->yyc, ", %" HB_PFS "u );\n", nLen );
+   hb_compGenCStrData( cargo->yyc, &pFunc->pCode[ nPCodePos + 3 ], nLen, -1 );
 
    return 5 + nLen;
 }
 
 static HB_GENC_FUNC( hb_p_pushstrhidden )
 {
-   HB_USHORT usLen = HB_PCODE_MKUSHORT( &pFunc->pCode[ nPCodePos + 2 ] );
+   HB_SIZE nLen = HB_PCODE_MKUSHORT( &pFunc->pCode[ nPCodePos + 2 ] );
 
    HB_GENC_LABEL();
 
-   fprintf( cargo->yyc, "\thb_xvmPushStringHidden( %d, ",
-            pFunc->pCode[ nPCodePos + 1 ] );
-   hb_compGenCString( cargo->yyc, &pFunc->pCode[ nPCodePos + 4 ], usLen );
-   fprintf( cargo->yyc, ", %hu );\n", usLen );
+   hb_compGenCStrData( cargo->yyc, &pFunc->pCode[ nPCodePos + 3 ], nLen,
+                       pFunc->pCode[ nPCodePos + 1 ] );
 
-   return 4 + usLen;
+   return 4 + nLen;
 }
 
 static HB_GENC_FUNC( hb_p_pushsym )