Adding keyword argument checking for format and chain.

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

3 files changed, 14 insertions, 2 deletions

diff --git a/mps/code/arg.c b/mps/code/arg.c
index b74b9d6886b..6daee5c432e 100644
--- a/mps/code/arg.c
+++ b/mps/code/arg.c
@@ -22,6 +22,16 @@ Bool ArgCheckCant(Arg arg) {
   return TRUE;
 }
 
+Bool ArgCheckFormat(Arg arg) {
+  CHECKD(Format, arg->val.format);
+  return TRUE;
+}
+
+Bool ArgCheckChain(Arg arg) {
+  CHECKD(Chain, arg->val.chain);
+  return TRUE;
+}
+
 
 const KeyStruct _mps_key_varargs = {KeySig, "VARARGS", ArgCheckCant};
 
diff --git a/mps/code/mpm.h b/mps/code/mpm.h
index bd3752460f7..cb9a6f49fa2 100644
--- a/mps/code/mpm.h
+++ b/mps/code/mpm.h
@@ -138,6 +138,8 @@ 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);
 
 
 /* Logs and Powers
diff --git a/mps/code/pool.c b/mps/code/pool.c
index 09a10f13d62..283f3244ff4 100644
--- a/mps/code/pool.c
+++ b/mps/code/pool.c
@@ -107,8 +107,8 @@ Bool PoolCheck(Pool pool)
 
 /* Common keywords to PoolInit */
 
-const KeyStruct _mps_key_format = {KeySig, "AMS_FORMAT", ArgCheckCant}; /* FIXME: ArgCheckFormat */
-const KeyStruct _mps_key_chain = {KeySig, "AMS_CHAIN", ArgCheckCant}; /* FIXME: ArgCheckChain */
+const KeyStruct _mps_key_format = {KeySig, "AMS_FORMAT", ArgCheckFormat};
+const KeyStruct _mps_key_chain = {KeySig, "AMS_CHAIN", ArgCheckChain};
 
 
 /* PoolInit -- initialize a pool