Skip to content

Commit b6775db

Browse files
gvanrossumgvanrossum
committed
Merge alpha100 branch back to main trunk
1 parent 2979b01 commit b6775db

File tree

176 files changed

+5230
-3596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+5230
-3596
lines changed

‎Include/accessobject.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extern "C" {
55
#endif
66

77
/***********************************************************
8-
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
8+
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
99
Amsterdam, The Netherlands.
1010
1111
All Rights Reserved

‎Include/allobjects.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extern "C" {
55
#endif
66

77
/***********************************************************
8-
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
8+
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
99
Amsterdam, The Netherlands.
1010
1111
All Rights Reserved
@@ -30,14 +30,18 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
3030

3131
/* "allobjects.c" -- Source for precompiled header "allobjects.h" */
3232

33+
#ifdef HAVE_CONFIG_H
34+
#include "config.h"
35+
#endif
36+
3337
#ifdef THINK_C
3438
#define macintosh
3539
#endif
3640

3741
#include <stdio.h>
3842
#include <string.h>
3943

40-
#include "PROTO.h"
44+
#include "myproto.h"
4145

4246
#include "object.h"
4347
#include "objimpl.h"

‎Include/assert.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extern "C" {
55
#endif
66

77
/***********************************************************
8-
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
8+
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
99
Amsterdam, The Netherlands.
1010
1111
All Rights Reserved
@@ -28,7 +28,13 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2828
2929
******************************************************************/
3030

31+
#ifdef MPW /* This is for MPW's File command */
32+
33+
#define assert(e) { if (!(e)) { printf("### Python: Assertion failed:\n\
34+
File %s; Line %d\n", __FILE__, __LINE__); abort(); } }
35+
#else
3136
#define assert(e) { if (!(e)) { printf("Assertion failed\n"); abort(); } }
37+
#endif
3238

3339
#ifdef __cplusplus
3440
}

‎Include/bitset.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extern "C" {
55
#endif
66

77
/***********************************************************
8-
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
8+
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
99
Amsterdam, The Netherlands.
1010
1111
All Rights Reserved

‎Include/bltinmodule.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extern "C" {
55
#endif
66

77
/***********************************************************
8-
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
8+
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
99
Amsterdam, The Netherlands.
1010
1111
All Rights Reserved
@@ -31,6 +31,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
3131
/* Built-in module interface */
3232

3333
extern object *getbuiltin PROTO((object *));
34+
extern int setbuiltin PROTO((char *, object *));
3435

3536
#ifdef __cplusplus
3637
}

‎Include/ceval.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extern "C" {
55
#endif
66

77
/***********************************************************
8-
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
8+
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
99
Amsterdam, The Netherlands.
1010
1111
All Rights Reserved
@@ -35,6 +35,7 @@ object *call_object PROTO((object *, object *));
3535
object *getglobals PROTO((void));
3636
object *getlocals PROTO((void));
3737
object *getowner PROTO((void));
38+
object *getframe PROTO((void));
3839

3940
void printtraceback PROTO((object *));
4041
void flushline PROTO((void));
@@ -87,7 +88,7 @@ extern void init_save_thread PROTO((void));
8788
extern object *save_thread PROTO((void));
8889
extern void restore_thread PROTO((object *));
8990

90-
#ifdef USE_THREAD
91+
#ifdef WITH_THREAD
9192

9293
#define BGN_SAVE { \
9394
object *_save; \
@@ -97,14 +98,14 @@ extern void restore_thread PROTO((object *));
9798
#define END_SAVE restore_thread(_save); \
9899
}
99100

100-
#else /* !USE_THREAD */
101+
#else /* !WITH_THREAD */
101102

102103
#define BGN_SAVE {
103104
#define RET_SAVE
104105
#define RES_SAVE
105106
#define END_SAVE }
106107

107-
#endif /* !USE_THREAD */
108+
#endif /* !WITH_THREAD */
108109

109110
#ifdef __cplusplus
110111
}

‎Include/cgensupport.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extern "C" {
55
#endif
66

77
/***********************************************************
8-
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
8+
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
99
Amsterdam, The Netherlands.
1010
1111
All Rights Reserved
@@ -35,7 +35,7 @@ typedef char *string;
3535
#define mknewlongobject(x) newintobject(x)
3636
#define mknewshortobject(x) newintobject((long)x)
3737
#define mknewfloatobject(x) newfloatobject(x)
38-
#define mknewcharobject(c) mkvalue("c", c)
38+
#define mknewcharobject(ch) mkvalue("c", ch)
3939

4040
extern int getiobjectarg PROTO((object *args, int nargs, int i, object **p_a));
4141
extern int getilongarg PROTO((object *args, int nargs, int i, long *p_a));

‎Include/classobject.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extern "C" {
55
#endif
66

77
/***********************************************************
8-
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
8+
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
99
Amsterdam, The Netherlands.
1010
1111
All Rights Reserved

‎Include/compile.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extern "C" {
55
#endif
66

77
/***********************************************************
8-
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
8+
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
99
Amsterdam, The Netherlands.
1010
1111
All Rights Reserved

‎Include/dictobject.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extern "C" {
55
#endif
66

77
/***********************************************************
8-
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
8+
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
99
Amsterdam, The Netherlands.
1010
1111
All Rights Reserved

0 commit comments

Comments
 (0)