summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian2001-02-12 18:30:53 +0000
committerBruce Momjian2001-02-12 18:30:53 +0000
commit281b7d84fc5b037531193440594917b10416c971 (patch)
tree4f59b8785f007d2c315f2667e2f0ba1e12c8fd48 /src
parent97aa5fcd5eda839a0f1ae60f917de141a6c6f1b3 (diff)
Add // -> /* */ mapping to pgindent.
Diffstat (limited to 'src')
-rw-r--r--src/backend/optimizer/util/clauses.c12
-rwxr-xr-xsrc/tools/pgindent/pgindent3
2 files changed, 9 insertions, 6 deletions
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index f130e257523..faf83dd68db 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.79 2001/01/24 19:42:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.80 2001/02/12 18:30:52 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -1606,7 +1606,7 @@ simplify_op_or_func(Expr *expr, List *args)
* {
* if (node == NULL)
* return false;
- * // check for nodes that special work is required for, eg:
+ * # check for nodes that special work is required for, eg:
* if (IsA(node, Var))
* {
* ... do special actions for Var nodes
@@ -1615,7 +1615,7 @@ simplify_op_or_func(Expr *expr, List *args)
* {
* ... do special actions for other node types
* }
- * // for any node type not specially processed, do:
+ * # for any node type not specially processed, do:
* return expression_tree_walker(node, my_walker, (void *) context);
* }
*
@@ -1659,7 +1659,7 @@ simplify_op_or_func(Expr *expr, List *args)
* {
* adjust context for subquery;
* result = query_tree_walker((Query *) node, my_walker, context,
- * true); // to visit subquery RTEs too
+ * true); # to visit subquery RTEs too
* restore context if needed;
* return result;
* }
@@ -1909,7 +1909,7 @@ query_tree_walker(Query *query,
* {
* if (node == NULL)
* return NULL;
- * // check for nodes that special work is required for, eg:
+ * # check for nodes that special work is required for, eg:
* if (IsA(node, Var))
* {
* ... create and return modified copy of Var node
@@ -1918,7 +1918,7 @@ query_tree_walker(Query *query,
* {
* ... do special transformations of other node types
* }
- * // for any node type not specially processed, do:
+ * # for any node type not specially processed, do:
* return expression_tree_mutator(node, my_mutator, (void *) context);
* }
*
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index 069cf41380e..d47b33e9427 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -25,6 +25,9 @@ fi
for FILE
do
cat $FILE |
+# convert // comments to /* */
+ sed 's;^\([ ]*\)//\(.*\)$;\1/* \2 */;g' |
+# mark some comments for special treatment later
sed 's;/\* *---;/*---X_X;g' |
# workaround for indent bug with 'else' handling
sed 's;\([} ]\)else[ ]*\(/\*.*\)$;\1else\