Scintilla command ES accepting string parameter: if empty, pop value from stack otherwise pass string

2 files changed, 31 insertions, 15 deletions

diff --git a/parser.cpp b/parser.cpp
index 049711f..cfeebd0 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -23,6 +23,7 @@ namespace States {
 	StateFlowCommand	flowcommand;
 	StateCondCommand	condcommand;
 	StateECommand		ecommand;
+	StateScintilla		scintilla;
 	StateInsert		insert;
 	StateSearch		search;
 
@@ -1052,8 +1053,9 @@ StateECommand::StateECommand() : State()
 {
 	transitions['\0'] = this;
 	transitions['B'] = &States::editfile;
-	transitions['W'] = &States::savefile;
+	transitions['S'] = &States::scintilla;
 	transitions['Q'] = &States::eqcommand;
+	transitions['W'] = &States::savefile;
 }
 
 State *
@@ -1073,20 +1075,6 @@ StateECommand::custom(gchar chr) throw (Error)
 		ring.close();
 		break;
 
-	case 'S': {
-		BEGIN_EXEC(&States::start);
-		expressions.eval();
-		if (!expressions.args())
-			throw Error("<ES> command requires at least a message code");
-
-		unsigned int iMessage = expressions.pop_num_calc(1, 0);
-		uptr_t wParam = expressions.pop_num_calc(1, 0);
-		sptr_t lParam = expressions.pop_num_calc(1, 0);
-
-		expressions.push(interface.ssm(iMessage, wParam, lParam));
-		break;
-	}
-
 	case 'X':
 		BEGIN_EXEC(&States::start);
 
@@ -1105,6 +1093,28 @@ StateECommand::custom(gchar chr) throw (Error)
 	return &States::start;
 }
 
+State *
+StateScintilla::done(const gchar *str) throw (Error)
+{
+	unsigned int	iMessage;
+	uptr_t		wParam;
+	sptr_t		lParam;
+
+	BEGIN_EXEC(&States::start);
+
+	expressions.eval();
+	if (!expressions.args())
+		throw Error("<ES> command requires at least a message code");
+
+	iMessage = expressions.pop_num_calc(1, 0);
+	wParam = expressions.pop_num_calc(1, 0);
+	lParam = *str ? (sptr_t)str : expressions.pop_num_calc(1, 0);
+
+	expressions.push(interface.ssm(iMessage, wParam, lParam));
+
+	return &States::start;
+}
+
 /*
  * NOTE: cannot support VideoTECO's <n>I because
  * beginning and end of strings must be determined
diff --git a/parser.h b/parser.h
index 936e530..3047c50 100644
--- a/parser.h
+++ b/parser.h
@@ -187,6 +187,11 @@ private:
 	State *custom(gchar chr) throw (Error);
 };
 
+class StateScintilla : public StateExpectString {
+private:
+	State *done(const gchar *str) throw (Error);
+};
+
 class StateInsert : public StateExpectString {
 private:
 	void initial(void) throw (Error);
@@ -228,6 +233,7 @@ namespace States {
 	extern StateFlowCommand	flowcommand;
 	extern StateCondCommand	condcommand;
 	extern StateECommand	ecommand;
+	extern StateScintilla	scintilla;
 	extern StateInsert	insert;
 	extern StateSearch	search;