Moving definition of keystruct to arg.h, since this mechanism is largely separable from the rest of the mps.

Copied from Perforce
 Change: 181664
 ServerID: perforce.ravenbrook.com

2 files changed, 12 insertions, 10 deletions

diff --git a/mps/code/arg.h b/mps/code/arg.h
index 58bbf98c85e..2a1385a8dfb 100644
--- a/mps/code/arg.h
+++ b/mps/code/arg.h
@@ -11,16 +11,28 @@
 
 #include "mpmtypes.h"
 
+/* KeyStruct -- keyword argument structure */
+
 /* FIXME: Whether to have a check field should be conditional on variety */
 
+#define KeySig          ((Sig)0x519CE111) /* SIGnature KEYyy */
+typedef struct mps_key_s {
+  Sig sig;
+  const char *name;
+  Bool (*check)(Arg arg);
+} KeyStruct;
+
 #define ARG_DEFINE_KEY(id, type) \
   const KeyStruct _mps_key_##id = {KeySig, #id, ArgCheck##type}
 
 #define argsNone mps_args_none
+
 extern Bool KeyCheck(Key key);
 extern Bool ArgCheck(Arg arg);
 extern Bool ArgListCheck(ArgList args);
+
 extern Bool ArgPick(ArgStruct *argOut, ArgList args, Key key);
+
 extern Bool ArgCheckCant(Arg arg);
 extern Bool ArgCheckFormat(Arg arg);
 extern Bool ArgCheckChain(Arg arg);
diff --git a/mps/code/mpmst.h b/mps/code/mpmst.h
index 410f50f963b..98e421ad823 100644
--- a/mps/code/mpmst.h
+++ b/mps/code/mpmst.h
@@ -700,16 +700,6 @@ typedef struct AllocPatternStruct {
 } AllocPatternStruct;
 
 
-/* KeyStruct -- keyword argument structure */
-
-#define KeySig          ((Sig)0x519CE111) /* SIGnature KEYyy */
-typedef struct mps_key_s {
-  Sig sig;
-  const char *name;
-  Bool (*check)(Arg arg);
-} KeyStruct;
-
-
 #endif /* mpmst_h */