[cmake-commits] hoffman committed cmDependsFortranParser.cxx 1.11
1.12 cmDependsFortranParser.y 1.13 1.14
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Oct 4 15:31:06 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv21751
Modified Files:
cmDependsFortranParser.cxx cmDependsFortranParser.y
Log Message:
ENH: update .y file with borland fix, and use a table based strcasecmp
Index: cmDependsFortranParser.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDependsFortranParser.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cmDependsFortranParser.cxx 4 Oct 2007 18:47:11 -0000 1.11
+++ cmDependsFortranParser.cxx 4 Oct 2007 19:31:03 -0000 1.12
@@ -183,7 +183,6 @@
#define cmDependsFortranParser_cxx
#include "cmDependsFortranParser.h" /* Interface to parser object. */
#include "cmDependsFortranParserTokens.h" /* Need YYSTYPE for YY_DECL. */
-#include <ctype.h> // for tolower
/* Configure the parser to use a lexer object. */
#define YYPARSE_PARAM yyscanner
@@ -202,22 +201,60 @@
cmDependsFortranParser_Error(parser, message);
}
-static bool cmDependsFortranParserIsKeyword(const char* word,
- const char* keyword)
+
+static char charmap[] = {
+ '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+ '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+ '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+ '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+ '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+ '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+ '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+ '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+ '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+ '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+ '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+ '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+ '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+ '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+ '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+ '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+ '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+ '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+ '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+ '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+ '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
+ '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
+ '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
+ '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
+ '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
+ '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
+ '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
+ '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
+ '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+ '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+ '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+ '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
+};
+
+inline int strcasecmpCM(const char *s1, const char *s2)
{
- size_t len = strlen(word);
- if (len != strlen(keyword))
- {
- return false;
- }
- for (size_t i = 0; i < len; ++i)
- {
- if (tolower(word[i]) != tolower(keyword[i]))
+ const char *cm = charmap;
+ const char* us1 = s1;
+ const char* us2 = s2;
+
+ while(cm[*us1] == cm[*us2++])
+ if(*us1++ == '\0')
{
- return false;
+ return(0);
}
- }
- return true;
+ return(cm[*us1] - cm[*--us2]);
+}
+
+static bool cmDependsFortranParserIsKeyword(const char* word,
+ const char* keyword)
+{
+ return strcasecmpCM(word, keyword) == 0;
}
/* Disable some warnings in the generated code. */
Index: cmDependsFortranParser.y
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDependsFortranParser.y,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cmDependsFortranParser.y 3 Oct 2007 21:01:49 -0000 1.13
+++ cmDependsFortranParser.y 4 Oct 2007 19:31:03 -0000 1.14
@@ -44,7 +44,6 @@
#define cmDependsFortranParser_cxx
#include "cmDependsFortranParser.h" /* Interface to parser object. */
#include "cmDependsFortranParserTokens.h" /* Need YYSTYPE for YY_DECL. */
-#include "cmSystemTools.h"
/* Configure the parser to use a lexer object. */
#define YYPARSE_PARAM yyscanner
@@ -63,11 +62,59 @@
cmDependsFortranParser_Error(parser, message);
}
+static char charmap[] = {
+ '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+ '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+ '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+ '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+ '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+ '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+ '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+ '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+ '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+ '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+ '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+ '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+ '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+ '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+ '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+ '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+ '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+ '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+ '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+ '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+ '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
+ '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
+ '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
+ '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
+ '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
+ '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
+ '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
+ '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
+ '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+ '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+ '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+ '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
+};
+
+inline int strcasecmpCM(const char *s1, const char *s2)
+{
+ const char *cm = charmap;
+ const char* us1 = s1;
+ const char* us2 = s2;
+
+ while(cm[*us1] == cm[*us2++])
+ if(*us1++ == '\0')
+ {
+ return(0);
+ }
+ return(cm[*us1] - cm[*--us2]);
+}
+
static bool cmDependsFortranParserIsKeyword(const char* word,
const char* keyword)
{
- return (strlen(word) == strlen(keyword) &&
- cmSystemTools::LowerCase(word) == keyword);
+ return strcasecmpCM(word, keyword) == 0;
}
/* Disable some warnings in the generated code. */
More information about the Cmake-commits
mailing list