Mercurial > hg > octave-lyh

changeset 4170:8b1da831dfeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2002-11-12 17:06:19 by jwe]
author jwe
date Tue, 12 Nov 2002 17:06:20 +0000
parents d5667eaf8859
children 04694e5b4239
files src/ChangeLog src/input.cc
diffstat 2 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-12  Joseph P. Skudlarek  <jskud@jskud.com>
+
+	* input.cc (match_sans_spaces_semi): Rename from match_sans_spaces.
+	Ignore trailing semicolons too.  Change all callers.
+
 2002-11-11  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* octave.gperf: Allow "persistent" as a synonym for static.
--- a/src/input.cc
+++ b/src/input.cc
@@ -500,13 +500,13 @@
 }
 
 static bool
-match_sans_spaces (const std::string& standard, const std::string& test)
+match_sans_spaces_semi (const std::string& standard, const std::string& test)
 {
   size_t beg = test.find_first_not_of (" \t");
 
   if (beg != NPOS)
     {
-      size_t end = test.find_last_not_of (" \t");
+      size_t end = test.find_last_not_of ("; \t");
 
       size_t len = end == NPOS ? NPOS : end - beg + 1;
 
@@ -571,14 +571,14 @@
 
       if (debug)
 	{
-	  if (match_sans_spaces ("exit", input_buf)
-	      || match_sans_spaces ("quit", input_buf)
-	      || match_sans_spaces ("return", input_buf)
-	      || match_sans_spaces ("dbg_cont", input_buf))
+	  if (match_sans_spaces_semi ("exit", input_buf)
+	      || match_sans_spaces_semi ("quit", input_buf)
+	      || match_sans_spaces_semi ("return", input_buf)
+	      || match_sans_spaces_semi ("dbg_cont", input_buf))
 	    {
 	      return retval;
 	    }
-	  else if (match_sans_spaces ("dbg_step", input_buf))
+	  else if (match_sans_spaces_semi ("dbg_step", input_buf))
 	    {
 	      tree::break_next = true;
 
@@ -588,7 +588,7 @@
 
 	      return retval;
 	    }
-	  else if (match_sans_spaces ("dbg_next", input_buf))
+	  else if (match_sans_spaces_semi ("dbg_next", input_buf))
 	    {
 	      tree::break_next = true;