Message format tuning

petere · petere · commit 39ab3c1c618e · 2009-01-26T10:19:44.000Z
diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.4 2009/01/23 12:43:32 petere Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.5 2009/01/26 10:19:44 petere Exp $ */
 
 statements: /*EMPTY*/
                 | statements statement
@@ -22,7 +22,7 @@ statement: ecpgstart at stmt ';'        { connection = NULL; }
 CreateAsStmt: CREATE OptTemp TABLE create_as_target AS {FoundInto = 0;} SelectStmt opt_with_data
 		{
 			if (FoundInto == 1)
-				mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE AS cannot specify INTO\n");
+				mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE AS cannot specify INTO");
 
 			$$ = cat_str(6, make_str("create"), $2, make_str("table"), $4, make_str("as"), $7);
 		}
@@ -294,7 +294,7 @@ ECPGCursorStmt:  DECLARE name cursor_options CURSOR opt_hold FOR prepared_name
 			{
 				if (strcmp($2, ptr->name) == 0)
 					/* re-definition is a bug */
-					mmerror(PARSE_ERROR, ET_ERROR, "cursor \"%s\" already defined", $2);
+					mmerror(PARSE_ERROR, ET_ERROR, "cursor \"%s\" is already defined", $2);
 			}
 
 			this = (struct cursor *) mm_alloc(sizeof(struct cursor));
@@ -497,7 +497,7 @@ var_type:	simple_type
 			}
 			else
 			{
-				mmerror(PARSE_ERROR, ET_ERROR, "only numeric/decimal have precision/scale argument");
+				mmerror(PARSE_ERROR, ET_ERROR, "only data types numeric and decimal have precision/scale argument");
 				$$.type_enum = ECPGt_numeric;
 				$$.type_str = make_str("numeric");
 			}
@@ -678,7 +678,7 @@ struct_union_type_with_symbol: s_struct_union_symbol
 			{
 					if (strcmp(su_type.type_str, ptr->name) == 0)
 							/* re-definition is a bug */
-							mmerror(PARSE_ERROR, ET_ERROR, "type \"%s\" already defined", su_type.type_str);
+							mmerror(PARSE_ERROR, ET_ERROR, "type \"%s\" is already defined", su_type.type_str);
 			}
 
 			this = (struct typedefs *) mm_alloc(sizeof(struct typedefs));
@@ -836,7 +836,7 @@ variable: opt_pointer ECPGColLabel opt_array_bounds opt_bit_field opt_initialize
 							sprintf(dim, "[%s]", dimension);
 					/* cannot check for atoi <= 0 because a defined constant will yield 0 here as well */
 					if (atoi(length) < 0 || strcmp(length, "0") == 0)
-						mmerror(PARSE_ERROR, ET_ERROR, "pointer to varchar are not implemented");
+						mmerror(PARSE_ERROR, ET_ERROR, "pointers to varchar are not implemented");
 
 					/* make sure varchar struct name is unique by adding linenumer of its definition */
 					vcn = (char *) mm_alloc(strlen($2) + sizeof(int) * CHAR_BIT * 10 / 3);
diff --git a/src/interfaces/ecpg/preproc/variable.c b/src/interfaces/ecpg/preproc/variable.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/variable.c,v 1.46 2009/01/23 12:43:32 petere Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/variable.c,v 1.47 2009/01/26 10:19:44 petere Exp $ */
 
 #include "postgres_fe.h"
 
@@ -226,7 +226,7 @@ find_variable(char *name)
 				*next = '\0';
 				p = find_simple(name);
 				if (p == NULL)
-					mmerror(PARSE_ERROR, ET_FATAL, "variable %s is not declared", name);
+					mmerror(PARSE_ERROR, ET_FATAL, "variable \"%s\" is not declared", name);
 
 				*next = c;
 				switch (p->type->u.element->type)
@@ -248,7 +248,7 @@ find_variable(char *name)
 		p = find_simple(name);
 
 	if (p == NULL)
-		mmerror(PARSE_ERROR, ET_FATAL, "variable %s is not declared", name);
+		mmerror(PARSE_ERROR, ET_FATAL, "variable \"%s\" is not declared", name);
 
 	return (p);
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.4 2009/01/23 12:43:32 petere Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.5 2009/01/26 10:19:44 petere Exp $ */`
`2`	`2`
`3`	`3`	`statements: /EMPTY/`
`4`	`4`	`\| statements statement`
`@@ -22,7 +22,7 @@ statement: ecpgstart at stmt ';' { connection = NULL; }`
`22`	`22`	`CreateAsStmt: CREATE OptTemp TABLE create_as_target AS {FoundInto = 0;} SelectStmt opt_with_data`
`23`	`23`	`{`
`24`	`24`	`if (FoundInto == 1)`
`25`		`- mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE AS cannot specify INTO\n");`
	`25`	`+ mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE AS cannot specify INTO");`
`26`	`26`
`27`	`27`	`$$ = cat_str(6, make_str("create"), $2, make_str("table"), $4, make_str("as"), $7);`
`28`	`28`	`}`
`@@ -294,7 +294,7 @@ ECPGCursorStmt: DECLARE name cursor_options CURSOR opt_hold FOR prepared_name`
`294`	`294`	`{`
`295`	`295`	`if (strcmp($2, ptr->name) == 0)`
`296`	`296`	`/* re-definition is a bug */`
`297`		`- mmerror(PARSE_ERROR, ET_ERROR, "cursor \"%s\" already defined", $2);`
	`297`	`+ mmerror(PARSE_ERROR, ET_ERROR, "cursor \"%s\" is already defined", $2);`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`this = (struct cursor *) mm_alloc(sizeof(struct cursor));`
`@@ -497,7 +497,7 @@ var_type: simple_type`
`497`	`497`	`}`
`498`	`498`	`else`
`499`	`499`	`{`
`500`		`- mmerror(PARSE_ERROR, ET_ERROR, "only numeric/decimal have precision/scale argument");`
	`500`	`+ mmerror(PARSE_ERROR, ET_ERROR, "only data types numeric and decimal have precision/scale argument");`
`501`	`501`	`$$.type_enum = ECPGt_numeric;`
`502`	`502`	`$$.type_str = make_str("numeric");`
`503`	`503`	`}`
`@@ -678,7 +678,7 @@ struct_union_type_with_symbol: s_struct_union_symbol`
`678`	`678`	`{`
`679`	`679`	`if (strcmp(su_type.type_str, ptr->name) == 0)`
`680`	`680`	`/* re-definition is a bug */`
`681`		`- mmerror(PARSE_ERROR, ET_ERROR, "type \"%s\" already defined", su_type.type_str);`
	`681`	`+ mmerror(PARSE_ERROR, ET_ERROR, "type \"%s\" is already defined", su_type.type_str);`
`682`	`682`	`}`
`683`	`683`
`684`	`684`	`this = (struct typedefs *) mm_alloc(sizeof(struct typedefs));`
`@@ -836,7 +836,7 @@ variable: opt_pointer ECPGColLabel opt_array_bounds opt_bit_field opt_initialize`
`836`	`836`	`sprintf(dim, "[%s]", dimension);`
`837`	`837`	`/* cannot check for atoi <= 0 because a defined constant will yield 0 here as well */`
`838`	`838`	`if (atoi(length) < 0 \|\| strcmp(length, "0") == 0)`
`839`		`- mmerror(PARSE_ERROR, ET_ERROR, "pointer to varchar are not implemented");`
	`839`	`+ mmerror(PARSE_ERROR, ET_ERROR, "pointers to varchar are not implemented");`
`840`	`840`
`841`	`841`	`/* make sure varchar struct name is unique by adding linenumer of its definition */`
`842`	`842`	`vcn = (char ) mm_alloc(strlen($2) + sizeof(int) CHAR_BIT * 10 / 3);`