Merge alpha100 branch back to main trunk

This commit is contained in:
Guido van Rossum 1994-08-01 11:34:53 +00:00
parent 2979b01ff8
commit b6775db241
176 changed files with 5302 additions and 3668 deletions

View file

@ -1,5 +1,5 @@
/***********************************************************
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
Amsterdam, The Netherlands.
All Rights Reserved
@ -22,6 +22,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
/* Raw interface to the parser. */
#include "allobjects.h"
#include "node.h"
#include "token.h"
@ -85,12 +87,10 @@ parser_parsefile(self, args)
err_errno(IOError);
return NULL;
}
err = parse_file(fp, filename, file_input, &n);
n = parse_file(fp, filename, file_input);
fclose(fp);
if (err != E_DONE) {
err_input(err);
if (n == NULL)
return NULL;
}
res = node2tuple(n);
freetree(n);
return res;