mirror of
https://git.postgresql.org/git/postgresql.git
synced 2026-02-14 02:17:02 +08:00
c7b8998ebb
Change pg_bsd_indent to follow upstream rules for placement of comments to the right of code, and remove pgindent hack that caused comments following #endif to not obey the general rule. Commit e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 wasn't actually using the published version of pg_bsd_indent, but a hacked-up version that tried to minimize the amount of movement of comments to the right of code. The situation of interest is where such a comment has to be moved to the right of its default placement at column 33 because there's code there. BSD indent has always moved right in units of tab stops in such cases --- but in the previous incarnation, indent was working in 8-space tab stops, while now it knows we use 4-space tabs. So the net result is that in about half the cases, such comments are placed one tab stop left of before. This is better all around: it leaves more room on the line for comment text, and it means that in such cases the comment uniformly starts at the next 4-space tab stop after the code, rather than sometimes one and sometimes two tabs after. Also, ensure that comments following #endif are indented the same as comments following other preprocessor commands such as #else. That inconsistency turns out to have been self-inflicted damage from a poorly-thought-through post-indent "fixup" in pgindent. This patch is much less interesting than the first round of indent changes, but also bulkier, so I thought it best to separate the effects. Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
85 lines
2.7 KiB
C
85 lines
2.7 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* xml.h
|
|
* Declarations for XML data type support.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/utils/xml.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
|
|
#ifndef XML_H
|
|
#define XML_H
|
|
|
|
#include "fmgr.h"
|
|
#include "nodes/execnodes.h"
|
|
#include "nodes/primnodes.h"
|
|
#include "executor/tablefunc.h"
|
|
|
|
typedef struct varlena xmltype;
|
|
|
|
typedef enum
|
|
{
|
|
XML_STANDALONE_YES,
|
|
XML_STANDALONE_NO,
|
|
XML_STANDALONE_NO_VALUE,
|
|
XML_STANDALONE_OMITTED
|
|
} XmlStandaloneType;
|
|
|
|
typedef enum
|
|
{
|
|
XMLBINARY_BASE64,
|
|
XMLBINARY_HEX
|
|
} XmlBinaryType;
|
|
|
|
typedef enum
|
|
{
|
|
PG_XML_STRICTNESS_LEGACY, /* ignore errors unless function result
|
|
* indicates error condition */
|
|
PG_XML_STRICTNESS_WELLFORMED, /* ignore non-parser messages */
|
|
PG_XML_STRICTNESS_ALL /* report all notices/warnings/errors */
|
|
} PgXmlStrictness;
|
|
|
|
/* struct PgXmlErrorContext is private to xml.c */
|
|
typedef struct PgXmlErrorContext PgXmlErrorContext;
|
|
|
|
#define DatumGetXmlP(X) ((xmltype *) PG_DETOAST_DATUM(X))
|
|
#define XmlPGetDatum(X) PointerGetDatum(X)
|
|
|
|
#define PG_GETARG_XML_P(n) DatumGetXmlP(PG_GETARG_DATUM(n))
|
|
#define PG_RETURN_XML_P(x) PG_RETURN_POINTER(x)
|
|
|
|
extern void pg_xml_init_library(void);
|
|
extern PgXmlErrorContext *pg_xml_init(PgXmlStrictness strictness);
|
|
extern void pg_xml_done(PgXmlErrorContext *errcxt, bool isError);
|
|
extern bool pg_xml_error_occurred(PgXmlErrorContext *errcxt);
|
|
extern void xml_ereport(PgXmlErrorContext *errcxt, int level, int sqlcode,
|
|
const char *msg);
|
|
|
|
extern xmltype *xmlconcat(List *args);
|
|
extern xmltype *xmlelement(XmlExpr *xexpr,
|
|
Datum *named_argvalue, bool *named_argnull,
|
|
Datum *argvalue, bool *argnull);
|
|
extern xmltype *xmlparse(text *data, XmlOptionType xmloption, bool preserve_whitespace);
|
|
extern xmltype *xmlpi(char *target, text *arg, bool arg_is_null, bool *result_is_null);
|
|
extern xmltype *xmlroot(xmltype *data, text *version, int standalone);
|
|
extern bool xml_is_document(xmltype *arg);
|
|
extern text *xmltotext_with_xmloption(xmltype *data, XmlOptionType xmloption_arg);
|
|
extern char *escape_xml(const char *str);
|
|
|
|
extern char *map_sql_identifier_to_xml_name(char *ident, bool fully_escaped, bool escape_period);
|
|
extern char *map_xml_name_to_sql_identifier(char *name);
|
|
extern char *map_sql_value_to_xml_value(Datum value, Oid type, bool xml_escape_strings);
|
|
|
|
extern int xmlbinary; /* XmlBinaryType, but int for guc enum */
|
|
|
|
extern int xmloption; /* XmlOptionType, but int for guc enum */
|
|
|
|
extern const TableFuncRoutine XmlTableRoutine;
|
|
|
|
#endif /* XML_H */
|