Guard against pgindent changing =- to = -.

bmomjian · bmomjian · commit 5a288903b9aa · 2003-08-30T14:59:34.000Z
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.79 2003/08/08 21:41:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.80 2003/08/30 14:59:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2008,7 +2008,7 @@ AlterTableAlterColumnDropNotNull(Oid myrelid, bool recurse,
 		}
 	}
 
-	/* -= now do the thing on this relation =- */
+	/* now do the thing on this relation */
 
 	/*
 	 * get the number of the attribute
@@ -2152,7 +2152,7 @@ AlterTableAlterColumnSetNotNull(Oid myrelid, bool recurse,
 		}
 	}
 
-	/* -= now do the thing on this relation =- */
+	/* now do the thing on this relation */
 
 	/*
 	 * get the number of the attribute
@@ -2280,7 +2280,7 @@ AlterTableAlterColumnDefault(Oid myrelid, bool recurse,
 		}
 	}
 
-	/* -= now do the thing on this relation =- */
+	/* now do the thing on this relation */
 
 	/*
 	 * get the number of the attribute
@@ -2445,7 +2445,7 @@ AlterTableAlterColumnFlags(Oid myrelid, bool recurse,
 		}
 	}
 
-	/* -= now do the thing on this relation =- */
+	/* now do the thing on this relation */
 
 	attrelation = heap_openr(AttributeRelationName, RowExclusiveLock);
 
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
@@ -33,14 +33,16 @@ do
 	cat "$FILE" |
 # convert // comments to /* */
 	sed 's;^\([ 	]*\)//\(.*\)$;\1/* \2 */;g' |
+# Avoid bug that converts 'x =- 1' to 'x = -1'
+	sed 's;=- ;-= ;g' |
 # mark some comments for special treatment later
 	sed 's;/\*  *---;/*---X_X;g' |
 # workaround for indent bug with 'else' handling
 	sed 's;\([} 	]\)else[ 	]*\(/\*.*\)$;\1else\
 \2;g' | 
 	detab -t4 -qc |
 # work around bug where function that defines no local variables misindents
-# switch() case lines and line after #else.  Do not do with for struct/enum.
+# switch() case lines and line after #else.  Do not do for struct/enum.
 	awk '	BEGIN	{line1 = ""; line2 = ""}
 		{
 			line2 = $0;
@@ -1672,6 +1674,7 @@ do
 		cat /tmp/$$
 	fi
 	cat /tmp/$$a |
+# restore DATA/CATALOG lines
 	sed 's;^/\*\(DATA(.*\)\*/$;\1;' |
 	sed 's;^/\*\(CATALOG(.*\)\*/$;\1;' |
 # remove tabs and retab with four spaces

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.79 2003/08/08 21:41:32 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.80 2003/08/30 14:59:34 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -2008,7 +2008,7 @@ AlterTableAlterColumnDropNotNull(Oid myrelid, bool recurse,`
`2008`	`2008`	`}`
`2009`	`2009`	`}`
`2010`	`2010`
`2011`		`- /* -= now do the thing on this relation =- */`
	`2011`	`+ /* now do the thing on this relation */`
`2012`	`2012`
`2013`	`2013`	`/*`
`2014`	`2014`	`* get the number of the attribute`
`@@ -2152,7 +2152,7 @@ AlterTableAlterColumnSetNotNull(Oid myrelid, bool recurse,`
`2152`	`2152`	`}`
`2153`	`2153`	`}`
`2154`	`2154`
`2155`		`- /* -= now do the thing on this relation =- */`
	`2155`	`+ /* now do the thing on this relation */`
`2156`	`2156`
`2157`	`2157`	`/*`
`2158`	`2158`	`* get the number of the attribute`
`@@ -2280,7 +2280,7 @@ AlterTableAlterColumnDefault(Oid myrelid, bool recurse,`
`2280`	`2280`	`}`
`2281`	`2281`	`}`
`2282`	`2282`
`2283`		`- /* -= now do the thing on this relation =- */`
	`2283`	`+ /* now do the thing on this relation */`
`2284`	`2284`
`2285`	`2285`	`/*`
`2286`	`2286`	`* get the number of the attribute`
`@@ -2445,7 +2445,7 @@ AlterTableAlterColumnFlags(Oid myrelid, bool recurse,`
`2445`	`2445`	`}`
`2446`	`2446`	`}`
`2447`	`2447`
`2448`		`- /* -= now do the thing on this relation =- */`
	`2448`	`+ /* now do the thing on this relation */`
`2449`	`2449`
`2450`	`2450`	`attrelation = heap_openr(AttributeRelationName, RowExclusiveLock);`
`2451`	`2451`