From 33ce57e6f7ef1c8c984611aa8f3a189ec7ec6e53 Mon Sep 17 00:00:00 2001 From: Ron Pinkas Date: Fri, 3 Nov 2000 04:41:44 +0000 Subject: [PATCH] 2000-11-02 20:35 UTC+0800 Ron Pinkas * contrib/dot/pp.prg ! Corrected minor bug with [] string delimiters. * contrib/dot/rp_dot.ch + Added rule for EXIT --- harbour/ChangeLog | 7 +++++++ harbour/contrib/dot/pp.prg | 6 +++--- harbour/contrib/dot/rp_dot.ch | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bf8fd7007c..ed7d890933 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,10 @@ +2000-11-02 20:35 UTC+0800 Ron Pinkas + * contrib/dot/pp.prg + ! Corrected minor bug with [] string delimiters. + + * contrib/dot/rp_dot.ch + + Added rule for EXIT + 2000-11-02 15:45 UTC+0800 Ron Pinkas * source/rtl/tget.prg * include/hbextern.ch diff --git a/harbour/contrib/dot/pp.prg b/harbour/contrib/dot/pp.prg index 593697bc43..1bbd74a145 100644 --- a/harbour/contrib/dot/pp.prg +++ b/harbour/contrib/dot/pp.prg @@ -1844,9 +1844,9 @@ FUNCTION NextToken( sLine, bCheckRules ) ELSEIF Left( sLine, 1 ) == '[' - IF s_cLastChar >= 'a' .OR. s_cLastChar <= 'z' .OR. ; - s_cLastChar >= 'A' .OR. s_cLastChar <= 'Z' .OR. ; - s_cLastChar >= '0' .OR. s_cLastChar <= '9' .OR. ; + IF ( s_cLastChar >= 'a' .AND. s_cLastChar <= 'z' ) .OR. ; + ( s_cLastChar >= 'A' .AND. s_cLastChar <= 'Z' ) .OR. ; + ( s_cLastChar >= '0' .AND. s_cLastChar <= '9' ) .OR. ; s_cLastChar == '_' .OR. s_cLastChar $ ")}]" sReturn := '[' diff --git a/harbour/contrib/dot/rp_dot.ch b/harbour/contrib/dot/rp_dot.ch index 71b792abe7..cc8502f3f7 100644 --- a/harbour/contrib/dot/rp_dot.ch +++ b/harbour/contrib/dot/rp_dot.ch @@ -1 +1,2 @@ #COMMAND BROWSE => Browse( 1, 0, 23, 79 ) +#COMMAND EXIT => __QUIT()