reverse Execute::step() change: no need to pass parameters by reference

cmdline and cmdline_pos is no longer modified by code executed by step()
instead it is modified at the outermost macro level (commandline macro level)

3 files changed, 4 insertions, 6 deletions

diff --git a/src/cmdline.cpp b/src/cmdline.cpp
index 4796560..e710e14 100644
--- a/src/cmdline.cpp
+++ b/src/cmdline.cpp
@@ -87,7 +87,7 @@ cmdline_keypress(gchar key)
 
 	while (cmdline_pos <= (gint)strlen(cmdline)) {
 		try {
-			Execute::step((const gchar *&)cmdline, cmdline_pos);
+			Execute::step(cmdline, cmdline_pos);
 		} catch (ReplaceCmdline &r) {
 			undo.pop(r.pos);
 
diff --git a/src/parser.cpp b/src/parser.cpp
index 314c156..15fcbdf 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -71,7 +71,7 @@ gchar *strings[2] = {NULL, NULL};
 gchar escape_char = '\x1B';
 
 void
-Execute::step(const gchar *&macro, gint &stop_pos)
+Execute::step(const gchar *macro, gint stop_pos)
 	     throw (State::Error, ReplaceCmdline)
 {
 	while (macro_pc < stop_pos) {
@@ -93,8 +93,6 @@ void
 Execute::macro(const gchar *macro, bool locals)
 	      throw (State::Error, ReplaceCmdline)
 {
-	gint macro_len = strlen(macro);
-
 	GotoTable *parent_goto_table = Goto::table;
 	GotoTable macro_goto_table(false);
 
@@ -118,7 +116,7 @@ Execute::macro(const gchar *macro, bool locals)
 	}
 
 	try {
-		step(macro, macro_len);
+		step(macro, strlen(macro));
 		if (Goto::skip_label)
 			throw State::Error("Label \"%s\" not found",
 					   Goto::skip_label);
diff --git a/src/parser.h b/src/parser.h
index d2e570b..e810fa4 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -262,7 +262,7 @@ extern gchar *strings[2];
 extern gchar escape_char;
 
 namespace Execute {
-	void step(const gchar *&macro, gint &stop_pos)
+	void step(const gchar *macro, gint stop_pos)
 		 throw (State::Error, ReplaceCmdline);
 	void macro(const gchar *macro, bool locals = true)
 		  throw (State::Error, ReplaceCmdline);