mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added preferences/startup options for division warning 

and accepting unix-style newlines on input.

Also (finally) added a startup option to get -vv behaviour.

Moved __convert_to_newlines to main.c because that's easier with the newline option.
This commit is contained in:
Jack Jansen 2001-09-01 22:37:54 +00:00
parent a5ffeb69ab
commit ff5d8aaa28
2 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Mac/Python/macglue.c
View File

@ -179,23 +179,6 @@ static PyObject *python_event_handler;
*/ */
int PyMac_AppearanceCompliant; int PyMac_AppearanceCompliant;
#ifndef WITHOUT_UNIX_NEWLINES
/*
** Experimental feature (for 2.2a2): allow unix newlines
** as well as Mac newlines on input. We replace a lowlevel
** MSL routine to accomplish this
*/
void
__convert_to_newlines(unsigned char * buf, size_t * n_ptr)
{
unsigned char *p;
size_t n = *n_ptr;
for(p=buf; n > 0; p++, n--)
if ( *p == '\r' ) *p = '\n';
}
#endif /* WITHOUT_UNIX_NEWLINES */
/* Given an FSSpec, return the FSSpec of the parent folder */ /* Given an FSSpec, return the FSSpec of the parent folder */
static OSErr static OSErr

41
Mac/Python/macmain.c
View File

@ -62,9 +62,6 @@ extern PyMac_AddLibResources(void);
#define COPYRIGHT \ #define COPYRIGHT \
"Type \"copyright\", \"credits\" or \"license\" for more information." "Type \"copyright\", \"credits\" or \"license\" for more information."
extern int Py_DebugFlag; /* For parser.c, declared in pythonrun.c */
extern int Py_VerboseFlag; /* For import.c, declared in pythonrun.c */
short PyMac_AppRefNum; /* RefNum of application resource fork */ short PyMac_AppRefNum; /* RefNum of application resource fork */
/* For Py_GetArgcArgv(); set by main() */ /* For Py_GetArgcArgv(); set by main() */
@ -159,6 +156,7 @@ PyMac_InteractiveOptions(PyMac_PrefRecord *p, int *argcp, char ***argvp)
SET_OPT_ITEM(OPT_INSPECT, inspect); SET_OPT_ITEM(OPT_INSPECT, inspect);
SET_OPT_ITEM(OPT_VERBOSE, verbose); SET_OPT_ITEM(OPT_VERBOSE, verbose);
/* OPT_VERBOSEVERBOSE is default off */
SET_OPT_ITEM(OPT_OPTIMIZE, optimize); SET_OPT_ITEM(OPT_OPTIMIZE, optimize);
SET_OPT_ITEM(OPT_UNBUFFERED, unbuffered); SET_OPT_ITEM(OPT_UNBUFFERED, unbuffered);
SET_OPT_ITEM(OPT_DEBUGGING, debugging); SET_OPT_ITEM(OPT_DEBUGGING, debugging);
@ -173,7 +171,8 @@ PyMac_InteractiveOptions(PyMac_PrefRecord *p, int *argcp, char ***argvp)
/* SET_OPT_ITEM(OPT_KEEPCONSOLE, keep_console); */ /* SET_OPT_ITEM(OPT_KEEPCONSOLE, keep_console); */
SET_OPT_ITEM(OPT_TABWARN, tabwarn); SET_OPT_ITEM(OPT_TABWARN, tabwarn);
SET_OPT_ITEM(OPT_NOSITE, nosite); SET_OPT_ITEM(OPT_NOSITE, nosite);
SET_OPT_ITEM(OPT_NONAVSERV, nonavservice); SET_OPT_ITEM(OPT_DIVISIONWARN, divisionwarn);
SET_OPT_ITEM(OPT_UNIXNEWLINES, unixnewlines);
/* The rest are not settable interactively */ /* The rest are not settable interactively */
#undef SET_OPT_ITEM #undef SET_OPT_ITEM
@ -219,6 +218,16 @@ PyMac_InteractiveOptions(PyMac_PrefRecord *p, int *argcp, char ***argvp)
OPT_ITEM(OPT_INSPECT, inspect); OPT_ITEM(OPT_INSPECT, inspect);
OPT_ITEM(OPT_VERBOSE, verbose); OPT_ITEM(OPT_VERBOSE, verbose);
if ( item == OPT_VERBOSEVERBOSE ) {
if ( p->verbose == 2 )
p->verbose = 1;
else
p->verbose = 2;
GetDialogItem(dialog, OPT_VERBOSE, &type, (Handle *)&handle, &rect);
SetControlValue(handle, 1);
}
GetDialogItem(dialog, OPT_VERBOSEVERBOSE, &type, (Handle *)&handle, &rect);
SetControlValue(handle, p->verbose == 2);
OPT_ITEM(OPT_OPTIMIZE, optimize); OPT_ITEM(OPT_OPTIMIZE, optimize);
OPT_ITEM(OPT_UNBUFFERED, unbuffered); OPT_ITEM(OPT_UNBUFFERED, unbuffered);
OPT_ITEM(OPT_DEBUGGING, debugging); OPT_ITEM(OPT_DEBUGGING, debugging);
@ -236,7 +245,8 @@ PyMac_InteractiveOptions(PyMac_PrefRecord *p, int *argcp, char ***argvp)
SetControlValue(handle, (short)(p->keep_console == POPT_KEEPCONSOLE_NEVER)); SetControlValue(handle, (short)(p->keep_console == POPT_KEEPCONSOLE_NEVER));
OPT_ITEM(OPT_TABWARN, tabwarn); OPT_ITEM(OPT_TABWARN, tabwarn);
OPT_ITEM(OPT_NOSITE, nosite); OPT_ITEM(OPT_NOSITE, nosite);
OPT_ITEM(OPT_NONAVSERV, nonavservice); OPT_ITEM(OPT_DIVISIONWARN, divisionwarn);
OPT_ITEM(OPT_UNIXNEWLINES, unixnewlines);
#undef OPT_ITEM #undef OPT_ITEM
} }
@ -315,6 +325,7 @@ init_common(int *argcp, char ***argvp, int embedded)
Py_DebugFlag = PyMac_options.debugging; Py_DebugFlag = PyMac_options.debugging;
Py_NoSiteFlag = PyMac_options.nosite; Py_NoSiteFlag = PyMac_options.nosite;
Py_TabcheckFlag = PyMac_options.tabwarn; Py_TabcheckFlag = PyMac_options.tabwarn;
Py_DivisionWarningFlag = PyMac_options.divisionwarn;
if ( PyMac_options.noargs ) { if ( PyMac_options.noargs ) {
/* don't process events at all without the scripts permission */ /* don't process events at all without the scripts permission */
PyMacSchedParams scp; PyMacSchedParams scp;
@ -675,3 +686,23 @@ PyMac_GetDelayConsoleFlag()
{ {
return (int)PyMac_options.delayconsole; return (int)PyMac_options.delayconsole;
} }
#ifndef WITHOUT_UNIX_NEWLINES
/*
** Experimental feature (for 2.2a2): optionally allow unix newlines
** as well as Mac newlines on input. We replace a lowlevel
** MSL routine to accomplish this.
*/
void
__convert_to_newlines(unsigned char * buf, size_t * n_ptr)
{
unsigned char *p;
size_t n = *n_ptr;
for(p=buf; n > 0; p++, n--)
if ( *p == '\r' ) *p = '\n';
else if ( *p == '\n' && !PyMac_options.unixnewlines )
*p = '\r';
}
#endif /* WITHOUT_UNIX_NEWLINES */