2001-02-23 08:25 UTC-0800 Ron Pinkas <ron@profit-master.com>

* contrib/dot/pp.prg
     + Added support for DO <>.prg

   * contrib/dot/rp_dot.ch
      + Added #command DO <>.prg (no support for WITH yet)

harbour/ChangeLog

@@ -1,3 +1,10 @@
+2001-02-23 08:25 UTC-0800 Ron Pinkas <ron@profit-master.com>
+   * contrib/dot/pp.prg
+     + Added support for DO <>.prg
+
+   * contrib/dot/rp_dot.ch
+      + Added #command DO <>.prg (no support for WITH yet)
+
 2001-02-22 22:25 UTC-0800 Ron Pinkas <ron@profit-master.com>
    * contrib/dot/pp.prg
      + Started support for interpreting prg files.

harbour/contrib/dot/pp.prg

@@ -378,6 +378,14 @@ RETURN
 
 //--------------------------------------------------------------//
 
+PROCEDURE PP_SetRun( bOn )
+
+   bRun := bOn
+
+RETURN
+
+//--------------------------------------------------------------//
+
 PROCEDURE RP_Dot_Err()
 
    Alert( "Sorry, could not execute last request." )
@@ -2255,20 +2263,29 @@ FUNCTION NextToken( sLine, bCheckRules )
            sReturn := Left( sLine, Counter - 1 )
            EXIT
 
-        ELSEIF cChar == '.' .AND. Upper( SubStr( sLine, Counter + 1, 4 ) ) == 'AND.'
+        ELSEIF cChar == '.'
 
-           sReturn := Left( sLine, Counter - 1 )
-           EXIT
+           IF Upper( SubStr( sLine, Counter + 1, 4 ) ) == 'AND.'
 
-        ELSEIF cChar == '.' .AND. Upper( SubStr( sLine, Counter + 1, 3 ) ) == 'OR.'
+              sReturn := Left( sLine, Counter - 1 )
+              EXIT
 
-           sReturn := Left( sLine, Counter - 1 )
-           EXIT
+           ELSEIF Upper( SubStr( sLine, Counter + 1, 3 ) ) == 'OR.'
 
-        ELSEIF cChar == '.' .AND. Upper( SubStr( sLine, Counter + 1, 4 ) ) == 'NOT.'
+              sReturn := Left( sLine, Counter - 1 )
+              EXIT
 
-           sReturn := Left( sLine, Counter - 1 )
-           EXIT
+           ELSEIF Upper( SubStr( sLine, Counter + 1, 4 ) ) == 'NOT.'
+
+              sReturn := Left( sLine, Counter - 1 )
+              EXIT
+
+           ELSEIF IsAlpha( Left( sLine, 1 ) ) .AND. ! ( '&' $ Left( sLine, Counter ) )
+
+              sReturn := Left( sLine, Counter - 1 )
+              EXIT
+
+           ENDIF
 
         ELSEIF cChar == ' '// .OR. cChar == Chr(9) // Tabs converted to spaces
 

harbour/contrib/dot/rp_dot.ch

@@ -22,3 +22,5 @@
 #COMMAND CASE <caseExp> => __SetCase( <caseExp> )
 #COMMAND OTHERWISE => __SetOtherwise()
 #COMMAND ENDCASE [<*x*>] => __SetEndCase()
+
+#COMMAND DO <file>.prg => PP_SetRun(.T.); ProcessFile( #<file> + ".prg" ); PP_SetRun( .F. )