mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Access checks now work, at least for instance data (not for methods

Browse source 
yet).  The class is now passed to eval_code and stored in the current
frame.  It is also stored in instance method objects.  An "unbound"
instance method is now returned when a function is retrieved through
"classname.funcname", which when called passes the class to eval_code.
This commit is contained in:
Guido van Rossum 1993-05-20 14:24:46 +00:00
parent 25831652fd
commit 81daa32c15
14 changed files with 655 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Include/accessobject.h Normal file
View file

@ -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;

1
Include/ceval.h
View file

@ -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 *));

12
Include/classobject.h
View file

@ -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 *));

3
Include/eval.h
View file

@ -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 *));

3
Include/frameobject.h
View file

@ -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 */