The parser doesn't need its own implementation of assert, and having its

own interfered with including Python.h.  Remove Python's assert.h.

8 files changed, 18 insertions, 38 deletions

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 1ad8a6ce58..68ad6e3a47 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -407,7 +407,6 @@ $(PGEN):	$(PGENOBJS)
 		$(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN)
 
 Parser/grammar.o:	$(srcdir)/Parser/grammar.c \
-				$(srcdir)/Parser/assert.h \
 				$(srcdir)/Include/token.h \
 				$(srcdir)/Include/grammar.h
 Parser/metagrammar.o:	$(srcdir)/Parser/metagrammar.c
diff --git a/PC/os2vacpp/makefile b/PC/os2vacpp/makefile
index 1c3d008a9d..029b9011b5 100644
--- a/PC/os2vacpp/makefile
+++ b/PC/os2vacpp/makefile
@@ -792,7 +792,7 @@ md5module.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\clas
 	 $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \
 	 $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h
 
-mpzmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_PARSER)\assert.h $(PY_INCLUDE)\ceval.h \
+mpzmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \
 	 $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \
 	 pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
 	 $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \
@@ -972,7 +972,7 @@ regexmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \
 	 $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \
 	 $(PY_INCLUDE)\tupleobject.h
 
-regexpr.obj: $(PY_INCLUDE)\abstract.h $(PY_PARSER)\assert.h $(PY_INCLUDE)\ceval.h \
+regexpr.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \
 	 $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \
 	 pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
 	 $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \
@@ -1415,7 +1415,7 @@ listobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\cla
 	 $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \
 	 $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h
 
-longobject.obj: $(PY_INCLUDE)\abstract.h $(PY_PARSER)\assert.h $(PY_INCLUDE)\ceval.h \
+longobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \
 	 $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \
 	 pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
 	 $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \
@@ -1565,11 +1565,11 @@ firstsets.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\grammar.h \
 	 $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\pgenheaders.h \
 	 $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h
 
-grammar.obj: $(PY_PARSER)\assert.h $(PY_INCLUDE)\bitset.h pyconfig.h \
+grammar.obj: $(PY_INCLUDE)\bitset.h pyconfig.h \
 	 $(PY_INCLUDE)\grammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \
 	 $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h
 
-grammar1.obj: $(PY_PARSER)\assert.h $(PY_INCLUDE)\bitset.h pyconfig.h \
+grammar1.obj: $(PY_INCLUDE)\bitset.h pyconfig.h \
 	 $(PY_INCLUDE)\grammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \
 	 $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h
 
@@ -1590,7 +1590,7 @@ myreadline.obj: pyconfig.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\mymalloc.h \
 node.obj: pyconfig.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\node.h \
 	 $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h
 
-parser.obj: $(PY_PARSER)\assert.h $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\errcode.h \
+parser.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\errcode.h \
 	 $(PY_INCLUDE)\grammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \
 	 $(PY_INCLUDE)\node.h $(PY_PARSER)\parser.h $(PY_INCLUDE)\pgenheaders.h \
 	 $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h
@@ -1601,7 +1601,7 @@ parsetok.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\errcode.h \
 	 $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h \
 	 $(PY_PARSER)\tokenizer.h
 
-pgen.obj: $(PY_PARSER)\assert.h $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\grammar.h \
+pgen.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\grammar.h \
 	 $(PY_INCLUDE)\metagrammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \
 	 $(PY_INCLUDE)\node.h $(PY_PARSER)\pgen.h $(PY_INCLUDE)\pgenheaders.h \
 	 $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h
diff --git a/PC/os2vacpp/makefile.omk b/PC/os2vacpp/makefile.omk
index d359726daa..6b90e89459 100644
--- a/PC/os2vacpp/makefile.omk
+++ b/PC/os2vacpp/makefile.omk
@@ -611,7 +611,7 @@ md5module.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \
 	 pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \
 	 traceback.h tupleobject.h
 
-mpzmodule.obj: abstract.h assert.h ceval.h classobject.h cobject.h \
+mpzmodule.obj: abstract.h ceval.h classobject.h cobject.h \
 	 complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \
 	 funcobject.h import.h intobject.h intrcheck.h listobject.h \
 	 longintrepr.h longobject.h methodobject.h modsupport.h \
@@ -716,7 +716,7 @@ regexmodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \
 	 pythonrun.h rangeobject.h regexpr.h sliceobject.h stringobject.h \
 	 sysmodule.h traceback.h tupleobject.h
 
-regexpr.obj: abstract.h assert.h ceval.h classobject.h cobject.h \
+regexpr.obj: abstract.h ceval.h classobject.h cobject.h \
 	 complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \
 	 funcobject.h import.h intobject.h intrcheck.h listobject.h \
 	 longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \
@@ -987,7 +987,7 @@ listobject.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \
 	 pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \
 	 traceback.h tupleobject.h
 
-longobject.obj: abstract.h assert.h ceval.h classobject.h cobject.h \
+longobject.obj: abstract.h ceval.h classobject.h cobject.h \
 	 complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \
 	 funcobject.h import.h intobject.h intrcheck.h listobject.h \
 	 longintrepr.h longobject.h methodobject.h modsupport.h \
@@ -1076,10 +1076,10 @@ bitset.obj: bitset.h pyconfig.h mymalloc.h myproto.h pgenheaders.h pydebug.h
 firstsets.obj: bitset.h pyconfig.h grammar.h mymalloc.h myproto.h \
 	 pgenheaders.h pydebug.h token.h
 
-grammar.obj: assert.h bitset.h pyconfig.h grammar.h mymalloc.h myproto.h \
+grammar.obj: bitset.h pyconfig.h grammar.h mymalloc.h myproto.h \
 	 pgenheaders.h pydebug.h token.h
 
-grammar1.obj: assert.h bitset.h pyconfig.h grammar.h mymalloc.h myproto.h \
+grammar1.obj: bitset.h pyconfig.h grammar.h mymalloc.h myproto.h \
 	 pgenheaders.h pydebug.h token.h
 
 intrcheck.obj: pyconfig.h intrcheck.h mymalloc.h myproto.h
@@ -1094,14 +1094,14 @@ myreadline.obj: pyconfig.h intrcheck.h mymalloc.h myproto.h
 
 node.obj: pyconfig.h mymalloc.h myproto.h node.h pgenheaders.h pydebug.h
 
-parser.obj: assert.h bitset.h pyconfig.h errcode.h grammar.h mymalloc.h \
+parser.obj: bitset.h pyconfig.h errcode.h grammar.h mymalloc.h \
 	 myproto.h node.h parser.h pgenheaders.h pydebug.h token.h
 
 parsetok.obj: bitset.h pyconfig.h errcode.h grammar.h mymalloc.h myproto.h \
 	 node.h parser.h parsetok.h pgenheaders.h pydebug.h token.h \
 	 tokenizer.h
 
-pgen.obj: assert.h bitset.h pyconfig.h grammar.h metagrammar.h mymalloc.h \
+pgen.obj: bitset.h pyconfig.h grammar.h metagrammar.h mymalloc.h \
 	 myproto.h node.h pgen.h pgenheaders.h pydebug.h token.h
 
 pgenmain.obj: bitset.h pyconfig.h grammar.h mymalloc.h myproto.h node.h \
diff --git a/Parser/assert.h b/Parser/assert.h
deleted file mode 100644
index d4ed72c006..0000000000
--- a/Parser/assert.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef Py_ASSERT_H
-#define Py_ASSERT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#ifdef MPW /* This is for MPW's File command */
-
-#define assert(e) { if (!(e)) { printf("### Python: Assertion failed:\n\
-    File %s; Line %d\n", __FILE__, __LINE__); abort(); } }
-#else
-#define assert(e) { if (!(e)) { printf("Assertion failed\n"); abort(); } }
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_ASSERT_H */
diff --git a/Parser/grammar.c b/Parser/grammar.c
index 2a0574da9e..2cc15b581c 100644
--- a/Parser/grammar.c
+++ b/Parser/grammar.c
@@ -1,11 +1,11 @@
 
 /* Grammar implementation */
 
+#include "Python.h"
 #include "pgenheaders.h"
 
 #include <ctype.h>
 
-#include "assert.h"
 #include "token.h"
 #include "grammar.h"
 
diff --git a/Parser/grammar1.c b/Parser/grammar1.c
index b2631b785d..912d3872d2 100644
--- a/Parser/grammar1.c
+++ b/Parser/grammar1.c
@@ -1,8 +1,8 @@
 
 /* Grammar subroutines needed by parser */
 
+#include "Python.h"
 #include "pgenheaders.h"
-#include "assert.h"
 #include "grammar.h"
 #include "token.h"
 
diff --git a/Parser/parser.c b/Parser/parser.c
index a9125e29a9..39141437ba 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -5,8 +5,8 @@
 
 /* XXX To do: error recovery */
 
+#include "Python.h"
 #include "pgenheaders.h"
-#include "assert.h"
 #include "token.h"
 #include "grammar.h"
 #include "node.h"
diff --git a/Parser/pgen.c b/Parser/pgen.c
index 47c817f3ff..55ce7a1f47 100644
--- a/Parser/pgen.c
+++ b/Parser/pgen.c
@@ -4,8 +4,8 @@
 
 /* For a description, see the comments at end of this file */
 
+#include "Python.h"
 #include "pgenheaders.h"
-#include "assert.h"
 #include "token.h"
 #include "node.h"
 #include "grammar.h"