ChangeLogTag: Fri Jul 3 15:18:29 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>

4 files changed, 61 insertions, 84 deletions

diff --git a/modules/TAO/ChangeLog b/modules/TAO/ChangeLog
index 14a5fd607a4..42c99786c1b 100644
--- a/modules/TAO/ChangeLog
+++ b/modules/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul  3 15:18:29 UTC 2009  Jeff Parsons  <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/y.tab.cpp.diff:
+        * TAO_IDL/fe/y.tab.cpp:
+
 Thu Jun 25 19:45:13 UTC 2009  Jeff Parsons  <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_component/component_ex_idl.cpp:
diff --git a/modules/TAO/TAO_IDL/fe/idl.yy b/modules/TAO/TAO_IDL/fe/idl.yy
index 361a186e5bd..a7df6de273b 100644
--- a/modules/TAO/TAO_IDL/fe/idl.yy
+++ b/modules/TAO/TAO_IDL/fe/idl.yy
@@ -332,7 +332,7 @@ start : definitions ;
 
 definitions
         : definitions definition
-        | /* empty */
+        | /* EMPTY */
         ;
 
 definition
@@ -390,7 +390,6 @@ definition
         {
 //      | interface_def
           idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceDeclSeen);
-ACE_DEBUG ((LM_DEBUG, "interface_def\n"));
         }
           ';'
         {
@@ -401,7 +400,6 @@ ACE_DEBUG ((LM_DEBUG, "interface_def\n"));
         {
 //      | template_interface_def
           idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceDeclSeen);
-ACE_DEBUG ((LM_DEBUG, "template_interface_def\n"));
         }
           ';'
         {
@@ -711,20 +709,17 @@ inheritance_spec
         {
 // inheritance_spec : ':' opt_truncatable
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);
-ACE_DEBUG ((LM_DEBUG, ": opt_truncatable\n"));
         }
           at_least_one_scoped_name
         {
 //      at_least_one_scoped_name
           $4->truncatable ($2);
           $$ = $4;
-ACE_DEBUG ((LM_DEBUG, "at_least_one_scoped_name\n"));
         }
         | /* EMPTY */
         {
 /*      |  EMPTY */
           $$ = 0;
-ACE_DEBUG ((LM_DEBUG, "EMPTY\n"));
         }
         ;
 
@@ -5810,7 +5805,6 @@ type_classifier
         {
 // type_classifier : IDL_TYPENAME
           $<ntval>$ = AST_Decl::NT_type;
-ACE_DEBUG ((LM_DEBUG, "typename token\n"));
         }
         | IDL_STRUCT
         {
@@ -5861,7 +5855,6 @@ template_interface_def
         : template_interface_header
         {
 // template_interface_def : template_interface_header
-ACE_DEBUG ((LM_DEBUG, "template_interface_header\n"));
         }
         '{'
         {
@@ -5870,7 +5863,7 @@ ACE_DEBUG ((LM_DEBUG, "template_interface_header\n"));
         }
         exports
         {
-//      exports
+//      template_exports
           idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceBodySeen);
         }
         '}'
@@ -5889,12 +5882,10 @@ template_interface_header
         : template_interface_decl
         {
 // template_interface_header : template_interface_decl
-ACE_DEBUG ((LM_DEBUG, "template_interface_decl\n"));
         }
         template_inheritance_spec
         {
 //        template_inheritance_spec
-ACE_DEBUG ((LM_DEBUG, "template_inheritance_spec\n"));
         }
         ;
 
@@ -5902,12 +5893,10 @@ template_interface_decl
         : interface_decl
         {
 // template_interface_decl : interface_decl
-ACE_DEBUG ((LM_DEBUG, "interface_decl\n"));
         }
         at_least_one_template_param
         {
 //        at_least_one_template_param
-ACE_DEBUG ((LM_DEBUG, "at_least_one_template_param\n"));
         }
         ;
 
@@ -5915,7 +5904,6 @@ at_least_one_template_param
         : '<' template_param template_params '>'
         {
 // at_least_one_template_param : '<' template_param template_params '>'
-ACE_DEBUG ((LM_DEBUG, "'<' template_param template_params '>'\n"));
         }
         ;
 
@@ -5923,7 +5911,6 @@ template_params
         : template_params ',' template_param
         {
 // template_params : template_params ',' template_param
-ACE_DEBUG ((LM_DEBUG, "template_params\n"));
         }
         | /* EMPTY */
         {
@@ -5935,7 +5922,6 @@ template_param
         : type_classifier IDENTIFIER
         {
 // template_param : type_classifier IDENTIFIER
-ACE_DEBUG ((LM_DEBUG, "template_param\n"));
         }
         ;
 
@@ -6000,7 +5986,6 @@ template_param_ref
         }
         ;
 
-
 %%
 /* programs */
 
diff --git a/modules/TAO/TAO_IDL/fe/y.tab.cpp b/modules/TAO/TAO_IDL/fe/y.tab.cpp
index a5cd5a6bf59..a172266c218 100644
--- a/modules/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/modules/TAO/TAO_IDL/fe/y.tab.cpp
@@ -837,56 +837,56 @@ static const tao_yytype_int16 tao_yyrhs[] =
 static const tao_yytype_uint16 tao_yyrline[] =
 {
        0,   331,   331,   334,   335,   340,   339,   350,   349,   360,
-     359,   370,   369,   380,   379,   390,   389,   401,   400,   412,
-     411,   422,   421,   432,   431,   442,   441,   452,   451,   462,
-     461,   475,   480,   506,   511,   474,   527,   528,   533,   572,
-     577,   532,   595,   594,   608,   646,   677,   711,   710,   724,
-     732,   733,   734,   735,   739,   750,   755,   799,   804,   754,
-     833,   872,   877,   831,   896,   894,   934,   933,   947,   953,
-     960,   967,   974,  1000,  1027,  1092,  1093,  1097,  1098,  1099,
-    1104,  1110,  1119,  1120,  1125,  1124,  1135,  1134,  1145,  1144,
-    1155,  1154,  1165,  1164,  1175,  1174,  1185,  1184,  1195,  1194,
-    1208,  1221,  1219,  1249,  1256,  1267,  1266,  1294,  1292,  1319,
-    1331,  1377,  1405,  1436,  1441,  1446,  1451,  1435,  1504,  1505,
-    1506,  1507,  1508,  1509,  1510,  1522,  1527,  1602,  1604,  1606,
-    1607,  1621,  1622,  1636,  1637,  1650,  1651,  1661,  1674,  1675,
-    1685,  1698,  1699,  1709,  1719,  1732,  1733,  1743,  1753,  1766,
-    1801,  1802,  1811,  1816,  1823,  1831,  1836,  1841,  1847,  1852,
-    1857,  1865,  1937,  1936,  1946,  1951,  1956,  1961,  1988,  1997,
-    1996,  2067,  2068,  2072,  2080,  2081,  2109,  2110,  2111,  2112,
-    2113,  2114,  2115,  2116,  2120,  2121,  2122,  2126,  2127,  2128,
-    2132,  2133,  2137,  2150,  2148,  2178,  2185,  2186,  2190,  2203,
-    2201,  2231,  2238,  2255,  2274,  2275,  2279,  2284,  2289,  2297,
-    2302,  2307,  2315,  2320,  2325,  2333,  2347,  2352,  2360,  2368,
-    2376,  2384,  2393,  2392,  2408,  2442,  2447,  2407,  2466,  2469,
-    2470,  2474,  2474,  2484,  2489,  2483,  2552,  2551,  2566,  2565,
-    2580,  2585,  2590,  2595,  2642,  2647,  2579,  2671,  2679,  2693,
-    2703,  2711,  2712,  2820,  2823,  2824,  2829,  2834,  2828,  2870,
-    2869,  2883,  2894,  2916,  2924,  2923,  2939,  2944,  2938,  2961,
-    2960,  3013,  3037,  3062,  3067,  3100,  3105,  3061,  3131,  3136,
-    3134,  3141,  3145,  3182,  3187,  3180,  3254,  3309,  3319,  3308,
-    3334,  3339,  3332,  3380,  3406,  3416,  3421,  3414,  3451,  3476,
-    3485,  3484,  3520,  3531,  3553,  3561,  3566,  3560,  3603,  3604,
-    3609,  3614,  3619,  3624,  3608,  3693,  3698,  3703,  3708,  3692,
-    3786,  3791,  3821,  3826,  3785,  3844,  3849,  3902,  3907,  3842,
-    3944,  3950,  3957,  3964,  3965,  3977,  3983,  4025,  3976,  4047,
-    4046,  4057,  4056,  4069,  4074,  4072,  4079,  4084,  4089,  4083,
-    4130,  4129,  4140,  4139,  4152,  4157,  4155,  4162,  4167,  4172,
-    4166,  4219,  4227,  4228,  4229,  4317,  4322,  4327,  4336,  4341,
-    4335,  4353,  4361,  4366,  4360,  4378,  4386,  4391,  4385,  4403,
-    4411,  4416,  4410,  4428,  4435,  4448,  4446,  4474,  4481,  4510,
-    4548,  4549,  4553,  4583,  4623,  4628,  4582,  4647,  4652,  4645,
-    4694,  4693,  4704,  4711,  4712,  4717,  4716,  4727,  4726,  4737,
-    4736,  4747,  4746,  4757,  4756,  4767,  4766,  4779,  4848,  4855,
-    4880,  4958,  4964,  4971,  5034,  5097,  5161,  5160,  5210,  5215,
-    5220,  5225,  5230,  5235,  5209,  5289,  5288,  5299,  5306,  5313,
-    5321,  5326,  5320,  5338,  5339,  5343,  5345,  5344,  5355,  5354,
-    5369,  5405,  5367,  5439,  5475,  5437,  5507,  5508,  5509,  5513,
-    5514,  5518,  5546,  5577,  5622,  5627,  5575,  5644,  5654,  5673,
-    5685,  5684,  5724,  5774,  5779,  5722,  5796,  5801,  5809,  5815,
-    5820,  5825,  5830,  5843,  5848,  5853,  5862,  5867,  5872,  5861,
-    5890,  5889,  5903,  5902,  5915,  5923,  5929,  5935,  5943,  5948,
-    5954,  5961,  5966,  5972,  5979,  5986,  5991,  5997
+     359,   370,   369,   380,   379,   390,   389,   400,   399,   410,
+     409,   420,   419,   430,   429,   440,   439,   450,   449,   460,
+     459,   473,   478,   504,   509,   472,   525,   526,   531,   570,
+     575,   530,   593,   592,   606,   644,   675,   709,   708,   720,
+     727,   728,   729,   730,   734,   745,   750,   794,   799,   749,
+     828,   867,   872,   826,   891,   889,   929,   928,   942,   948,
+     955,   962,   969,   995,  1022,  1087,  1088,  1092,  1093,  1094,
+    1099,  1105,  1114,  1115,  1120,  1119,  1130,  1129,  1140,  1139,
+    1150,  1149,  1160,  1159,  1170,  1169,  1180,  1179,  1190,  1189,
+    1203,  1216,  1214,  1244,  1251,  1262,  1261,  1289,  1287,  1314,
+    1326,  1372,  1400,  1431,  1436,  1441,  1446,  1430,  1499,  1500,
+    1501,  1502,  1503,  1504,  1505,  1517,  1522,  1597,  1599,  1601,
+    1602,  1616,  1617,  1631,  1632,  1645,  1646,  1656,  1669,  1670,
+    1680,  1693,  1694,  1704,  1714,  1727,  1728,  1738,  1748,  1761,
+    1796,  1797,  1806,  1811,  1818,  1826,  1831,  1836,  1842,  1847,
+    1852,  1860,  1932,  1931,  1941,  1946,  1951,  1956,  1983,  1992,
+    1991,  2062,  2063,  2067,  2075,  2076,  2104,  2105,  2106,  2107,
+    2108,  2109,  2110,  2111,  2115,  2116,  2117,  2121,  2122,  2123,
+    2127,  2128,  2132,  2145,  2143,  2173,  2180,  2181,  2185,  2198,
+    2196,  2226,  2233,  2250,  2269,  2270,  2274,  2279,  2284,  2292,
+    2297,  2302,  2310,  2315,  2320,  2328,  2342,  2347,  2355,  2363,
+    2371,  2379,  2388,  2387,  2403,  2437,  2442,  2402,  2461,  2464,
+    2465,  2469,  2469,  2479,  2484,  2478,  2547,  2546,  2561,  2560,
+    2575,  2580,  2585,  2590,  2637,  2642,  2574,  2666,  2674,  2688,
+    2698,  2706,  2707,  2815,  2818,  2819,  2824,  2829,  2823,  2865,
+    2864,  2878,  2889,  2911,  2919,  2918,  2934,  2939,  2933,  2956,
+    2955,  3008,  3032,  3057,  3062,  3095,  3100,  3056,  3126,  3131,
+    3129,  3136,  3140,  3177,  3182,  3175,  3249,  3304,  3314,  3303,
+    3329,  3334,  3327,  3375,  3401,  3411,  3416,  3409,  3446,  3471,
+    3480,  3479,  3515,  3526,  3548,  3556,  3561,  3555,  3598,  3599,
+    3604,  3609,  3614,  3619,  3603,  3688,  3693,  3698,  3703,  3687,
+    3781,  3786,  3816,  3821,  3780,  3839,  3844,  3897,  3902,  3837,
+    3939,  3945,  3952,  3959,  3960,  3972,  3978,  4020,  3971,  4042,
+    4041,  4052,  4051,  4064,  4069,  4067,  4074,  4079,  4084,  4078,
+    4125,  4124,  4135,  4134,  4147,  4152,  4150,  4157,  4162,  4167,
+    4161,  4214,  4222,  4223,  4224,  4312,  4317,  4322,  4331,  4336,
+    4330,  4348,  4356,  4361,  4355,  4373,  4381,  4386,  4380,  4398,
+    4406,  4411,  4405,  4423,  4430,  4443,  4441,  4469,  4476,  4505,
+    4543,  4544,  4548,  4578,  4618,  4623,  4577,  4642,  4647,  4640,
+    4689,  4688,  4699,  4706,  4707,  4712,  4711,  4722,  4721,  4732,
+    4731,  4742,  4741,  4752,  4751,  4762,  4761,  4774,  4843,  4850,
+    4875,  4953,  4959,  4966,  5029,  5092,  5156,  5155,  5205,  5210,
+    5215,  5220,  5225,  5230,  5204,  5284,  5283,  5294,  5301,  5308,
+    5316,  5321,  5315,  5333,  5334,  5338,  5340,  5339,  5350,  5349,
+    5364,  5400,  5362,  5434,  5470,  5432,  5502,  5503,  5504,  5508,
+    5509,  5513,  5541,  5572,  5617,  5622,  5570,  5639,  5649,  5668,
+    5680,  5679,  5719,  5769,  5774,  5717,  5791,  5796,  5804,  5809,
+    5814,  5819,  5824,  5837,  5842,  5847,  5856,  5860,  5865,  5855,
+    5883,  5882,  5894,  5893,  5904,  5911,  5916,  5922,  5929,  5934,
+    5940,  5947,  5952,  5958,  5965,  5972,  5977,  5983
 };
 #endif
 
@@ -2570,7 +2570,6 @@ tao_yyreduce:
     {
 //      | interface_def
           idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceDeclSeen);
-ACE_DEBUG ((LM_DEBUG, "interface_def\n"));
         }
     break;
 
@@ -2587,7 +2586,6 @@ ACE_DEBUG ((LM_DEBUG, "interface_def\n"));
     {
 //      | template_interface_def
           idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceDeclSeen);
-ACE_DEBUG ((LM_DEBUG, "template_interface_def\n"));
         }
     break;
 
@@ -2960,7 +2958,6 @@ ACE_DEBUG ((LM_DEBUG, "template_interface_def\n"));
     {
 // inheritance_spec : ':' opt_truncatable
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);
-ACE_DEBUG ((LM_DEBUG, ": opt_truncatable\n"));
         }
     break;
 
@@ -2970,7 +2967,6 @@ ACE_DEBUG ((LM_DEBUG, ": opt_truncatable\n"));
 //      at_least_one_scoped_name
           (tao_yyvsp[(4) - (4)].nlval)->truncatable ((tao_yyvsp[(2) - (4)].bval));
           (tao_yyval.nlval) = (tao_yyvsp[(4) - (4)].nlval);
-ACE_DEBUG ((LM_DEBUG, "at_least_one_scoped_name\n"));
         }
     break;
 
@@ -2979,7 +2975,6 @@ ACE_DEBUG ((LM_DEBUG, "at_least_one_scoped_name\n"));
     {
 /*      |  EMPTY */
           (tao_yyval.nlval) = 0;
-ACE_DEBUG ((LM_DEBUG, "EMPTY\n"));
         }
     break;
 
@@ -8519,7 +8514,6 @@ ACE_DEBUG ((LM_DEBUG, "EMPTY\n"));
     {
 // type_classifier : IDL_TYPENAME
           (tao_yyval.ntval) = AST_Decl::NT_type;
-ACE_DEBUG ((LM_DEBUG, "typename token\n"));
         }
     break;
 
@@ -8591,7 +8585,6 @@ ACE_DEBUG ((LM_DEBUG, "typename token\n"));
 
     {
 // template_interface_def : template_interface_header
-ACE_DEBUG ((LM_DEBUG, "template_interface_header\n"));
         }
     break;
 
@@ -8606,7 +8599,7 @@ ACE_DEBUG ((LM_DEBUG, "template_interface_header\n"));
   case 488:
 
     {
-//      exports
+//      template_exports
           idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceBodySeen);
         }
     break;
@@ -8628,7 +8621,6 @@ ACE_DEBUG ((LM_DEBUG, "template_interface_header\n"));
 
     {
 // template_interface_header : template_interface_decl
-ACE_DEBUG ((LM_DEBUG, "template_interface_decl\n"));
         }
     break;
 
@@ -8636,7 +8628,6 @@ ACE_DEBUG ((LM_DEBUG, "template_interface_decl\n"));
 
     {
 //        template_inheritance_spec
-ACE_DEBUG ((LM_DEBUG, "template_inheritance_spec\n"));
         }
     break;
 
@@ -8644,7 +8635,6 @@ ACE_DEBUG ((LM_DEBUG, "template_inheritance_spec\n"));
 
     {
 // template_interface_decl : interface_decl
-ACE_DEBUG ((LM_DEBUG, "interface_decl\n"));
         }
     break;
 
@@ -8652,7 +8642,6 @@ ACE_DEBUG ((LM_DEBUG, "interface_decl\n"));
 
     {
 //        at_least_one_template_param
-ACE_DEBUG ((LM_DEBUG, "at_least_one_template_param\n"));
         }
     break;
 
@@ -8660,7 +8649,6 @@ ACE_DEBUG ((LM_DEBUG, "at_least_one_template_param\n"));
 
     {
 // at_least_one_template_param : '<' template_param template_params '>'
-ACE_DEBUG ((LM_DEBUG, "'<' template_param template_params '>'\n"));
         }
     break;
 
@@ -8668,7 +8656,6 @@ ACE_DEBUG ((LM_DEBUG, "'<' template_param template_params '>'\n"));
 
     {
 // template_params : template_params ',' template_param
-ACE_DEBUG ((LM_DEBUG, "template_params\n"));
         }
     break;
 
@@ -8683,7 +8670,6 @@ ACE_DEBUG ((LM_DEBUG, "template_params\n"));
 
     {
 // template_param : type_classifier IDENTIFIER
-ACE_DEBUG ((LM_DEBUG, "template_param\n"));
         }
     break;
 
diff --git a/modules/TAO/TAO_IDL/fe/y.tab.cpp.diff b/modules/TAO/TAO_IDL/fe/y.tab.cpp.diff
index f7514eda0a2..cd045b5f007 100644
--- a/modules/TAO/TAO_IDL/fe/y.tab.cpp.diff
+++ b/modules/TAO/TAO_IDL/fe/y.tab.cpp.diff
@@ -1,6 +1,6 @@
 --- y.tab.cpp.orig	2009-06-23 14:56:31.000000000 -0500
 +++ y.tab.cpp	2009-06-23 15:04:04.000000000 -0500
-@@ -1824,13 +1824,9 @@ tao_yy_symbol_value_print (tao_yyoutput,
+@@ -1935,13 +1935,9 @@ tao_yy_symbol_value_print (tao_yyoutput,
    if (tao_yytype < TAO_YYNTOKENS)
      TAO_YYPRINT (tao_yyoutput, tao_yytoknum[tao_yytype], *tao_yyvaluep);
  # else
@@ -15,7 +15,7 @@
  }
  
  
-@@ -2187,13 +2187,6 @@ tao_yydestruct (tao_yymsg, tao_yytype, t
+@@ -2298,13 +2298,6 @@ tao_yydestruct (tao_yymsg, tao_yytype, t
    if (!tao_yymsg)
      tao_yymsg = "Deleting";
    TAO_YY_SYMBOL_PRINT (tao_yymsg, tao_yytype, tao_yyvaluep, tao_yylocationp);