diff options
Diffstat (limited to 'libcpp/include')
| -rw-r--r-- | libcpp/include/cpplib.h | 12 | ||||
| -rw-r--r-- | libcpp/include/mkdeps.h | 9 |
2 files changed, 17 insertions, 4 deletions
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index fcdaf08..c0af82c 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -302,6 +302,9 @@ typedef CPPCHAR_SIGNED_T cppchar_signed_t; /* Style of header dependencies to generate. */ enum cpp_deps_style { DEPS_NONE = 0, DEPS_USER, DEPS_SYSTEM }; +/* Structured format of module dependencies to generate. */ +enum cpp_fdeps_format { FDEPS_FMT_NONE = 0, FDEPS_FMT_P1689R5 }; + /* The possible normalization levels, from most restrictive to least. */ enum cpp_normalize_level { /* In NFKC. */ @@ -589,6 +592,9 @@ struct cpp_options /* Style of header dependencies to generate. */ enum cpp_deps_style style; + /* Structured format of module dependencies to generate. */ + enum cpp_fdeps_format fdeps_format; + /* Assume missing files are generated files. */ bool missing_files; @@ -1112,9 +1118,9 @@ extern void cpp_post_options (cpp_reader *); extern void cpp_init_iconv (cpp_reader *); /* Call this to finish preprocessing. If you requested dependency - generation, pass an open stream to write the information to, - otherwise NULL. It is your responsibility to close the stream. */ -extern void cpp_finish (cpp_reader *, FILE *deps_stream); + generation, pass open stream(s) to write the information to, + otherwise NULL. It is your responsibility to close the stream(s). */ +extern void cpp_finish (cpp_reader *, FILE *deps_stream, FILE *fdeps_stream = NULL); /* Call this to release the handle at the end of preprocessing. Any use of the handle after this function returns is invalid. */ diff --git a/libcpp/include/mkdeps.h b/libcpp/include/mkdeps.h index 920e279..7025e63 100644 --- a/libcpp/include/mkdeps.h +++ b/libcpp/include/mkdeps.h @@ -53,11 +53,15 @@ extern void deps_add_default_target (class mkdeps *, const char *); /* Adds a module target. The module name and cmi name are copied. */ extern void deps_add_module_target (struct mkdeps *, const char *module, - const char *cmi, bool is_header); + const char *cmi, bool is_header, + bool is_exported); /* Adds a module dependency. The module name is copied. */ extern void deps_add_module_dep (struct mkdeps *, const char *module); +/* Add a structured dependency target. */ +extern void fdeps_add_target (struct mkdeps *, const char *, bool); + /* Add a dependency (appears on the right side of the colon) to the deps list. Dependencies will be printed in the order that they were entered with this function. By convention, the first @@ -68,6 +72,9 @@ extern void deps_add_dep (class mkdeps *, const char *); is the number of columns to word-wrap at (0 means don't wrap). */ extern void deps_write (const cpp_reader *, FILE *, unsigned int); +/* Write out a deps buffer to a specified file in P1689R5 format. */ +extern void deps_write_p1689r5 (const struct mkdeps *, FILE *); + /* Write out a deps buffer to a file, in a form that can be read back with deps_restore. Returns nonzero on error, in which case the error number will be in errno. */ |