Index: generic/nsfInt.h =================================================================== diff -u -ra6e6e5de115f92c579b867bb88323a9916aec4d4 -r3e2056578f71e9fb14f5c1ee35a9d626747eb285 --- generic/nsfInt.h (.../nsfInt.h) (revision a6e6e5de115f92c579b867bb88323a9916aec4d4) +++ generic/nsfInt.h (.../nsfInt.h) (revision 3e2056578f71e9fb14f5c1ee35a9d626747eb285) @@ -415,17 +415,18 @@ #define NSF_ARG_UNNAMED 0x080000 #define NSF_ARG_IS_RETURNVALUE 0x100000 #define NSF_ARG_NOLEADINGDASH 0x200000 -#define NSF_ARG_INVOKESETTER 0x400000 +#define NSF_ARG_SLOTASSIGN 0x400000 +#define NSF_ARG_SLOTINITIALIZE 0x800000 /* method invocations */ #define NSF_ARG_METHOD_INVOCATION (NSF_ARG_ALIAS|NSF_ARG_FORWARD|NSF_ARG_INITCMD) /* Disallowed parameter options */ -#define NSF_DISALLOWED_ARG_METHOD_PARAMETER (NSF_ARG_METHOD_INVOCATION|NSF_ARG_NOCONFIG|NSF_ARG_INVOKESETTER) +#define NSF_DISALLOWED_ARG_METHOD_PARAMETER (NSF_ARG_METHOD_INVOCATION|NSF_ARG_NOCONFIG|NSF_ARG_SLOTASSIGN|NSF_ARG_SLOTINITIALIZE) #define NSF_DISALLOWED_ARG_SETTER (NSF_ARG_SWITCH|NSF_ARG_SUBST_DEFAULT|NSF_DISALLOWED_ARG_METHOD_PARAMETER) /*#define NSF_DISALLOWED_ARG_OBJECT_PARAMETER (NSF_ARG_SWITCH)*/ #define NSF_DISALLOWED_ARG_OBJECT_PARAMETER 0 -#define NSF_DISALLOWED_ARG_VALUECHECK (NSF_ARG_SUBST_DEFAULT|NSF_ARG_METHOD_INVOCATION|NSF_ARG_SWITCH|NSF_ARG_CURRENTLY_UNKNOWN|NSF_ARG_INVOKESETTER) +#define NSF_DISALLOWED_ARG_VALUECHECK (NSF_ARG_SUBST_DEFAULT|NSF_ARG_METHOD_INVOCATION|NSF_ARG_SWITCH|NSF_ARG_CURRENTLY_UNKNOWN|NSF_ARG_SLOTASSIGN|NSF_ARG_SLOTINITIALIZE) /* flags for ParseContext */ @@ -603,7 +604,7 @@ typedef enum { NSF_EMPTY, NSF_ZERO, NSF_ONE, /* methods called internally */ - NSF_CONFIGURE, + NSF_CONFIGURE, NSF_INITIALIZE, NSF_ASSIGN, /* var names */ NSF_AUTONAMES, NSF_DEFAULTMETACLASS, NSF_DEFAULTSUPERCLASS, NSF_ALIAS_ARRAY, @@ -624,7 +625,7 @@ char *NsfGlobalStrings[] = { "", "0", "1", /* methods called internally */ - "configure", + "configure", "initialize", "assign", /* var names */ "__autonames", "__default_metaclass", "__default_superclass", "::nsf::alias",