From b5c415a98dd0844412df982a767bbda3503a0a2c Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Sat, 28 Oct 2017 12:38:39 +0100
Subject: [PATCH] Rename OPCODE_ to INSTN_.

---
 src/libespeak-ng/compiledata.c | 6 +++---
 src/libespeak-ng/synthdata.c   | 8 ++++----
 src/libespeak-ng/synthesize.h  | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/libespeak-ng/compiledata.c b/src/libespeak-ng/compiledata.c
index c114681d..6002f4b9 100644
--- a/src/libespeak-ng/compiledata.c
+++ b/src/libespeak-ng/compiledata.c
@@ -2232,11 +2232,11 @@ static int CompilePhoneme(int compile_phoneme)
 				CompileToneSpec();
 				break;
 			case kCONTINUE:
-				*prog_out++ = OPCODE_CONTINUE;
+				*prog_out++ = INSTN_CONTINUE;
 				DecThenCount();
 				break;
 			case kRETURN:
-				*prog_out++ = OPCODE_RETURN;
+				*prog_out++ = INSTN_RETURN;
 				DecThenCount();
 				break;
 			case kINCLUDE:
@@ -2249,7 +2249,7 @@ static int CompilePhoneme(int compile_phoneme)
 				if (if_level > 0)
 					error("Missing ENDIF");
 				if ((prog_out > prog_buf) && (if_stack[0].returned == 0))
-					*prog_out++ = OPCODE_RETURN;
+					*prog_out++ = INSTN_RETURN;
 				break;
 			}
 			break;
diff --git a/src/libespeak-ng/synthdata.c b/src/libespeak-ng/synthdata.c
index e15f9d1d..a39fa9bd 100644
--- a/src/libespeak-ng/synthdata.c
+++ b/src/libespeak-ng/synthdata.c
@@ -756,7 +756,7 @@ int NumInstnWords(USHORT *prog)
 			// This instruction is followed by addWav(), 2 more words
 			return 4;
 		}
-		if (instn2 == OPCODE_CONTINUE)
+		if (instn2 == INSTN_CONTINUE)
 			return 3;
 		return 2;
 	}
@@ -813,10 +813,10 @@ void InterpretPhoneme(Translator *tr, int control, PHONEME_LIST *plist, PHONEME_
 				// instructions with no operand
 				switch (data)
 				{
-				case OPCODE_RETURN:
+				case INSTN_RETURN:
 					end_flag = 1;
 					break;
-				case OPCODE_CONTINUE:
+				case INSTN_CONTINUE:
 					break;
 				default:
 					InvalidInstn(ph, instn);
@@ -954,7 +954,7 @@ void InterpretPhoneme(Translator *tr, int control, PHONEME_LIST *plist, PHONEME_
 			param_sc = phdata->sound_param[instn2] = (instn >> 4) & 0xff;
 			prog++;
 
-			if (prog[1] != OPCODE_CONTINUE) {
+			if (prog[1] != INSTN_CONTINUE) {
 				if (instn2 < 2) {
 					// FMT() and WAV() imply Return
 					end_flag = 1;
diff --git a/src/libespeak-ng/synthesize.h b/src/libespeak-ng/synthesize.h
index f76bf90d..65bf6836 100644
--- a/src/libespeak-ng/synthesize.h
+++ b/src/libespeak-ng/synthesize.h
@@ -267,8 +267,8 @@ typedef struct {
 
 // instructions
 
-#define OPCODE_RETURN        0x0001
-#define OPCODE_CONTINUE      0x0002
+#define INSTN_RETURN         0x0001
+#define INSTN_CONTINUE       0x0002
 
 // Group 0 instrcutions with 8 bit operand.  These values go into bits 8-15 of the instruction
 #define i_CHANGE_PHONEME 0x01