Commit c1fd153e by Bruce Korb Committed by Bruce Korb

reorder some files= entries

From-SVN: r34582
parent 33002945
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
for a single fix for a single fix
* fixinc/inclhack.def(ctrl_quotes_def): add a second test * fixinc/inclhack.def(ctrl_quotes_def): add a second test
(io_quotes_def): add a second test (io_quotes_def): add a second test
(various): reorder `files' so that "limits.h" is never first
* fixinc/tests/base/*: update the testing output * fixinc/tests/base/*: update the testing output
Sat Jun 17 10:33:59 2000 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> Sat Jun 17 10:33:59 2000 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
......
...@@ -2267,7 +2267,7 @@ tSCC zLimits_IfndefsName[] = ...@@ -2267,7 +2267,7 @@ tSCC zLimits_IfndefsName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zLimits_IfndefsList[] = tSCC zLimits_IfndefsList[] =
"|limits.h|sys/limits.h|"; "|sys/limits.h|limits.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2715,7 +2715,7 @@ tSCC zNested_MotorolaName[] = ...@@ -2715,7 +2715,7 @@ tSCC zNested_MotorolaName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zNested_MotorolaList[] = tSCC zNested_MotorolaList[] =
"|limits.h|sys/limits.h|"; "|sys/limits.h|limits.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -4529,7 +4529,7 @@ tSCC zUltrix_Math_IfdefName[] = ...@@ -4529,7 +4529,7 @@ tSCC zUltrix_Math_IfdefName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zUltrix_Math_IfdefList[] = tSCC zUltrix_Math_IfdefList[] =
"|float.h|math.h|sys/limits.h|"; "|sys/limits.h|float.h|math.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -4539,7 +4539,7 @@ tSCC zUltrix_Math_IfdefList[] = ...@@ -4539,7 +4539,7 @@ tSCC zUltrix_Math_IfdefList[] =
* content selection pattern - do fix if pattern found * content selection pattern - do fix if pattern found
*/ */
tSCC zUltrix_Math_IfdefSelect0[] = tSCC zUltrix_Math_IfdefSelect0[] =
"^#if.*\\|\\|[ \t]+CC\\$[a-z]+"; "^(#if.*)\\|\\|[ \t]+CC\\$[a-z]+";
#define ULTRIX_MATH_IFDEF_TEST_CT 1 #define ULTRIX_MATH_IFDEF_TEST_CT 1
tTestDesc aUltrix_Math_IfdefTests[] = { tTestDesc aUltrix_Math_IfdefTests[] = {
...@@ -4548,8 +4548,9 @@ tTestDesc aUltrix_Math_IfdefTests[] = { ...@@ -4548,8 +4548,9 @@ tTestDesc aUltrix_Math_IfdefTests[] = {
/* /*
* Fix Command Arguments for Ultrix_Math_Ifdef * Fix Command Arguments for Ultrix_Math_Ifdef
*/ */
const char* apzUltrix_Math_IfdefPatch[] = { "sed", const char* apzUltrix_Math_IfdefPatch[] = {
"-e", "/^#if/s/||[ \t][ \t]*CC$[a-z][a-z]*//", "format",
"%1",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -5101,25 +5102,32 @@ tSCC zX11_ClassList[] = ...@@ -5101,25 +5102,32 @@ tSCC zX11_ClassList[] =
#define apzX11_ClassMachs (const char**)NULL #define apzX11_ClassMachs (const char**)NULL
/* /*
* content selection pattern - do fix if pattern found
*/
tSCC zX11_ClassSelect0[] =
"^([ \t]*char \\*)class;(.*)";
/*
* content bypass pattern - skip fix if pattern found * content bypass pattern - skip fix if pattern found
*/ */
tSCC zX11_ClassBypass0[] = tSCC zX11_ClassBypass0[] =
"__cplusplus"; "__cplusplus";
#define X11_CLASS_TEST_CT 1 #define X11_CLASS_TEST_CT 2
tTestDesc aX11_ClassTests[] = { tTestDesc aX11_ClassTests[] = {
{ TT_NEGREP, zX11_ClassBypass0, (regex_t*)NULL }, }; { TT_NEGREP, zX11_ClassBypass0, (regex_t*)NULL },
{ TT_EGREP, zX11_ClassSelect0, (regex_t*)NULL }, };
/* /*
* Fix Command Arguments for X11_Class * Fix Command Arguments for X11_Class
*/ */
const char* apzX11_ClassPatch[] = { "sed", const char* apzX11_ClassPatch[] = {
"-e", "/char \\*class;/i\\\n\ "format",
#ifdef __cplusplus\\\n\ "#ifdef __cplusplus\n\
\tchar *c_class;\\\n\ %1c_class;%2\n\
#else\n", #else\n\
"-e", "/char \\*class;/a\\\n\ %1class;%2\n\
#endif\n", #endif",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -5249,7 +5257,7 @@ const char* apzX11_SprintfPatch[] = { ...@@ -5249,7 +5257,7 @@ const char* apzX11_SprintfPatch[] = {
* *
* List of all fixes * List of all fixes
*/ */
#define REGEX_COUNT 129 #define REGEX_COUNT 130
#define MACH_LIST_SIZE_LIMIT 279 #define MACH_LIST_SIZE_LIMIT 279
#define FIX_COUNT 130 #define FIX_COUNT 130
...@@ -5816,7 +5824,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ...@@ -5816,7 +5824,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
{ zUltrix_Math_IfdefName, zUltrix_Math_IfdefList, { zUltrix_Math_IfdefName, zUltrix_Math_IfdefList,
apzUltrix_Math_IfdefMachs, apzUltrix_Math_IfdefMachs,
ULTRIX_MATH_IFDEF_TEST_CT, FD_MACH_ONLY, ULTRIX_MATH_IFDEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aUltrix_Math_IfdefTests, apzUltrix_Math_IfdefPatch }, aUltrix_Math_IfdefTests, apzUltrix_Math_IfdefPatch },
{ zUltrix_Nested_IoctlName, zUltrix_Nested_IoctlList, { zUltrix_Nested_IoctlName, zUltrix_Nested_IoctlList,
...@@ -5886,7 +5894,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ...@@ -5886,7 +5894,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
{ zX11_ClassName, zX11_ClassList, { zX11_ClassName, zX11_ClassList,
apzX11_ClassMachs, apzX11_ClassMachs,
X11_CLASS_TEST_CT, FD_MACH_ONLY, X11_CLASS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aX11_ClassTests, apzX11_ClassPatch }, aX11_ClassTests, apzX11_ClassPatch },
{ zX11_Class_UsageName, zX11_Class_UsageList, { zX11_Class_UsageName, zX11_Class_UsageList,
......
...@@ -1305,8 +1305,8 @@ fix = { ...@@ -1305,8 +1305,8 @@ fix = {
*/ */
fix = { fix = {
hackname = limits_ifndefs; hackname = limits_ifndefs;
files = "limits.h";
files = "sys/limits.h"; files = "sys/limits.h";
files = "limits.h";
bypass = "ifndef[ \t]+FLT_MIN"; bypass = "ifndef[ \t]+FLT_MIN";
c_fix = format; c_fix = format;
...@@ -1520,8 +1520,8 @@ fix = { ...@@ -1520,8 +1520,8 @@ fix = {
fix = { fix = {
hackname = nested_motorola; hackname = nested_motorola;
mach = "m68k-motorola-sysv*"; mach = "m68k-motorola-sysv*";
files = limits.h;
files = sys/limits.h; files = sys/limits.h;
files = limits.h;
sed = "s@^\\(#undef[ \t][ \t]*PIPE_BUF[ \t]*" sed = "s@^\\(#undef[ \t][ \t]*PIPE_BUF[ \t]*"
"/\\* max # bytes atomic in write to a\\)$@\\1 */@"; "/\\* max # bytes atomic in write to a\\)$@\\1 */@";
sed = "s@\\(/\\*#define\tHUGE_VAL\t3.[0-9e+]* \\)" sed = "s@\\(/\\*#define\tHUGE_VAL\t3.[0-9e+]* \\)"
...@@ -2761,12 +2761,14 @@ fix = { ...@@ -2761,12 +2761,14 @@ fix = {
* Strip "|| CC$gfloat" from Ultrix math headers. * Strip "|| CC$gfloat" from Ultrix math headers.
*/ */
fix = { fix = {
hackname = ultrix_math_ifdef; hackname = ultrix_math_ifdef;
files = float.h; files = sys/limits.h;
files = math.h; files = float.h;
files = sys/limits.h; files = math.h;
select = "^#if.*\\|\\|[ \t]+CC\\$[a-z]+"; select = "^(#if.*)\\|\\|[ \t]+CC\\$[a-z]+";
sed = "/^#if/s/||[ \t][ \t]*CC$[a-z][a-z]*//"; c_fix = format;
c_fix_arg = "%1";
test_text = '#if defined(__GFLOAT) || CC\$gfloat'; test_text = '#if defined(__GFLOAT) || CC\$gfloat';
}; };
...@@ -3037,15 +3039,13 @@ fix = { ...@@ -3037,15 +3039,13 @@ fix = {
* we find __cplusplus in the file. These were found on the RS/6000. * we find __cplusplus in the file. These were found on the RS/6000.
*/ */
fix = { fix = {
hackname = x11_class; hackname = x11_class;
files = X11/ShellP.h; files = X11/ShellP.h;
bypass = __cplusplus; bypass = __cplusplus;
sed = "/char \\*class;/i\\\n" select = "^([ \t]*char \\*)class;(.*)";
"#ifdef __cplusplus\\\n" c_fix = format;
"\tchar *c_class;\\\n" c_fix_arg = "#ifdef __cplusplus\n%1c_class;%2\n"
"#else\n"; "#else\n%1class;%2\n#endif";
sed = "/char \\*class;/a\\\n"
"#endif\n";
test_text = test_text =
"struct {\n" "struct {\n"
" char *class;\n" " char *class;\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment