Attachment #34608 for bug #56187

View | Details | Raw Unified | Return to bug 56187
Collapse All | Expand All




--- c/pfe/lib/p_calc_name.cc.orig	Fri Aug 29 19:10:33 2003
+++ c/pfe/lib/p_calc_name.cc	Fri Aug 29 19:29:19 2003
@@ -98,14 +98,14 @@
 #define DEFINE_CALC_NAME_FMT_OPTION(type, explain)	\
 {							\
 	#type "_fmt",					\
-	name_strings::##type##_fmt,			\
+	name_strings::type##_fmt,			\
 	"Specify the format of " explain		\
 }
 
 #define DEFINE_CALC_NAME_LIT_OPTION(type, explain)	\
 {							\
 	#type "_lit",					\
-	name_strings::##type##_lit,			\
+	name_strings::type##_lit,			\
 	"Specify the string for " explain		\
 }
 
@@ -333,7 +333,7 @@
 #define DEFINE_CALC_NAME_FUNCTION(type)					\
   char *pg_state::calc_##type##_name(const char *basic_name)		\
   {									\
-	return calc_name(names.formats[name_strings::##type##_fmt],	\
+	return calc_name(names.formats[name_strings::type##_fmt],	\
 			 basic_name);					\
   }
 
@@ -346,7 +346,7 @@
 									    \
 	calc_scoped_name(&scname,					    \
 			 parent_ref,					    \
-			 names.formats[name_strings::##type##_scoped_fmt]); \
+			 names.formats[name_strings::type##_scoped_fmt]); \
 	cast_add_scope_name(&scname,					    \
 			    base_name,					    \
 			    null_template_arg_array);			    \
@@ -715,8 +715,8 @@
 		++calc_name_data.count;					 \
 	} while (0)
 
-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
+#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
+#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
 
 /*
  * An internal auxiliary.  `calc_name_module' locates the names of the AOI




--- c/pfe/lib/pg_state.cc.orig	Fri Aug 29 19:32:31 2003
+++ c/pfe/lib/pg_state.cc	Fri Aug 29 19:32:54 2003
@@ -53,9 +53,9 @@
 	 * Initialize the strings that are used to construct names.  Most
 	 * presentation generators will override at least some of these values.
 	 */
-#define NAME_FORMAT(type)      names.formats[name_strings::##type##_fmt]
-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
+#define NAME_FORMAT(type)      names.formats[name_strings::type##_fmt]
+#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
+#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
 	
 	/* The `null' format should never ever be used. */
 	NAME_FORMAT(null) =			"";




--- c/pfe/libcorba/pg_corba.cc.orig	Fri Aug 29 19:45:24 2003
+++ c/pfe/libcorba/pg_corba.cc	Fri Aug 29 19:45:46 2003
@@ -25,9 +25,9 @@
 
 pg_corba::pg_corba()
 {
-#define NAME_FORMAT(type)      names.formats[name_strings::##type##_fmt]
-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
+#define NAME_FORMAT(type)      names.formats[name_strings::type##_fmt]
+#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
+#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
 	
 	/*
 	 * CORBA does not specify the names of server skeletons nor the names




--- c/pfe/libcorbaxx/pg_corbaxx.cc.orig	Fri Aug 29 19:50:41 2003
+++ c/pfe/libcorbaxx/pg_corbaxx.cc	Fri Aug 29 19:51:04 2003
@@ -27,9 +27,9 @@
 
 pg_corbaxx::pg_corbaxx()
 {
-#define NAME_FORMAT(type)      names.formats[name_strings::##type##_fmt]
-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
+#define NAME_FORMAT(type)      names.formats[name_strings::type##_fmt]
+#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
+#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
 	
 	/*
 	 * CORBA does not specify the names of server skeletons nor the names




--- c/pfe/fluke/pg_fluke.cc.orig	Fri Aug 29 20:18:40 2003
+++ c/pfe/fluke/pg_fluke.cc	Fri Aug 29 20:19:02 2003
@@ -33,9 +33,9 @@
 
 pg_fluke::pg_fluke()
 {
-#define NAME_FORMAT(type)      names.formats[name_strings::##type##_fmt]
-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
+#define NAME_FORMAT(type)      names.formats[name_strings::type##_fmt]
+#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
+#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
 	
 	/* Should define them all... */
 	NAME_FORMAT(server_func) =		"%I%_server%_%s";

Line 0 Link Here

(-)flick/files/patch-af (+11 lines)
	1	--- c/pfe/sun/p_calc_name.cc.orig Sat Aug 30 00:32:44 2003
	2	+++ c/pfe/sun/p_calc_name.cc Sat Aug 30 00:32:59 2003
	3	@@ -84,7 +84,7 @@
	4	* These functions are auxiliaries for the override methods above.
	5	*/
	6
	7	-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
	8	+#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
	9
	10	char pg_sun::calc_operation_and_version_id(const char basic_name)
	11	{




--- c/pfe/sun/pg_sun.cc.orig	Sat Aug 30 00:39:35 2003
+++ c/pfe/sun/pg_sun.cc	Sat Aug 30 00:39:56 2003
@@ -50,9 +50,9 @@
 
 pg_sun::pg_sun()
 {
-#define NAME_FORMAT(type)      names.formats[name_strings::##type##_fmt]
-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
+#define NAME_FORMAT(type)      names.formats[name_strings::type##_fmt]
+#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
+#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
 	
 	/*
 	 * Override some of the format strings for Sun RPC-style presentations.




--- fe/mig/parser.y.orig	Sat Aug 30 00:44:37 2003
+++ fe/mig/parser.y	Sat Aug 30 00:49:45 2003
@@ -755,46 +755,55 @@
 			|	error {
 					ParseError("`;' expected");
 				}
+			;
 
 EqualOrError	 	:	syEqual
 			|	error {
 					ParseError("`=' expected");
 				}
+			;
 
 CommaOrError	 	:	syComma
 			|	error {
 					ParseError("`,' expected");
 				}
+			;
 
 LParenOrError	 	:	syLParen
 			|	error {
 					ParseError("`(' expected");
 				}
+			;
 
 RParenOrError	 	:	syRParen
 			|	error {
 					ParseError("`)' expected");
 				}
+			;
 
 LBrackOrError	 	:	syLBrack
 			|	error {
 					ParseError("`[' expected");
 				}
+			;
 
 RBrackOrError	 	:	syRBrack
 			|	error {
 					ParseError("`]' expected");
 				}
+			;
 
 OfOrError	 	:	syOf
 			|	error {
 					ParseError("`of' expected");
 				}
+			;
 
 ColonOrError	 	:	syColon
 			|	error {
 					ParseError("`:' expected");
 				}
+			;
 
 IPCFlagOrError          :	syIPCFlag { $$ = $1; }
 			|	error {
@@ -803,6 +812,7 @@
 						    "found"));
 					$$ = flNone;
 				}
+			;
 
 IdentifierOrError       :	syIdentifier { $$ = $1; }
 			|	error {
@@ -810,41 +820,49 @@
 					$$ = flick_asprintf("_error %d_%d_",
 							    lineno, tokenpos);
 				}
+			;
 
 IdentifierOrEmptyError  :	syIdentifier { $$ = $1; }
 			|	error {
 					ParseError("identifier expected");
 					$$ = "";
 				}
+			;
 
 IdentifierOrNULLError   :	syIdentifier { $$ = $1; }
 			|	error {
 					ParseError("identifier expected");
 					$$ = strNULL;
 				}
+			;
 
 NumberOrError   	:	syNumber { $$ = $1; }
 			|	error {
 					ParseError("number expected");
 					$$ = 0;
 				}
+			;
 
-StringOrNULLError       	:	syString { $$ = $1; }
+StringOrNULLError      	:	syString { $$ = $1; }
 			|	error {
 					ParseError("string expected");
 					$$ = strNULL;
 				}
+			;
+
 QStringOrError       	:	syQString { $$ = $1; }
 			|	error {
 					ParseError("quoted string expected");
 					$$ = "\"<error>\"";
 				}
+			;
 
 FileNameOrError       	:	syFileName { $$ = $1; }
 			|	error {
 					ParseError("filename expected");
 					$$ = "error.error";
 				}
+			;
 
 LookString		:	/* empty */
 				{ LookString(); }




--- fe/newcorba/parser.yy.orig	Sat Aug 30 00:52:20 2003
+++ fe/newcorba/parser.yy	Sat Aug 30 00:55:05 2003
@@ -305,6 +305,8 @@
 		  ParseError("expecting identifier");
 		  $$ = 0;
 		}
+		;
+
 scoped_name	: ID {
 		  $$ = FindLocalName($1);
 		}
@@ -1058,6 +1060,7 @@
 			  ParseError("invalid type"); 
 			  $$ = MakeAoiType(kSLONG); 
 			}
+			;
 
 param_type_spec	: base_type_spec {$$ = $1;}
 		| string_type {$$ = $1;}

Line 0 Link Here

(-)flick/files/patch-aj (+11 lines)
	1	--- runtime/headers/flick/pres/corba.h.orig Sat Aug 30 00:57:33 2003
	2	+++ runtime/headers/flick/pres/corba.h Sat Aug 30 00:58:17 2003
	3	@@ -186,7 +186,7 @@
	4
	5	#define corba_except(name) \
	6	typedef flick_system_exception name; \
	7	-name *##name##__alloc();
	8	+name *name##__alloc();
	9
	10	/*
	11	* Here are the standard CORBA system exception.

Line 0 Link Here

(-)flick/files/patch-ak (+11 lines)
	1	--- runtime/libraries/link/iiop/corba_excepts.c.orig Sat Aug 30 00:59:48 2003
	2	+++ runtime/libraries/link/iiop/corba_excepts.c Sat Aug 30 01:00:15 2003
	3	@@ -254,7 +254,7 @@
	4	* Define the allocators for the standard CORBA exceptions.
	5	*/
	6	#define sys_except__alloc(name) \
	7	-name ##name##__alloc() { return (name ) flick_system_exception_alloc(); }
	8	+name name##__alloc() { return (name ) flick_system_exception_alloc(); }
	9
	10	sys_except__alloc(CORBA_UNKNOWN)
	11	sys_except__alloc(CORBA_BAD_PARAM)

Line 0 Link Here

(-)flick/files/patch-al (+11 lines)
	1	--- runtime/libraries/link/suntcp/corba_excepts.c.orig Sat Aug 30 01:03:14 2003
	2	+++ runtime/libraries/link/suntcp/corba_excepts.c Sat Aug 30 01:03:59 2003
	3	@@ -254,7 +254,7 @@
	4	* Define the allocators for the standard CORBA exceptions.
	5	*/
	6	#define sys_except__alloc(name) \
	7	-name ##name##__alloc() { return (name ) flick_system_exception_alloc(); }
	8	+name name##__alloc() { return (name ) flick_system_exception_alloc(); }
	9
	10	sys_except__alloc(CORBA_UNKNOWN)
	11	sys_except__alloc(CORBA_BAD_PARAM)

Return to bug 56187

Line 0 Link Here

(-)flick/files/patch-aa (+48 lines)
	1	--- c/pfe/lib/p_calc_name.cc.orig Fri Aug 29 19:10:33 2003
	2	+++ c/pfe/lib/p_calc_name.cc Fri Aug 29 19:29:19 2003
	3	@@ -98,14 +98,14 @@
	4	#define DEFINE_CALC_NAME_FMT_OPTION(type, explain) \
	5	{ \
	6	#type "_fmt", \
	7	- name_strings::##type##_fmt, \
	8	+ name_strings::type##_fmt, \
	9	"Specify the format of " explain \
	10	}
	11
	12	#define DEFINE_CALC_NAME_LIT_OPTION(type, explain) \
	13	{ \
	14	#type "_lit", \
	15	- name_strings::##type##_lit, \
	16	+ name_strings::type##_lit, \
	17	"Specify the string for " explain \
	18	}
	19
	20	@@ -333,7 +333,7 @@
	21	#define DEFINE_CALC_NAME_FUNCTION(type) \
	22	char pg_state::calc_##type##_name(const char basic_name) \
	23	{ \
	24	- return calc_name(names.formats[name_strings::##type##_fmt], \
	25	+ return calc_name(names.formats[name_strings::type##_fmt], \
	26	basic_name); \
	27	}
	28
	29	@@ -346,7 +346,7 @@
	30	\
	31	calc_scoped_name(&scname, \
	32	parent_ref, \
	33	- names.formats[name_strings::##type##_scoped_fmt]); \
	34	+ names.formats[name_strings::type##_scoped_fmt]); \
	35	cast_add_scope_name(&scname, \
	36	base_name, \
	37	null_template_arg_array); \
	38	@@ -715,8 +715,8 @@
	39	++calc_name_data.count; \
	40	} while (0)
	41
	42	-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
	43	-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
	44	+#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
	45	+#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
	46
	47	/*
	48	* An internal auxiliary. `calc_name_module' locates the names of the AOI

Line 0 Link Here

(-)flick/files/patch-ab (+15 lines)
	1	--- c/pfe/lib/pg_state.cc.orig Fri Aug 29 19:32:31 2003
	2	+++ c/pfe/lib/pg_state.cc Fri Aug 29 19:32:54 2003
	3	@@ -53,9 +53,9 @@
	4	* Initialize the strings that are used to construct names. Most
	5	* presentation generators will override at least some of these values.
	6	*/
	7	-#define NAME_FORMAT(type) names.formats[name_strings::##type##_fmt]
	8	-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
	9	-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
	10	+#define NAME_FORMAT(type) names.formats[name_strings::type##_fmt]
	11	+#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
	12	+#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
	13
	14	/* The `null' format should never ever be used. */
	15	NAME_FORMAT(null) = "";

Line 0 Link Here

(-)flick/files/patch-ac (+15 lines)
	1	--- c/pfe/libcorba/pg_corba.cc.orig Fri Aug 29 19:45:24 2003
	2	+++ c/pfe/libcorba/pg_corba.cc Fri Aug 29 19:45:46 2003
	3	@@ -25,9 +25,9 @@
	4
	5	pg_corba::pg_corba()
	6	{
	7	-#define NAME_FORMAT(type) names.formats[name_strings::##type##_fmt]
	8	-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
	9	-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
	10	+#define NAME_FORMAT(type) names.formats[name_strings::type##_fmt]
	11	+#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
	12	+#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
	13
	14	/*
	15	* CORBA does not specify the names of server skeletons nor the names

Line 0 Link Here

(-)flick/files/patch-ad (+15 lines)
	1	--- c/pfe/libcorbaxx/pg_corbaxx.cc.orig Fri Aug 29 19:50:41 2003
	2	+++ c/pfe/libcorbaxx/pg_corbaxx.cc Fri Aug 29 19:51:04 2003
	3	@@ -27,9 +27,9 @@
	4
	5	pg_corbaxx::pg_corbaxx()
	6	{
	7	-#define NAME_FORMAT(type) names.formats[name_strings::##type##_fmt]
	8	-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
	9	-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
	10	+#define NAME_FORMAT(type) names.formats[name_strings::type##_fmt]
	11	+#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
	12	+#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
	13
	14	/*
	15	* CORBA does not specify the names of server skeletons nor the names

Line 0 Link Here

(-)flick/files/patch-ae (+15 lines)
	1	--- c/pfe/fluke/pg_fluke.cc.orig Fri Aug 29 20:18:40 2003
	2	+++ c/pfe/fluke/pg_fluke.cc Fri Aug 29 20:19:02 2003
	3	@@ -33,9 +33,9 @@
	4
	5	pg_fluke::pg_fluke()
	6	{
	7	-#define NAME_FORMAT(type) names.formats[name_strings::##type##_fmt]
	8	-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
	9	-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
	10	+#define NAME_FORMAT(type) names.formats[name_strings::type##_fmt]
	11	+#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
	12	+#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
	13
	14	/* Should define them all... */
	15	NAME_FORMAT(server_func) = "%I%_server%_%s";

Line 0 Link Here

(-)flick/files/patch-ag (+15 lines)
	1	--- c/pfe/sun/pg_sun.cc.orig Sat Aug 30 00:39:35 2003
	2	+++ c/pfe/sun/pg_sun.cc Sat Aug 30 00:39:56 2003
	3	@@ -50,9 +50,9 @@
	4
	5	pg_sun::pg_sun()
	6	{
	7	-#define NAME_FORMAT(type) names.formats[name_strings::##type##_fmt]
	8	-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
	9	-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
	10	+#define NAME_FORMAT(type) names.formats[name_strings::type##_fmt]
	11	+#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
	12	+#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
	13
	14	/*
	15	* Override some of the format strings for Sun RPC-style presentations.

Line 0 Link Here

(-)flick/files/patch-ah (+117 lines)
		1	--- fe/mig/parser.y.orig Sat Aug 30 00:44:37 2003
		2	+++ fe/mig/parser.y Sat Aug 30 00:49:45 2003
		3	@@ -755,46 +755,55 @@
		4	\| error {
		5	ParseError("`;' expected");
		6	}
		7	+ ;
		8
		9	EqualOrError : syEqual
		10	\| error {
		11	ParseError("`=' expected");
		12	}
		13	+ ;
		14
		15	CommaOrError : syComma
		16	\| error {
		17	ParseError("`,' expected");
		18	}
		19	+ ;
		20
		21	LParenOrError : syLParen
		22	\| error {
		23	ParseError("`(' expected");
		24	}
		25	+ ;
		26
		27	RParenOrError : syRParen
		28	\| error {
		29	ParseError("`)' expected");
		30	}
		31	+ ;
		32
		33	LBrackOrError : syLBrack
		34	\| error {
		35	ParseError("`[' expected");
		36	}
		37	+ ;
		38
		39	RBrackOrError : syRBrack
		40	\| error {
		41	ParseError("`]' expected");
		42	}
		43	+ ;
		44
		45	OfOrError : syOf
		46	\| error {
		47	ParseError("`of' expected");
		48	}
		49	+ ;
		50
		51	ColonOrError : syColon
		52	\| error {
		53	ParseError("`:' expected");
		54	}
		55	+ ;
		56
		57	IPCFlagOrError : syIPCFlag { $$ = $1; }
		58	\| error {
		59	@@ -803,6 +812,7 @@
		60	"found"));
		61	$$ = flNone;
		62	}
		63	+ ;
		64
65	IdentifierOrError : syIdentifier { $$ = $1; }
66	\| error {
67	@@ -810,41 +820,49 @@
68	$$ = flick_asprintf("_error %d_%d_",
69	lineno, tokenpos);
70	}
71	+ ;
72
73	IdentifierOrEmptyError : syIdentifier { $$ = $1; }
74	\| error {
75	ParseError("identifier expected");
76	$$ = "";
77	}
78	+ ;
79
80	IdentifierOrNULLError : syIdentifier { $$ = $1; }
81	\| error {
82	ParseError("identifier expected");
83	$$ = strNULL;
84	}
85	+ ;
86
87	NumberOrError : syNumber { $$ = $1; }
88	\| error {
89	ParseError("number expected");
90	$$ = 0;
91	}
92	+ ;
93
94	-StringOrNULLError : syString { $$ = $1; }
95	+StringOrNULLError : syString { $$ = $1; }
96	\| error {
97	ParseError("string expected");
98	$$ = strNULL;
99	}
100	+ ;
101	+
102	QStringOrError : syQString { $$ = $1; }
103	\| error {
104	ParseError("quoted string expected");
105	$$ = "\"<error>\"";
106	}
107	+ ;
108
109	FileNameOrError : syFileName { $$ = $1; }
110	\| error {
111	ParseError("filename expected");
112	$$ = "error.error";
113	}
114	+ ;
115
116	LookString : /* empty */
117	{ LookString(); }

Line 0 Link Here

(-)flick/files/patch-ai (+19 lines)
	1	--- fe/newcorba/parser.yy.orig Sat Aug 30 00:52:20 2003
	2	+++ fe/newcorba/parser.yy Sat Aug 30 00:55:05 2003
	3	@@ -305,6 +305,8 @@
	4	ParseError("expecting identifier");
	5	$$ = 0;
	6	}
	7	+ ;
	8	+
	9	scoped_name : ID {
	10	$$ = FindLocalName($1);
	11	}
	12	@@ -1058,6 +1060,7 @@
	13	ParseError("invalid type");
	14	$$ = MakeAoiType(kSLONG);
	15	}
	16	+ ;
	17
	18	param_type_spec : base_type_spec {$$ = $1;}
	19	\| string_type {$$ = $1;}