[Update all deprecated/discouraged Guile calls clinton@unknownlamer.org**20081111203422 * No longer use GH (removed entirely in Guile 1.9) * Update to more modern API (breaks Guile 1.6) ] { hunk ./source/BotInterp.C 3 -// Copyright (C) 2002,2005 Clinton Ebadi +// Copyright (C) 2002,2005,2008 Clinton Ebadi hunk ./source/BotInterp.C 77 - SCM r = scm_make_regexp(regex, - scm_listify (gh_lookup("regexp/icase"), - SCM_UNDEFINED)); + // fixme: really ought to use scm_c_module_lookup with bot module + SCM r = scm_make_regexp (regex, + scm_list_n (scm_variable_ref (scm_c_lookup ("regexp/icase")), + SCM_UNDEFINED)); hunk ./source/BotInterp.C 140 - return scm_long2num (c); + return scm_from_int (c); hunk ./source/BotInterp.C 146 - int count = scm_num2long(timer, SCM_ARG1, "BotInterp::DelTimer"); + int count = scm_to_int (timer); hunk ./source/BotInterp.C 169 - wd.args = scm_listify (SCM_UNDEFINED); + wd.args = scm_list_n (SCM_UNDEFINED); hunk ./source/Interp.C 3 -// Copyright (C) 2002,2005 Clinton Ebadi +// Copyright (C) 2002,2005,2008 Clinton Ebadi hunk ./source/Interp.C 120 - scm_c_define ("bot:exit-hook", scm_make_hook (scm_long2num (0))); + scm_c_define ("bot:exit-hook", scm_make_hook (scm_from_int (0))); hunk ./source/Interp.C 124 - scm_c_define ("bot:user-none", scm_long2num (User::NONE)); - scm_c_define ("bot:user-user", scm_long2num (User::USER)); - scm_c_define ("bot:user-trusted", scm_long2num (User::TRUSTED_USER)); - scm_c_define ("bot:user-friend", scm_long2num (User::FRIEND)); - scm_c_define ("bot:user-master", scm_long2num (User::MASTER)); + scm_c_define ("bot:user-none", scm_from_int (User::NONE)); + scm_c_define ("bot:user-user", scm_from_int (User::USER)); + scm_c_define ("bot:user-trusted", scm_from_int (User::TRUSTED_USER)); + scm_c_define ("bot:user-friend", scm_from_int (User::FRIEND)); + scm_c_define ("bot:user-master", scm_from_int (User::MASTER)); hunk ./source/Interp.C 131 - scm_c_define ("bot:protection/none", scm_long2num (User::NO_PROT)); - scm_c_define ("bot:protection/no-ban", scm_long2num (User::NO_BAN)); - scm_c_define ("bot:protection/no-kick", scm_long2num (User::NO_KICK)); - scm_c_define ("bot:protection/no-deop", scm_long2num (User::NO_DEOP)); + scm_c_define ("bot:protection/none", scm_from_int (User::NO_PROT)); + scm_c_define ("bot:protection/no-ban", scm_from_int (User::NO_BAN)); + scm_c_define ("bot:protection/no-kick", scm_from_int (User::NO_KICK)); + scm_c_define ("bot:protection/no-deop", scm_from_int (User::NO_DEOP)); hunk ./source/Interp.C 137 - scm_c_define ("bot:aop/yes", scm_long2num (true)); - scm_c_define ("bot:aop/no", scm_long2num (false)); + scm_c_define ("bot:aop/yes", scm_from_int (true)); + scm_c_define ("bot:aop/no", scm_from_int (false)); hunk ./source/Interp.C 141 - scm_c_define ("bot:shit/none", scm_long2num (ShitEntry::SHIT_NOSHIT)); - scm_c_define ("bot:shit/no-op", scm_long2num (ShitEntry::SHIT_NOOP)); - scm_c_define ("bot:shit/no-join", scm_long2num (ShitEntry::SHIT_NOJOIN)); + scm_c_define ("bot:shit/none", scm_from_int (ShitEntry::SHIT_NOSHIT)); + scm_c_define ("bot:shit/no-op", scm_from_int (ShitEntry::SHIT_NOOP)); + scm_c_define ("bot:shit/no-join", scm_from_int (ShitEntry::SHIT_NOJOIN)); hunk ./source/Interp.C 145 - scm_long2num (ShitEntry::SHIT_NODEBAN)); + scm_from_int (ShitEntry::SHIT_NODEBAN)); hunk ./source/Interp.C 149 - scm_makfrom0str (String(PREFIX) + - "/share/bobotpp/scripts/")); + scm_from_locale_string (String(PREFIX) + + "/share/bobotpp/scripts/")); hunk ./source/Interp.C 152 - scm_c_define ("hooks/action", scm_long2num(Hook::ACTION)); - scm_c_define ("hooks/nickname", scm_long2num(Hook::NICKNAME)); - scm_c_define ("hooks/signoff", scm_long2num(Hook::SIGNOFF)); - scm_c_define ("hooks/ctcp", scm_long2num(Hook::CTCP)); - scm_c_define ("hooks/ctcp-reply", scm_long2num(Hook::CTCP_REPLY)); - scm_c_define ("hooks/disconnect", scm_long2num(Hook::DISCONNECT)); - scm_c_define ("hooks/flood", scm_long2num(Hook::FLOOD)); - scm_c_define ("hooks/invite", scm_long2num(Hook::INVITE)); - scm_c_define ("hooks/join", scm_long2num(Hook::JOIN)); - scm_c_define ("hooks/kick", scm_long2num(Hook::KICK)); - scm_c_define ("hooks/mode", scm_long2num(Hook::MODE)); - scm_c_define ("hooks/message", scm_long2num(Hook::MESSAGE)); - scm_c_define ("hooks/notice", scm_long2num(Hook::NOTICE)); - scm_c_define ("hooks/part", scm_long2num(Hook::PART)); - scm_c_define ("hooks/public", scm_long2num(Hook::PUBLIC)); - scm_c_define ("hooks/public-notice", scm_long2num(Hook::PUBLIC_NOTICE)); - scm_c_define ("hooks/raw", scm_long2num(Hook::RAW)); - scm_c_define ("hooks/timer", scm_long2num(Hook::TIMER)); - scm_c_define ("hooks/topic", scm_long2num(Hook::TOPIC)); + scm_c_define ("hooks/action", scm_from_int(Hook::ACTION)); + scm_c_define ("hooks/nickname", scm_from_int(Hook::NICKNAME)); + scm_c_define ("hooks/signoff", scm_from_int(Hook::SIGNOFF)); + scm_c_define ("hooks/ctcp", scm_from_int(Hook::CTCP)); + scm_c_define ("hooks/ctcp-reply", scm_from_int(Hook::CTCP_REPLY)); + scm_c_define ("hooks/disconnect", scm_from_int(Hook::DISCONNECT)); + scm_c_define ("hooks/flood", scm_from_int(Hook::FLOOD)); + scm_c_define ("hooks/invite", scm_from_int(Hook::INVITE)); + scm_c_define ("hooks/join", scm_from_int(Hook::JOIN)); + scm_c_define ("hooks/kick", scm_from_int(Hook::KICK)); + scm_c_define ("hooks/mode", scm_from_int(Hook::MODE)); + scm_c_define ("hooks/message", scm_from_int(Hook::MESSAGE)); + scm_c_define ("hooks/notice", scm_from_int(Hook::NOTICE)); + scm_c_define ("hooks/part", scm_from_int(Hook::PART)); + scm_c_define ("hooks/public", scm_from_int(Hook::PUBLIC)); + scm_c_define ("hooks/public-notice", scm_from_int(Hook::PUBLIC_NOTICE)); + scm_c_define ("hooks/raw", scm_from_int(Hook::RAW)); + scm_c_define ("hooks/timer", scm_from_int(Hook::TIMER)); + scm_c_define ("hooks/topic", scm_from_int(Hook::TOPIC)); hunk ./source/Interp.C 172 - scm_c_define ("hooks/send/public", scm_long2num (Hook::SEND_PUBLIC)); - scm_c_define ("hooks/send/message", scm_long2num (Hook::SEND_MESSAGE)); - scm_c_define ("hooks/send/action", scm_long2num (Hook::SEND_ACTION)); - scm_c_define ("hooks/send/ctcp", scm_long2num (Hook::SEND_CTCP)); - scm_c_define ("hooks/send/who", scm_long2num (Hook::SEND_WHO)); - scm_c_define ("hooks/send/whois", scm_long2num (Hook::SEND_WHOIS)); + scm_c_define ("hooks/send/public", scm_from_int (Hook::SEND_PUBLIC)); + scm_c_define ("hooks/send/message", scm_from_int (Hook::SEND_MESSAGE)); + scm_c_define ("hooks/send/action", scm_from_int (Hook::SEND_ACTION)); + scm_c_define ("hooks/send/ctcp", scm_from_int (Hook::SEND_CTCP)); + scm_c_define ("hooks/send/who", scm_from_int (Hook::SEND_WHO)); + scm_c_define ("hooks/send/whois", scm_from_int (Hook::SEND_WHOIS)); hunk ./source/Interp.C 180 - scm_long2num (Hook::DCC_CHAT_BEGIN)); + scm_from_int (Hook::DCC_CHAT_BEGIN)); hunk ./source/Interp.C 182 - scm_long2num (Hook::DCC_CHAT_END)); + scm_from_int (Hook::DCC_CHAT_END)); hunk ./source/Interp.C 184 - scm_long2num (Hook::DCC_CHAT_MESSAGE)); + scm_from_int (Hook::DCC_CHAT_MESSAGE)); hunk ./source/Interp.C 285 - (scm_makfrom0str (String(PREFIX) + - "/share/bobotpp/scripts/bobot-utils.scm")); + (scm_from_locale_string (String(PREFIX) + + "/share/bobotpp/scripts/bobot-utils.scm")); hunk ./source/Interp.C 310 - scm_c_run_hook (gh_lookup ("bot:exit-hook"), SCM_EOL); + scm_c_run_hook (scm_variable_ref (scm_c_module_lookup (bot_module, + "bot:exit-hook")), + SCM_EOL); hunk ./source/Parser.C 84 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 362 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 385 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 455 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 513 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 545 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 592 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 601 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 618 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 658 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 719 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 764 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 790 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 824 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 889 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 911 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 924 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/Parser.C 1025 - SCM args_list = scm_listify (SCM_UNDEFINED); + SCM args_list = scm_list_n (SCM_UNDEFINED); hunk ./source/Parser.C 1028 - args_list = gh_append2 (args_list, - scm_listify (Utils:: - str2scm (channel), - SCM_UNDEFINED)); + args_list = scm_append (scm_list_2 (args_list, + scm_list_n (Utils:: + str2scm (channel), + SCM_UNDEFINED))); hunk ./source/Parser.C 1042 - args_list = gh_append2 (args_list, - scm_listify (Utils::str2scm (param), - SCM_UNDEFINED)); + args_list = scm_append (scm_list_2 (args_list, + scm_list_n (Utils::str2scm (param), + SCM_UNDEFINED))); hunk ./source/ScriptCommands.C 3 -// Copyright (C) 2002,2005 Clinton Ebadi +// Copyright (C) 2002,2005,2008 Clinton Ebadi hunk ./source/ScriptCommands.C 39 -#define VERIFY_STRING(par) if (!SCM_STRINGP((par))) \ - return scm_long2num(-17) +#define VERIFY_STRING(par) if (!scm_is_string((par))) \ + return scm_from_int(-17) hunk ./source/ScriptCommands.C 43 - return scm_long2num(-17) + return scm_from_int(-17) hunk ./source/ScriptCommands.C 52 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 85 - int protect = scm_num2int (prot, SCM_ARG1, "ScriptCommands::AddUser"); - bool aaop = SCM_NFALSEP (aop); - int llevel = scm_num2int (level, SCM_ARG1, - "ScriptCommands::AddUser"); + int protect = scm_to_int (prot); + bool aaop = scm_is_true (aop); + int llevel = scm_to_int (level); hunk ./source/ScriptCommands.C 92 - return scm_long2num(m.getCode ()); + return scm_from_int(m.getCode ()); hunk ./source/ScriptCommands.C 100 - p = scm_num2long(port, SCM_ARG1, "ScriptCommands::AddServer"); + p = scm_to_int (port); hunk ./source/ScriptCommands.C 104 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 117 - int llevel = scm_num2int (level, SCM_ARG1, "ScriptCommands::AddShit"); + int llevel = scm_to_int (level); hunk ./source/ScriptCommands.C 139 - return scm_long2num(m.getCode ()); + return scm_from_int(m.getCode ()); hunk ./source/ScriptCommands.C 149 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 158 - SCM_STRING_COERCE_0TERMINATION_X (command); - std::string ccommand = SCM_STRING_CHARS (command); - unsigned int llevel = scm_num2uint - (level, 0, "ScriptCommands::ChangeCommandLevel"); + std::string ccommand = scm_to_locale_string (command); + unsigned int llevel = scm_to_uint (level); hunk ./source/ScriptCommands.C 211 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 221 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 228 - Message m = Commands::DelServer(Interp::bot, - scm_num2long(number, SCM_ARG1, - "ScriptCommands::DelServer")); - return scm_long2num(m.getCode()); + Message m = Commands::DelServer(Interp::bot, scm_to_int (number)); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 239 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 249 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 259 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 266 - if (SCM_STRINGP(reason)) + if (scm_is_string(reason)) hunk ./source/ScriptCommands.C 269 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 277 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 287 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 295 - if (SCM_STRINGP(key)) + if (scm_is_string(key)) hunk ./source/ScriptCommands.C 299 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 309 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 319 - if (SCM_STRINGP(reason)) + if (scm_is_string(reason)) hunk ./source/ScriptCommands.C 324 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 333 - if (SCM_STRINGP(reason)) + if (scm_is_string(reason)) hunk ./source/ScriptCommands.C 337 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 345 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 361 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 371 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 379 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 387 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 396 - return (scm_long2num + return (scm_from_int hunk ./source/ScriptCommands.C 410 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 418 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 425 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 435 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 442 - Message m = Commands::Server(Interp::bot, gh_scm2long(number)); - return scm_long2num(m.getCode()); + Message m = Commands::Server(Interp::bot, scm_to_int(number)); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 450 - Message m = Commands::SetFloodRate(Interp::bot, scm_num2uint - (rate, 0, "SetFloodRate")); - return scm_long2num(m.getCode()); + Message m = Commands::SetFloodRate(Interp::bot, scm_to_uint (rate)); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 458 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 468 - Utils::scm2str(who), gh_scm2long(seconds)); - return scm_long2num(m.getCode()); + Utils::scm2str(who), scm_to_int(seconds)); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 479 - if (SCM_STRINGP(reason)) + if (scm_is_string(reason)) hunk ./source/ScriptCommands.C 483 - gh_scm2long(seconds), r); - return scm_long2num(m.getCode()); + scm_to_int(seconds), r); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 494 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 502 - return scm_long2num(m.getCode()); + return scm_from_int(m.getCode()); hunk ./source/ScriptCommands.C 512 - return scm_long2num (m.getCode ()); + return scm_from_int (m.getCode ()); hunk ./source/ScriptCommands.C 522 - return scm_long2num (m.getCode ()); + return scm_from_int (m.getCode ()); hunk ./source/ScriptCommands.C 537 - return gh_list(scm_long2num(serverNumber), + return scm_list_n(scm_from_int(serverNumber), hunk ./source/ScriptCommands.C 539 - scm_long2num(serv->getPort()), + scm_from_int(serv->getPort()), hunk ./source/ScriptCommands.C 547 - SCM res = gh_list(SCM_UNDEFINED); + SCM res = scm_list_n(SCM_UNDEFINED); hunk ./source/ScriptCommands.C 555 - res = gh_append2(res, - gh_list(gh_list(scm_long2num(i++), - Utils::str2scm(s->getHostName()), - scm_long2num(s->getPort()), - Utils::str2scm(s->getPassword()), - SCM_UNDEFINED), SCM_UNDEFINED)); - } + res = + scm_append + (scm_list_2 (res, + scm_list_n(scm_list_n(scm_from_int(i++), + Utils::str2scm(s->getHostName()), + scm_from_int(s->getPort()), + Utils::str2scm(s->getPassword()), + SCM_UNDEFINED), SCM_UNDEFINED))); + } hunk ./source/ScriptCommands.C 589 - max = gh_scm2int(scm_max); - return scm_long2num(max ? rand() % max : 0); + max = scm_to_int(scm_max); + return scm_from_int(max ? rand() % max : 0); hunk ./source/ScriptCommands.C 599 - if (!SCM_STRINGP(scm_commandName)) + if (!scm_is_string(scm_commandName)) hunk ./source/ScriptCommands.C 608 - if (!gh_boolean_p(scm_needsChannel)) + if (!scm_is_bool (scm_needsChannel)) hunk ./source/ScriptCommands.C 610 - bool needsChannel = gh_scm2bool(scm_needsChannel); + bool needsChannel = scm_to_bool(scm_needsChannel); hunk ./source/ScriptCommands.C 617 - int minLevel = gh_scm2long(scm_minLevel); + int minLevel = scm_to_int(scm_minLevel); hunk ./source/ScriptCommands.C 622 - if (!gh_procedure_p(scm_function)) + if (!scm_is_true (scm_procedure_p(scm_function))) hunk ./source/ScriptCommands.C 629 - int args = gh_scm2long(scm_args); + int args = scm_to_int(scm_args); hunk ./source/ScriptCommands.C 644 - if (!SCM_STRINGP(scm_commandName)) + if (!scm_is_string(scm_commandName)) hunk ./source/ScriptCommands.C 667 - priority = scm_num2int (pri, SCM_ARG1, "ScriptCommands::AddHook"); + priority = scm_to_int (pri); hunk ./source/ScriptCommands.C 669 - fallt = SCM_NFALSEP (fall); + fallt = scm_is_true (fall); hunk ./source/ScriptCommands.C 672 - return SCM_BOOL (Interp::bot->botInterp->AddHook(gh_scm2long(type), + return scm_from_bool (Interp::bot->botInterp->AddHook(scm_to_int(type), hunk ./source/ScriptCommands.C 680 - return Interp::bot->botInterp->AddTimer(gh_scm2long(when), function); + return Interp::bot->botInterp->AddTimer(scm_to_int(when), function); hunk ./source/ScriptCommands.C 686 - return SCM_BOOL (Interp::bot->botInterp->DelTimer(timer)); + return scm_from_bool (Interp::bot->botInterp->DelTimer(timer)); hunk ./source/ScriptCommands.C 693 - return SCM_BOOL (Interp::bot->dccConnections->sendMessage + return scm_from_bool (Interp::bot->dccConnections->sendMessage hunk ./source/ServerQueue.C 3 -// Copyright (C) 2002,2005 Clinton Ebadi +// Copyright (C) 2002,2005,2008 Clinton Ebadi hunk ./source/ServerQueue.C 118 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/ServerQueue.C 130 - scm_listify (Utils:: + scm_list_n (Utils:: hunk ./source/ServerQueue.C 245 - scm_listify + scm_list_n hunk ./source/ServerQueue.C 256 - scm_listify (Utils::str2scm (Interp::bot->nickName), + scm_list_n (Utils::str2scm (Interp::bot->nickName), hunk ./source/Utils.C 3 -// Copyright (c) 2005 Clinton Ebadi +// Copyright (c) 2005,2008 Clinton Ebadi hunk ./source/Utils.C 309 - char *tmp = gh_scm2newstr(s, 0); + char *tmp = scm_to_locale_string (s); hunk ./source/Utils.C 321 - return gh_str02scm (s.c_str ()); + return scm_from_locale_string (s.c_str ()); }