From cac49afdef0992b93d8718fd928d73d721d434f4 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 20 May 2014 20:33:25 -0700 Subject: :%s/^\( *\)\([^ ].*\)\?\(LOG\|PRINTF\)[A-Z_]*(\(.*,\n\)\+\zs\(\1 [^ ]\)\@! */\1 / --- src/map/magic-expr.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/map/magic-expr.cpp') diff --git a/src/map/magic-expr.cpp b/src/map/magic-expr.cpp index 2ae9b20..3631ca7 100644 --- a/src/map/magic-expr.cpp +++ b/src/map/magic-expr.cpp @@ -598,7 +598,7 @@ void magic_area_rect(map_local **m, int *x, int *y, int *width, int *height, default: FPRINTF(stderr, - "Error: Trying to compute area of NE/SE/NW/SW-facing bar"_fmt); + "Error: Trying to compute area of NE/SE/NW/SW-facing bar"_fmt); *x = tx; *y = ty; *width = *height = 1; @@ -1581,8 +1581,8 @@ int magic_signature_check(ZString opname, ZString funname, ZString signature, if (!ty_key) { FPRINTF(stderr, - "[magic-eval]: L%d:%d: Too many arguments (%zu) to %s `%s'\n"_fmt, - line, column, args.size(), opname, funname); + "[magic-eval]: L%d:%d: Too many arguments (%zu) to %s `%s'\n"_fmt, + line, column, args.size(), opname, funname); return 1; } @@ -1595,8 +1595,8 @@ int magic_signature_check(ZString opname, ZString funname, ZString signature, if (ty == TYPE::UNDEF) { FPRINTF(stderr, - "[magic-eval]: L%d:%d: Argument #%d to %s `%s' undefined\n"_fmt, - line, column, i + 1, opname, funname); + "[magic-eval]: L%d:%d: Argument #%d to %s `%s' undefined\n"_fmt, + line, column, i + 1, opname, funname); return 1; } @@ -1627,9 +1627,9 @@ int magic_signature_check(ZString opname, ZString funname, ZString signature, { /* Coercion failed? */ if (ty != TYPE::FAIL) FPRINTF(stderr, - "[magic-eval]: L%d:%d: Argument #%d to %s `%s' of incorrect type (%d)\n"_fmt, - line, column, i + 1, opname, funname, - ty); + "[magic-eval]: L%d:%d: Argument #%d to %s `%s' of incorrect type (%d)\n"_fmt, + line, column, i + 1, opname, funname, + ty); return 1; } } @@ -1721,8 +1721,8 @@ void magic_eval(dumb_ptr env, val_t *dest, dumb_ptr expr) else { FPRINTF(stderr, - "[magic] Attempt to access field %s on non-spell\n"_fmt, - env->base_env->varv[id].name); + "[magic] Attempt to access field %s on non-spell\n"_fmt, + env->base_env->varv[id].name); dest->ty = TYPE::FAIL; } break; @@ -1730,8 +1730,8 @@ void magic_eval(dumb_ptr env, val_t *dest, dumb_ptr expr) default: FPRINTF(stderr, - "[magic] INTERNAL ERROR: Unknown expression type %d\n"_fmt, - expr->ty); + "[magic] INTERNAL ERROR: Unknown expression type %d\n"_fmt, + expr->ty); break; } } -- cgit v1.2.3-60-g2f50