}
/* ast parser, the way we pass context around is very very hacky... */
-searchNode *search_astparse(searchCtx *ctx, int type, char *loc) {
+searchNode *search_astparse(searchCtx *ctx, char *loc) {
searchASTCache *cache = ctx->arg;
searchASTExpr *expr = cachesearch(cache, (exprunion *)&loc);
searchNode *node;
}
}
- node = expr->u.child->fn(ctx, type, expr->u.child->argc, v);
+ node = expr->u.child->fn(ctx, expr->u.child->argc, v);
free(v);
return node;
default:
}
}
-int ast_nicksearch(searchASTExpr *tree, replyFunc reply, void *sender, wallFunc wall, NickDisplayFunc display, int limit) {
+int ast_nicksearch(searchASTExpr *tree, replyFunc reply, void *sender, wallFunc wall, NickDisplayFunc display, HeaderFunc header, void *headerarg, int limit) {
searchCtx ctx;
searchASTCache cache;
searchNode *search;
memset(&cache, 0, sizeof(cache));
cache.tree = tree;
- ctx.reply = reply;
- ctx.wall = wall;
- ctx.parser = search_astparse;
- ctx.arg = (void *)&cache;
+ newsearch_ctxinit(&ctx, search_astparse, reply, wall, &cache, reg_nicksearch);
buf[0] = '\0';
- reply(sender, "Parsing: %s", ast_printtree(buf, sizeof(buf), tree));
- search = ctx.parser(&ctx, SEARCHTYPE_NICK, (char *)tree);
+ reply(sender, "Parsing: %s", ast_printtree(buf, sizeof(buf), tree, reg_nicksearch));
+ search = ctx.parser(&ctx, (char *)tree);
if(!search) {
reply(sender, "Parse error: %s", parseError);
return CMD_ERROR;
}
reply(sender, "Executing...");
+ if(header)
+ header(sender, headerarg);
nicksearch_exe(search, &ctx, sender, display, limit);
(search->free)(&ctx, search);
return CMD_OK;
}
-int ast_chansearch(searchASTExpr *tree, replyFunc reply, void *sender, wallFunc wall, ChanDisplayFunc display, int limit) {
+int ast_chansearch(searchASTExpr *tree, replyFunc reply, void *sender, wallFunc wall, ChanDisplayFunc display, HeaderFunc header, void *headerarg, int limit) {
searchCtx ctx;
searchASTCache cache;
searchNode *search;
char buf[1024];
- ctx.reply = reply;
- ctx.wall = wall;
- ctx.parser = search_astparse;
- ctx.arg = (void *)&cache;
+ newsearch_ctxinit(&ctx, search_astparse, reply, wall, &cache, reg_chansearch);
buf[0] = '\0';
- reply(sender, "Parsing: %s", ast_printtree(buf, sizeof(buf), tree));
- search = ctx.parser(&ctx, SEARCHTYPE_CHANNEL, (char *)tree);
+ reply(sender, "Parsing: %s", ast_printtree(buf, sizeof(buf), tree, reg_chansearch));
+ search = ctx.parser(&ctx, (char *)tree);
if(!search) {
reply(sender, "Parse error: %s", parseError);
return CMD_ERROR;
}
reply(sender, "Executing...");
+ if(header)
+ header(sender, headerarg);
chansearch_exe(search, &ctx, sender, display, limit);
(search->free)(&ctx, search);
return CMD_OK;
}
-int ast_usersearch(searchASTExpr *tree, replyFunc reply, void *sender, wallFunc wall, UserDisplayFunc display, int limit) {
+int ast_usersearch(searchASTExpr *tree, replyFunc reply, void *sender, wallFunc wall, UserDisplayFunc display, HeaderFunc header, void *headerarg, int limit) {
searchCtx ctx;
searchASTCache cache;
searchNode *search;
memset(&cache, 0, sizeof(cache));
cache.tree = tree;
- ctx.reply = reply;
- ctx.wall = wall;
- ctx.parser = search_astparse;
- ctx.arg = (void *)&cache;
+ newsearch_ctxinit(&ctx, search_astparse, reply, wall, &cache, reg_usersearch);
buf[0] = '\0';
- reply(sender, "Parsing: %s", ast_printtree(buf, sizeof(buf), tree));
- search = ctx.parser(&ctx, SEARCHTYPE_USER, (char *)tree);
+ reply(sender, "Parsing: %s", ast_printtree(buf, sizeof(buf), tree, reg_usersearch));
+ search = ctx.parser(&ctx, (char *)tree);
if(!search) {
reply(sender, "Parse error: %s", parseError);
return CMD_ERROR;
}
reply(sender, "Executing...");
+ if(header)
+ header(sender, headerarg);
usersearch_exe(search, &ctx, sender, display, limit);
(search->free)(&ctx, search);
/* horribly inefficient -- don't call me very often! */
-static char *ast_printtree_real(StringBuf *buf, searchASTExpr *expr) {
+static char *ast_printtree_real(StringBuf *buf, searchASTExpr *expr, searchCmd *cmd) {
char lbuf[256];
if(expr->type == AST_NODE_CHILD) {
int i;
- sstring *command = getcommandname(searchTree, (void *)expr->u.child->fn);
+ sstring *command = getcommandname(cmd->searchtree, (void *)expr->u.child->fn);
if(command) {
snprintf(lbuf, sizeof(lbuf), "(%s", command->content);
for(i=0;i<expr->u.child->argc;i++) {
sbaddchar(buf, ' ');
- ast_printtree_real(buf, expr->u.child->argv[i]);
+ ast_printtree_real(buf, expr->u.child->argv[i], cmd);
}
sbaddchar(buf, ')');
return buf->buf;
}
-char *ast_printtree(char *buf, size_t bufsize, searchASTExpr *expr) {
+char *ast_printtree(char *buf, size_t bufsize, searchASTExpr *expr, searchCmd *cmd) {
StringBuf b;
char *p;
b.len = 0;
b.buf = buf;
- p = ast_printtree_real(&b, expr);
+ p = ast_printtree_real(&b, expr, cmd);
sbterminate(&b);
return p;