From e45efc7a41218f24729865ff2527390932730208 Mon Sep 17 00:00:00 2001
From: Ron Pinkas <ron@profit-master.com>
Date: Thu, 21 Jun 2001 16:48:10 +0000
Subject: [PATCH] 2001-06-21 09:50 UTC-0800 Ron Pinkas <ron@profit-master.com> 
   * contrib/dot/pp.prg      + Added explicit support for Extended expression
 match marker, in NextExp()

---
 harbour/ChangeLog          |  6 +++++-
 harbour/contrib/dot/pp.prg | 28 +++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fe7e9eb3f4..ec75b0e7b9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-21 09:50 UTC-0800 Ron Pinkas <ron@profit-master.com>
+   * contrib/dot/pp.prg
+     + Added explicit support for Extended expression match marker, in NextExp()
+
 2001-06-21 13:20 GMT+3 Alexander Kresin <alex@belacy.belgorod.su>
    * source/debug/debugger.prg
      * partially fixed cursor appearance on debug screen
@@ -11,7 +15,7 @@
      * __dbgEntry() now invokes isAltdPressed() and calls debug screen, if
        isAltdPressed() returns TRUE
      * commented few lines in __dbgEntry() - debugged program works now much
-       faster and better     
+       faster and better
 
 2001-06-20 22:10 UTC-0800 Ron Pinkas <ron@profit-master.com>
    * hb_slex.vc
diff --git a/harbour/contrib/dot/pp.prg b/harbour/contrib/dot/pp.prg
index 0393a45de7..71fbfc561d 100644
--- a/harbour/contrib/dot/pp.prg
+++ b/harbour/contrib/dot/pp.prg
@@ -4079,13 +4079,6 @@ STATIC FUNCTION NextExp( sLine, cType, aWords, aExp, sNextAnchor, bX )
      CASE cType == ','
         sList := ""
 
-     CASE cType == '*'
-        sExp  := sLine
-
-        sLine := ""
-        //? "EXP (*): " + sExp
-        RETURN sExp
-
      CASE cType == ':'
         sWorkLine       := sLine
         sPrimaryStopper := NextToken( @sWorkLine )
@@ -4152,6 +4145,27 @@ STATIC FUNCTION NextExp( sLine, cType, aWords, aExp, sNextAnchor, bX )
            ENDIF
         ENDIF
 
+     CASE cType == '*'
+        sExp  := sLine
+        sLine := ""
+        //? "EXP <*>: " + sExp
+        RETURN sExp
+
+     CASE cType == '('
+        nSpaceAt := At( ' ', sLine )
+
+        IF nSpaceAt = 0
+           sExp  := sLine
+           sLine := ""
+        ELSE
+           sExp  := Left( sLine, nSpaceAt - 1 )
+           sLine := SubStr( sLine, nSpaceAt )
+           sExp  += ExtractLeadingWS( @sLine )
+        ENDIF
+
+        //? "EXP <(>: " + sExp
+        RETURN sExp
+
      CASE cType == NIL
         RETURN "-"
   ENDCASE