Change so extra methods and classes only cause a warning instead of failure.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7389 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
2ae026aa6f
commit
99cbf36b3f
1 changed files with 14 additions and 4 deletions
|
|
@ -82,10 +82,11 @@ class check {
|
||||||
}
|
}
|
||||||
$extra=array_keys($classmethods);
|
$extra=array_keys($classmethods);
|
||||||
if ($missing) $message[]="does not have these methods:\n ".join(",",$missing);
|
if ($missing) $message[]="does not have these methods:\n ".join(",",$missing);
|
||||||
if ($extra) $message[]="does have these extra methods:\n ".join(",",$extra);
|
|
||||||
if ($message) {
|
if ($message) {
|
||||||
return check::fail("Class %s %s\nFull class list:\n %s\n",$classname,join("\nbut ",$message),join("\n ",get_class_methods($classname)));
|
return check::fail("Class %s %s\nFull class list:\n %s\n",$classname,join("\nbut ",$message),join("\n ",get_class_methods($classname)));
|
||||||
}
|
}
|
||||||
|
if ($extra) $message[]="does have these extra methods:\n ".join(",",$extra);
|
||||||
|
if ($message) return check::warn(join("\n ",$message));
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -133,8 +134,9 @@ class check {
|
||||||
else unset($extra[$class]);
|
else unset($extra[$class]);
|
||||||
}
|
}
|
||||||
if ($missing) $message[]=sprintf("Classes missing: %s",join(",",$missing));
|
if ($missing) $message[]=sprintf("Classes missing: %s",join(",",$missing));
|
||||||
if ($extra) $message[]=sprintf("These extra classes are defined: %s",join(",",array_keys($extra)));
|
|
||||||
if ($message) return check::fail(join("\n ",$message));
|
if ($message) return check::fail(join("\n ",$message));
|
||||||
|
if ($extra) $message[]=sprintf("These extra classes are defined: %s",join(",",array_keys($extra)));
|
||||||
|
if ($message) return check::warn(join("\n ",$message));
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -149,8 +151,9 @@ class check {
|
||||||
else unset($extra[$func]);
|
else unset($extra[$func]);
|
||||||
}
|
}
|
||||||
if ($missing) $message[]=sprintf("Functions missing: %s",join(",",$missing));
|
if ($missing) $message[]=sprintf("Functions missing: %s",join(",",$missing));
|
||||||
if ($extra) $message[]=sprintf("These extra methods are defined: %s",join(",",array_keys($extra)));
|
|
||||||
if ($message) return check::fail(join("\n ",$message));
|
if ($message) return check::fail(join("\n ",$message));
|
||||||
|
if ($extra) $message[]=sprintf("These extra methods are defined: %s",join(",",array_keys($extra)));
|
||||||
|
if ($message) return check::warn(join("\n ",$message));
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -169,8 +172,9 @@ class check {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($missing) $message[]=sprintf("Globals missing: %s",join(",",$missing));
|
if ($missing) $message[]=sprintf("Globals missing: %s",join(",",$missing));
|
||||||
if ($extra) $message[]=sprintf("These extra globals are defined: %s",join(",",array_keys($extra)));
|
|
||||||
if ($message) return check::fail(join("\n ",$message));
|
if ($message) return check::fail(join("\n ",$message));
|
||||||
|
if ($extra) $message[]=sprintf("These extra globals are defined: %s",join(",",array_keys($extra)));
|
||||||
|
if ($message) return check::warn(join("\n ",$message));
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -210,6 +214,12 @@ class check {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function warn($pattern) {
|
||||||
|
$args=func_get_args();
|
||||||
|
print("Warning on: ".call_user_func_array("sprintf",$args)."\n");
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
function done() {
|
function done() {
|
||||||
print $_SERVER[argv][0]." ok\n";
|
print $_SERVER[argv][0]." ok\n";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue