break;
case PSI_T_ENDIF:
case PSI_T_ELSE:
- case PSI_T_ONCE:
+ case PSI_T_PRAGMA_ONCE:
break;
default:
assert(0);
break;
case PSI_T_ENDIF:
case PSI_T_ELSE:
- case PSI_T_ONCE:
+ case PSI_T_PRAGMA_ONCE:
break;
default:
assert(0);
case PSI_T_UNDEF:
case PSI_T_IFDEF:
case PSI_T_IFNDEF:
+ dprintf(fd, "%s", exp->data.tok->text);
+ break;
case PSI_T_IMPORT:
case PSI_T_INCLUDE:
case PSI_T_INCLUDE_NEXT:
- dprintf(fd, "%s", exp->data.tok->text);
+ if (exp->data.tok->type == PSI_T_CPP_HEADER) {
+ dprintf(fd, "<%s>", exp->data.tok->text);
+ } else {
+ dprintf(fd, "\"%s\"", exp->data.tok->text);
+ }
break;
case PSI_T_DEFINE:
psi_cpp_macro_decl_dump(fd, exp->data.decl);
break;
case PSI_T_ENDIF:
case PSI_T_ELSE:
- case PSI_T_ONCE:
+ case PSI_T_PRAGMA_ONCE:
break;
default:
assert(0);
break;
case PSI_T_INCLUDE:
if (!cpp->skip) {
- if (!psi_cpp_include(cpp, exp->data.tok->text, PSI_CPP_INCLUDE)) {
+ if (!psi_cpp_include(cpp, exp->data.tok, PSI_CPP_INCLUDE)) {
D->error(D, exp->token, PSI_WARNING, "Failed to include %s", exp->data.tok->text);
}
}
break;
case PSI_T_INCLUDE_NEXT:
if (!cpp->skip) {
- if (!psi_cpp_include(cpp, exp->data.tok->text, PSI_CPP_INCLUDE_NEXT)) {
+ if (!psi_cpp_include(cpp, exp->data.tok, PSI_CPP_INCLUDE_NEXT)) {
D->error(D, exp->token, PSI_WARNING, "Failed to include %s", exp->data.tok->text);
}
}
break;
case PSI_T_IMPORT:
if (!cpp->skip) {
- if (!psi_cpp_include(cpp, exp->data.tok->text, PSI_CPP_INCLUDE_ONCE)) {
+ if (!psi_cpp_include(cpp, exp->data.tok, PSI_CPP_INCLUDE_ONCE)) {
D->error(D, exp->token, PSI_WARNING, "Failed to include %s", exp->data.tok->text);
}
}
- case PSI_T_ONCE:
+ break;
+ case PSI_T_PRAGMA_ONCE:
if (!cpp->skip) {
zend_hash_str_add_empty_element(&cpp->once, exp->token->file, strlen(exp->token->file));
}