annotate Python/getcompiler.c @ 17996:5a9debb14440 legacy-trunk

Internal refactoring of convertsimple() and friends. Note that lots of code was re-indented. Replace two-step of convertsimple() and convertsimple1() with convertsimple() and helper converterr(), which is called to format error messages when convertsimple() fails. The old code did all the real work in convertsimple1(), but deferred error message formatting to conversimple(). The result was paying the price of a second function call on every call just to format error messages in the failure cases. Factor out of the buffer-handling code in convertsimple() and package it as convertbuffer(). Add two macros to ease readability of Unicode coversions, UNICODE_DEFAULT_ENCODING() and CONV_UNICODE, an error string. The convertsimple() routine had awful indentation problems, primarily because there were two tabs between the case line and the body of the case statements. This patch reformats the entire function to have a single tab between case line and case body, which makes the code easier to read (and consistent with ceval). The introduction of converterr() exacerbated the problem and prompted this fix. Also, eliminate non-standard whitespace after opening paren and before closing paren in a few if statements. (This checkin is part of SF patch 426072.)
author Jeremy Hylton <jeremy@alum.mit.edu>
date Tue, 29 May 2001 17:37:05 +0000
parents 4306107b1395
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3589
bd20c04274ff Added copyright.
Guido van Rossum <guido@python.org>
parents: 2896
diff changeset
1
3621
f158edccc72c grand renaming; added copyright to some files
Guido van Rossum <guido@python.org>
parents: 3589
diff changeset
2 /* Return the compiler identification, if possible. */
f158edccc72c grand renaming; added copyright to some files
Guido van Rossum <guido@python.org>
parents: 3589
diff changeset
3
f158edccc72c grand renaming; added copyright to some files
Guido van Rossum <guido@python.org>
parents: 3589
diff changeset
4 #include "Python.h"
3589
bd20c04274ff Added copyright.
Guido van Rossum <guido@python.org>
parents: 2896
diff changeset
5
bd20c04274ff Added copyright.
Guido van Rossum <guido@python.org>
parents: 2896
diff changeset
6 #ifndef COMPILER
3621
f158edccc72c grand renaming; added copyright to some files
Guido van Rossum <guido@python.org>
parents: 3589
diff changeset
7
2896
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
8 #ifdef __GNUC__
14410
4306107b1395 The GCC version is loooooooooong; put it on a new line.
Guido van Rossum <guido@python.org>
parents: 14375
diff changeset
9 #define COMPILER "\n[GCC " __VERSION__ "]"
2896
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
10 #endif
3621
f158edccc72c grand renaming; added copyright to some files
Guido van Rossum <guido@python.org>
parents: 3589
diff changeset
11
3589
bd20c04274ff Added copyright.
Guido van Rossum <guido@python.org>
parents: 2896
diff changeset
12 #endif /* !COMPILER */
2896
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
13
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
14 #ifndef COMPILER
3621
f158edccc72c grand renaming; added copyright to some files
Guido van Rossum <guido@python.org>
parents: 3589
diff changeset
15
2896
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
16 #ifdef __cplusplus
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
17 #define COMPILER "[C++]"
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
18 #else
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
19 #define COMPILER "[C]"
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
20 #endif
3621
f158edccc72c grand renaming; added copyright to some files
Guido van Rossum <guido@python.org>
parents: 3589
diff changeset
21
3589
bd20c04274ff Added copyright.
Guido van Rossum <guido@python.org>
parents: 2896
diff changeset
22 #endif /* !COMPILER */
2896
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
23
5860
728a083242a2 Make it return a _const_ char*.
Guido van Rossum <guido@python.org>
parents: 4503
diff changeset
24 const char *
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13256
diff changeset
25 Py_GetCompiler(void)
2896
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
26 {
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
27 return COMPILER;
f0d9f800a4aa Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
28 }