diff --git a/lib/7.2/modules/__default.pmod b/lib/7.2/modules/__default.pmod index f0294135764f4ed8fe085985899a140533d4b94f..5d4b3a1096169523c54ae0deb8e8b7ac27d7d28e 100644 --- a/lib/7.2/modules/__default.pmod +++ b/lib/7.2/modules/__default.pmod @@ -97,6 +97,7 @@ object new(string|program prog, mixed ... args) function(string|program, mixed ... : object) clone = new; // spider +#pragma no_deprecation_warnings #define SPIDER(X) constant X = spider.##X //! @ignore diff --git a/src/modules/spider/spider.c b/src/modules/spider/spider.c index 19b719198070d8d5514fe43c2ec4fc761ec3c4a0..cb6cef4cbc13f1830fcdb930be53269436f39187 100644 --- a/src/modules/spider/spider.c +++ b/src/modules/spider/spider.c @@ -1105,27 +1105,27 @@ PIKE_MODULE_INIT pop_stack(); ADD_FUNCTION("_low_program_name",f__low_program_name, - tFunc(tPrg(tObj),tStr),0); + tDeprecated(tFunc(tPrg(tObj),tStr)),0); /* function(int:int) */ ADD_FUNCTION("set_start_quote",f_set_start_quote, - tFunc(tInt,tInt),OPT_EXTERNAL_DEPEND); + tDeprecated(tFunc(tInt,tInt)),OPT_EXTERNAL_DEPEND); /* function(int:int) */ ADD_FUNCTION("set_end_quote",f_set_end_quote, - tFunc(tInt,tInt),OPT_EXTERNAL_DEPEND); + tDeprecated(tFunc(tInt,tInt)),OPT_EXTERNAL_DEPEND); /* function(string:array) */ ADD_FUNCTION("parse_accessed_database", f_parse_accessed_database, - tFunc(tStr,tArray), OPT_TRY_OPTIMIZE); + tDeprecated(tFunc(tStr,tArray)), OPT_TRY_OPTIMIZE); /* function(:array(array)) */ ADD_FUNCTION("_dump_obj_table", f__dump_obj_table, - tFunc(tNone,tArr(tArray)), OPT_EXTERNAL_DEPEND); + tDeprecated(tFunc(tNone,tArr(tArray))), OPT_EXTERNAL_DEPEND); ADD_FUNCTION("parse_html",f_parse_html, - tFuncV(tStr + tDeprecated(tFuncV(tStr tMap(tStr,tOr(tStr, tFuncV(tOr(tStr,tVoid) tOr(tMap(tStr,tStr),tVoid), @@ -1138,12 +1138,12 @@ PIKE_MODULE_INIT tMix, tOr(tStr,tArr(tStr))))), tMix, - tStr), + tStr)), OPT_SIDE_EFFECT); ADD_FUNCTION("parse_html_lines",f_parse_html_lines, - tFuncV(tStr + tDeprecated(tFuncV(tStr tMap(tStr,tOr(tStr, tFuncV(tOr(tStr,tVoid) tOr(tMap(tStr,tStr),tVoid) @@ -1158,21 +1158,22 @@ PIKE_MODULE_INIT tMix, tOr(tStr,tArr(tStr))))), tMix, - tStr), + tStr)), 0); /* function(int:array) */ - ADD_FUNCTION("discdate", f_discdate,tFunc(tInt,tArray), 0); + ADD_FUNCTION("discdate", f_discdate, tDeprecated(tFunc(tInt,tArray)), 0); /* function(int,void|int:int) */ - ADD_FUNCTION("stardate", f_stardate,tFunc(tInt tInt,tInt), 0); + ADD_FUNCTION("stardate", f_stardate, tDeprecated(tFunc(tInt tInt,tInt)), 0); /* function(:array(int)) */ ADD_FUNCTION("get_all_active_fd", f_get_all_active_fd, - tFunc(tNone,tArr(tInt)), OPT_EXTERNAL_DEPEND); + tDeprecated(tFunc(tNone,tArr(tInt))), OPT_EXTERNAL_DEPEND); /* function(int:string) */ - ADD_FUNCTION("fd_info", f_fd_info,tFunc(tInt,tStr), OPT_EXTERNAL_DEPEND); + ADD_FUNCTION("fd_info", f_fd_info, tDeprecated(tFunc(tInt,tStr)), + OPT_EXTERNAL_DEPEND); } diff --git a/src/modules/spider/testsuite.in b/src/modules/spider/testsuite.in index 90122ffbc0c8ba9a3905b6350ea22f66bf435f5f..1957bf41f5dbb1376c99805a1ddab11723e5f6e6 100644 --- a/src/modules/spider/testsuite.in +++ b/src/modules/spider/testsuite.in @@ -11,8 +11,11 @@ dnl parse_html define(test_spider,[[ test_eq([[ #pike 7.2 +#pragma no_deprecation_warnings $1]],$2) - test_eq([[spider.$1]],$2) + test_eq([[ +#pragma no_deprecation_warnings +spider.$1]],$2) ]]) test_spider([[parse_html("f<bar>o", ([ "bar":"o" ]), ([]))]], "foo")