Updating preprocessor files

harbour/ChangeLog

@@ -1,3 +1,12 @@
+19991002-18:10 GMT+3 Alexander Kresin
+  * source/hbpp/hbpp.c
+    * Fixed some bugs, reported by Victor Szel, Ryszard Glab, Jose Lalin and 
+    * Robert Arseniuk
+  * tests/working/db_browse.ch renamed to db_brows.ch
+  * tests/working/db_browse.prg renamed to db_brows.prg
+    * added $Id
+    * these two files added to makefile
+
 19991002-03:20 EDT Paul Tucker <ptucker@sympatico.ca>
   * buildvc.bat
     makefile.vc

harbour/source/hbpp/hbpp.c

@@ -446,6 +446,7 @@ void ConvertPatterns ( char *mpatt, int mlen, char *rpatt, int rlen )
      if ( *(mpatt+i) == '<' )
      {  /* Drag match marker, determine it type */
        explen = 0; ipos = i; i++; exptype = '0';
+       while( *(mpatt+i) == ' ' || *(mpatt+i) == '\t' ) i++;
        if ( *(mpatt+i) == '*' )        /* Wild match marker */
          { exptype = '3'; i++; }
        else if ( *(mpatt+i) == '(' )   /* Extended expression match marker */
@@ -653,8 +654,6 @@ int ParseExpression( char* sLine, char* sOutLine )
 
                if ( ( *ptri == '\0' || ( *ptri != '=' &&
                   (!IsInStr(*ptri,":/*+-") || *(ptri+1) != '=') &&
-                  ( *ptri != '+' || *(ptri+1) != '+' ) &&
-                  ( *ptri != '-' || *(ptri+1) != '-' ) &&
                   ( *ptri != '-' || *(ptri+1) != '>' ) ) )
                   && ( stcmd = ComSearch(sToken,NULL) ) != NULL )
                {
@@ -1719,13 +1718,13 @@ int md_strAt(char *szSub, int lSubLen, char *szText, int checkword, int checkPrt
    {
      if( State == STATE_QUOTE1 )
      {
-       if ( *(szText+lPos) == '\'' && ( lPos == 0 || *(szText+lPos-1) != '\\' ) )
+       if ( *(szText+lPos) == '\'' )
           State = STATE_NORMAL;
        lPos++;
      }
      else if( State == STATE_QUOTE2 )
      {
-       if ( *(szText+lPos) == '\"' && ( lPos == 0 || *(szText+lPos-1) != '\\' ) )
+       if ( *(szText+lPos) == '\"' )
           State = STATE_NORMAL;
        lPos++;
      }

harbour/tests/working/Makefile

@@ -51,6 +51,7 @@ PRG_SOURCES=\
         dates2.prg \
         dates3.prg \
         dates4.prg \
+        db_brows.prg \
         debugtst.prg \
         dirtest.prg \
         docase.prg \
@@ -149,6 +150,7 @@ PRG_SOURCES=\
         while.prg \
 
 PRG_HEADERS=\
+        db_brows.ch
         cgi.ch \
         keywords.ch \
         test.ch \

harbour/tests/working/db_brows.ch

@@ -1,3 +1,7 @@
+/*
+ * $Id: db_brows.ch
+ */
+// Header file for db_brows.prg
 #define KLRECF    200
 #define LI_LEN    24
 #define LI_NSTR   mslist[1]

harbour/tests/working/db_brows.prg

@@ -1,3 +1,6 @@
+//
+// $Id: db_brows.prg
+//
 *+²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²
 *+ Browse function
 *+
@@ -38,7 +41,7 @@
 *+²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²²
 
 #include "fileio.ch"
-#include "db_browse.ch"
+#include "db_brows.ch"
 
 *+±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±
 *+