Index: generic/xotclInt.h =================================================================== diff -u -rc6066a15de738754028991b2b57b8f1d5a1cccaa -r5524b83ed5dda30e55f7a02e4c22d26783688954 --- generic/xotclInt.h (.../xotclInt.h) (revision c6066a15de738754028991b2b57b8f1d5a1cccaa) +++ generic/xotclInt.h (.../xotclInt.h) (revision 5524b83ed5dda30e55f7a02e4c22d26783688954) @@ -356,13 +356,20 @@ /* flags for XOTclParams */ #define XOTCL_ARG_REQUIRED 0x0001 -#define XOTCL_ARG_SUBST_DEFAULT 0x0002 -#define XOTCL_ARG_INITCMD 0x0004 -#define XOTCL_ARG_METHOD 0x0008 -#define XOTCL_ARG_NOARG 0x0010 +#define XOTCL_ARG_MULTIVALUED 0x0002 +#define XOTCL_ARG_NOARG 0x0004 +#define XOTCL_ARG_SUBST_DEFAULT 0x0010 +#define XOTCL_ARG_INITCMD 0x0020 +#define XOTCL_ARG_METHOD 0x0040 #define XOTCL_ARG_RELATION 0x0100 -#define XOTCL_ARG_MULTIVALUED 0x0200 +#define XOTCL_ARG_SWITCH 0x0200 +/* disallowed options */ +#define XOTCL_DISALLOWED_ARG_METHOD_PARAMETER (XOTCL_ARG_METHOD|XOTCL_ARG_INITCMD|XOTCL_ARG_RELATION) +#define XOTCL_DISALLOWED_ARG_OBJECT_PARAMETER 0 +#define XOTCL_DISALLOWED_ARG_VALUEECHECK (XOTCL_ARG_SUBST_DEFAULT|XOTCL_ARG_METHOD|XOTCL_ARG_INITCMD|XOTCL_ARG_RELATION|XOTCL_ARG_SWITCH) + + /* method types */ #define XOTCL_METHODTYPE_ALIAS 0x0001 #define XOTCL_METHODTYPE_SCRIPTED 0x0002 @@ -372,9 +379,6 @@ #define XOTCL_METHODTYPE_OTHER 0x0100 #define XOTCL_METHODTYPE_BUILTIN XOTCL_METHODTYPE_ALIAS|XOTCL_METHODTYPE_SETTER|XOTCL_METHODTYPE_FORWARDER|XOTCL_METHODTYPE_OBJECT|XOTCL_METHODTYPE_OTHER -/* disallowed options */ -#define XOTCL_ARG_METHOD_PARAMETER (XOTCL_ARG_RELATION) /* maybe add ARG_INITCMD */ -#define XOTCL_ARG_OBJECT_PARAMETER 0 /* flags for parseContext */ #define XOTCL_PC_MUST_DECR 0x0001