From 9b1504a2216a469f9b5eb0826977ebf80407c71f Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Tue, 26 Feb 2008 20:35:25 +0000
Subject: [PATCH] move some constants private to the lexer into its .c file

---
 lex.c | 21 ++++++++++++++++++++-
 sh.h  | 21 +--------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/lex.c b/lex.c
index 28f9603..480e2d1 100644
--- a/lex.c
+++ b/lex.c
@@ -2,7 +2,26 @@
 
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.49 2008/02/24 22:12:36 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.50 2008/02/26 20:35:24 tg Exp $");
+
+/*
+ * states while lexing word
+ */
+#define SBASE		0	/* outside any lexical constructs */
+#define SWORD		1	/* implicit quoting for substitute() */
+#define SLETPAREN	2	/* inside (( )), implicit quoting */
+#define SSQUOTE		3	/* inside '' */
+#define SDQUOTE		4	/* inside "" */
+#define SBRACE		5	/* inside ${} */
+#define SCSPAREN	6	/* inside $() */
+#define SBQUOTE		7	/* inside `` */
+#define SASPAREN	8	/* inside $(( )) */
+#define SHEREDELIM	9	/* parsing <<,<<- delimiter */
+#define SHEREDQUOTE	10	/* parsing " in <<,<<- delimiter */
+#define SPATTERN	11	/* parsing *(...|...) pattern (*+?@!) */
+#define STBRACE		12	/* parsing ${..[#%]..} */
+#define SLETARRAY	13	/* inside =( ), just copy */
+#define SADELIM		14	/* like SBASE, looking for delimiter */
 
 /* Structure to keep track of the lexing state and the various pieces of info
  * needed for each particular state. */
diff --git a/sh.h b/sh.h
index 7e579d5..8f885a2 100644
--- a/sh.h
+++ b/sh.h
@@ -8,7 +8,7 @@
 /*	$OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $	*/
 /*	$OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $	*/
 
-#define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.185 2008/02/24 15:48:43 tg Exp $"
+#define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.186 2008/02/26 20:35:25 tg Exp $"
 #define MKSH_VERSION "R33 2008/02/24"
 
 #if HAVE_SYS_PARAM_H
@@ -1110,25 +1110,6 @@ struct source {
 #define SF_TTY		BIT(3)	/* type == SSTDIN & it is a tty */
 #define SF_FIRST	BIT(4)	/* initial state (to ignore UTF-8 BOM) */
 
-/*
- * states while lexing word
- */
-#define SBASE		0	/* outside any lexical constructs */
-#define SWORD		1	/* implicit quoting for substitute() */
-#define SLETPAREN	2	/* inside (( )), implicit quoting */
-#define SSQUOTE		3	/* inside '' */
-#define SDQUOTE		4	/* inside "" */
-#define SBRACE		5	/* inside ${} */
-#define SCSPAREN	6	/* inside $() */
-#define SBQUOTE		7	/* inside `` */
-#define SASPAREN	8	/* inside $(( )) */
-#define SHEREDELIM	9	/* parsing <<,<<- delimiter */
-#define SHEREDQUOTE	10	/* parsing " in <<,<<- delimiter */
-#define SPATTERN	11	/* parsing *(...|...) pattern (*+?@!) */
-#define STBRACE		12	/* parsing ${..[#%]..} */
-#define SLETARRAY	13	/* inside =( ), just copy */
-#define SADELIM		14	/* like SBASE, looking for delimiter */
-
 typedef union {
 	int i;
 	char *cp;