diff options
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/accessobject.h | 54 | ||||
| -rw-r--r-- | Include/ceval.h | 1 | ||||
| -rw-r--r-- | Include/classobject.h | 12 | ||||
| -rw-r--r-- | Include/eval.h | 3 | ||||
| -rw-r--r-- | Include/frameobject.h | 3 |
5 files changed, 70 insertions, 3 deletions
diff --git a/Include/accessobject.h b/Include/accessobject.h new file mode 100644 index 0000000..1c67849 --- /dev/null +++ b/Include/accessobject.h @@ -0,0 +1,54 @@ +/*********************************************************** +Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum, +Amsterdam, The Netherlands. + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the names of Stichting Mathematisch +Centrum or CWI not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior permission. + +STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +******************************************************************/ + +/* Access object interface */ + +/* Access mode bits (note similarity with UNIX permissions) */ +#define AC_R 0444 +#define AC_W 0222 + +#define AC_PRIVATE 0700 +#define AC_R_PRIVATE 0400 +#define AC_W_PRIVATE 0200 + +#define AC_PROTECTED 0070 +#define AC_R_PROTECTED 0040 +#define AC_W_PROTECTED 0020 + +#define AC_PUBLIC 0007 +#define AC_R_PUBLIC 0004 +#define AC_W_PUBLIC 0002 + +extern typeobject Accesstype; + +#define is_accessobject(v) ((v)->ob_type == &Accesstype) + +object *newaccessobject PROTO((object *, object *, typeobject *, int)); +object *getaccessvalue PROTO((object *, object *)); +int setaccessvalue PROTO((object *, object *, object *)); + +void setaccessowner PROTO((object *, object *)); +object *cloneaccessobject PROTO((object *)); + +extern typeobject Anynumbertype, Anysequencetype, Anymappingtype; diff --git a/Include/ceval.h b/Include/ceval.h index a9f79b5..ab7659e 100644 --- a/Include/ceval.h +++ b/Include/ceval.h @@ -28,6 +28,7 @@ object *call_object PROTO((object *, object *)); object *getglobals PROTO((void)); object *getlocals PROTO((void)); +object *getclass PROTO((void)); void mergelocals PROTO((void)); void printtraceback PROTO((object *)); diff --git a/Include/classobject.h b/Include/classobject.h index b9bbc9b..ec07b59 100644 --- a/Include/classobject.h +++ b/Include/classobject.h @@ -30,6 +30,13 @@ It should be possible to use other object types as base classes, but currently it isn't. We'll see if we can fix that later, sigh... */ +typedef struct { + OB_HEAD + object *cl_bases; /* A tuple of class objects */ + object *cl_dict; /* A dictionary */ + object *cl_name; /* A string */ +} classobject; + extern typeobject Classtype, Instancetype, Instancemethodtype; #define is_classobject(op) ((op)->ob_type == &Classtype) @@ -38,9 +45,12 @@ extern typeobject Classtype, Instancetype, Instancemethodtype; extern object *newclassobject PROTO((object *, object *, object *)); extern object *newinstanceobject PROTO((object *, object *)); -extern object *newinstancemethodobject PROTO((object *, object *)); +extern object *newinstancemethodobject PROTO((object *, object *, object *)); extern object *instancemethodgetfunc PROTO((object *)); extern object *instancemethodgetself PROTO((object *)); +extern object *instancemethodgetclass PROTO((object *)); extern object *instance_convert PROTO((object *, char *)); + +extern int issubclass PROTO((object *, object *)); diff --git a/Include/eval.h b/Include/eval.h index 8ac672f..a7a0ec8 100644 --- a/Include/eval.h +++ b/Include/eval.h @@ -24,4 +24,5 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Interface to execute compiled code */ -object *eval_code PROTO((codeobject *, object *, object *, object *)); +object *eval_code + PROTO((codeobject *, object *, object *, object *, object *)); diff --git a/Include/frameobject.h b/Include/frameobject.h index d46b454..2056e06 100644 --- a/Include/frameobject.h +++ b/Include/frameobject.h @@ -36,6 +36,7 @@ typedef struct _frame { codeobject *f_code; /* code segment */ object *f_globals; /* global symbol table (dictobject) */ object *f_locals; /* local symbol table (dictobject) */ + object *f_class; /* class context (classobject or NULL) */ object *f_fastlocals; /* fast local variables (listobject) */ object *f_localmap; /* local variable names (dictobject) */ object **f_valuestack; /* malloc'ed array */ @@ -55,7 +56,7 @@ extern typeobject Frametype; #define is_frameobject(op) ((op)->ob_type == &Frametype) frameobject * newframeobject PROTO( - (frameobject *, codeobject *, object *, object *, int, int)); + (frameobject *, codeobject *, object *, object *, object *, int, int)); /* The rest of the interface is specific for frame objects */ |