_namemapper.h (cheetah3-3.2.5) | : | _namemapper.h (cheetah3-3.2.6) | ||
---|---|---|---|---|
skipping to change at line 57 | skipping to change at line 57 | |||
/* | /* | |||
* _namemapper.c specific definitions | * _namemapper.c specific definitions | |||
*/ | */ | |||
#define MAXCHUNKS 15 /* max num of nameChunks for the arrays */ | #define MAXCHUNKS 15 /* max num of nameChunks for the arrays */ | |||
#define ALLOW_WRAPPING_OF_NOTFOUND_EXCEPTIONS 1 | #define ALLOW_WRAPPING_OF_NOTFOUND_EXCEPTIONS 1 | |||
#define createNameCopyAndChunks() {\ | #define createNameCopyAndChunks() {\ | |||
nameCopy = malloc(strlen(name) + 1);\ | nameCopy = malloc(strlen(name) + 1);\ | |||
tmpPntr1 = name; \ | tmpPntr1 = name; \ | |||
tmpPntr2 = nameCopy;\ | tmpPntr2 = nameCopy;\ | |||
while ((*tmpPntr2++ = *tmpPntr1++)); \ | while ((*tmpPntr2++ = *tmpPntr1++)); \ | |||
numChunks = getNameChunks(nameChunks, name, nameCopy); \ | numChunks = getNameChunks(nameChunks, name, nameCopy); \ | |||
if (PyErr_Occurred()) { /* there might have been TooManyPeriods */\ | if (PyErr_Occurred()) { /* there might have been TooManyPeriods */\ | |||
free(nameCopy);\ | free(nameCopy);\ | |||
return NULL;\ | return NULL;\ | |||
}\ | }\ | |||
} | } | |||
#define checkForNameInNameSpaceAndReturnIfFound(namespace_decref) { \ | #define checkForNameInNameSpaceAndReturnIfFound(namespace_decref) { \ | |||
if ( PyNamemapper_hasKey(nameSpace, nameChunks[0]) ) {\ | if ( PyNamemapper_hasKey(nameSpace, nameChunks[0]) ) {\ | |||
theValue = PyNamemapper_valueForName(nameSpace, nameChunks, numChunks, e xecuteCallables);\ | theValue = PyNamemapper_valueForName(nameSpace, nameChunks, numChunks, e xecuteCallables);\ | |||
if (namespace_decref) {\ | if (namespace_decref) {\ | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |