Moving keyword argument declarations to their own header, since they're largely separable from the mps.

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

3 files changed, 68 insertions, 12 deletions

diff --git a/mps/code/arg.h b/mps/code/arg.h
new file mode 100644
index 00000000000..ec1bcb77edf
--- /dev/null
+++ b/mps/code/arg.h
@@ -0,0 +1,65 @@
+/* arg.h: Keyword argument lists
+ *
+ * $Id$
+ * Copyright (c) 2013 Ravenbrook Limited.  See end of file for license.
+ *
+ * .source: FIXME: Write up design from email discussion.
+ */
+
+#ifndef arg_h
+#define arg_h
+
+#include "mpmtypes.h"
+
+#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);
+
+#endif /* arg_h */
+
+
+/* C. COPYRIGHT AND LICENSE
+ *
+ * Copyright (C) 2001-2002 Ravenbrook Limited <http://www.ravenbrook.com/>.
+ * All rights reserved.  This is an open source license.  Contact
+ * Ravenbrook for commercial licensing options.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * 3. Redistributions in any form must be accompanied by information on how
+ * to obtain complete source code for this software and any accompanying
+ * software that uses this software.  The source code must either be
+ * included in the distribution or be available for no more than the cost
+ * of distribution plus a nominal fee, and must be freely redistributable
+ * under reasonable conditions.  For an executable file, complete source
+ * code means the source code for all modules it contains. It does not
+ * include source code for modules or files that typically accompany the
+ * major components of the operating system on which the executable file
+ * runs.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ * PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
diff --git a/mps/code/mpm.h b/mps/code/mpm.h
index 5346078c214..580dd255e9c 100644
--- a/mps/code/mpm.h
+++ b/mps/code/mpm.h
@@ -22,6 +22,7 @@
 #include "mpslib.h"
 #include "ring.h"
 #include "tract.h" /* only for certain Seg macros */
+#include "arg.h"
 #include "mpmtypes.h"
 #include "mpmst.h"
 
@@ -130,18 +131,6 @@ extern int (AddrComp)(Addr a, Addr b, Size size);
 extern Bool ResIsAllocFailure(Res res);
 
 
-/* Argument Lists */
-
-#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);
-
-
 /* Logs and Powers
  *
  * SizeIsP2 returns TRUE if and only if size is a non-negative integer
diff --git a/mps/code/mps.xcodeproj/project.pbxproj b/mps/code/mps.xcodeproj/project.pbxproj
index 8a47451f8a7..d7afec6d192 100644
--- a/mps/code/mps.xcodeproj/project.pbxproj
+++ b/mps/code/mps.xcodeproj/project.pbxproj
@@ -1007,6 +1007,7 @@
                 3104B022156D39D4000A585A /* amssshe */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = amssshe; sourceTree = BUILT_PRODUCTS_DIR; };
                 3104B02F156D39F2000A585A /* amssshe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = amssshe.c; sourceTree = "<group>"; };
                 3104B03D156D3AD7000A585A /* segsmss */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = segsmss; sourceTree = BUILT_PRODUCTS_DIR; };
+                3107DC4E173B03D100F705C8 /* arg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = arg.h; sourceTree = "<group>"; };
                 3114A590156E913C001E0AA3 /* locv */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = locv; sourceTree = BUILT_PRODUCTS_DIR; };
                 3114A5A1156E9168001E0AA3 /* locv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = locv.c; sourceTree = "<group>"; };
                 3114A5A7156E92C0001E0AA3 /* qs */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = qs; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1704,6 +1705,7 @@
                                 311F2F7A17398B8E00C15B6A /* tract.h */,
                                 31EEAC44156AB32500714D05 /* version.c */,
                                 31EEAC0E156AB27B00714D05 /* walk.c */,
+                                3107DC4E173B03D100F705C8 /* arg.h */,
                         );
                         name = "MPM Core";
                         sourceTree = "<group>";