- if (paste && n > 0 && exp_tokens[n - 1] &&
- (new_tok = psi_token_cat(NULL, 2, exp_tokens[n - 1], tok))) {
- free(exp_tokens[n - 1]);
+ if (paste && n > 0 && exp_tokens[n - 1]) {
+ struct psi_token *old_tok = exp_tokens[n - 1];
+
+ new_tok = psi_token_init(old_tok->type, "", 0,
+ target->col, target->line, target->file);
+
+ new_tok = psi_token_cat(NULL, 2, new_tok, old_tok, tok);
+ free(old_tok);
+