ChangeLogTag: Fri Aug 21 13:51:19 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>

3 files changed, 69 insertions, 61 deletions

diff --git a/modules/TAO/ChangeLog b/modules/TAO/ChangeLog
index 3091f17a805..977bc01a6fe 100644
--- a/modules/TAO/ChangeLog
+++ b/modules/TAO/ChangeLog
@@ -1,7 +1,14 @@
+Fri Aug 21 16:16:32 UTC 2009  Jeff Parsons  <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/y.tab.cpp:
+
+          Regenerated and recompiled.
+
 Fri Aug 21 16:07:29 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/fe/idl.yy:
-        
+
           Added code to set the member of the big parsing union with
           the pointer to an instantiated connector, once it's created.
 
diff --git a/modules/TAO/TAO_IDL/fe/idl.yy b/modules/TAO/TAO_IDL/fe/idl.yy
index b19ef42278c..c8ee72d9c59 100644
--- a/modules/TAO/TAO_IDL/fe/idl.yy
+++ b/modules/TAO/TAO_IDL/fe/idl.yy
@@ -90,6 +90,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_template_interface.h"
 #include "ast_porttype.h"
 #include "ast_connector.h"
+#include "ast_instantiated_connector.h"
 #include "ast_uses.h"
 #include "ast_constant.h"
 #include "ast_union.h"
diff --git a/modules/TAO/TAO_IDL/fe/y.tab.cpp b/modules/TAO/TAO_IDL/fe/y.tab.cpp
index 6c2f78e7c22..adfa6fbcec9 100644
--- a/modules/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/modules/TAO/TAO_IDL/fe/y.tab.cpp
@@ -262,6 +262,7 @@
 #include "ast_template_interface.h"
 #include "ast_porttype.h"
 #include "ast_connector.h"
+#include "ast_instantiated_connector.h"
 #include "ast_uses.h"
 #include "ast_constant.h"
 #include "ast_union.h"
@@ -875,63 +876,63 @@ static const tao_yytype_int16 tao_yyrhs[] =
 /* TAO_YYRLINE[TAO_YYN] -- source line where rule number TAO_YYN was defined.  */
 static const tao_yytype_uint16 tao_yyrline[] =
 {
-       0,   368,   368,   371,   372,   377,   376,   387,   386,   397,
-     396,   407,   406,   417,   416,   427,   426,   437,   436,   447,
-     446,   457,   456,   467,   466,   477,   476,   487,   486,   497,
-     496,   507,   506,   517,   516,   530,   535,   561,   566,   529,
-     582,   583,   588,   627,   632,   587,   650,   649,   663,   701,
-     732,   766,   765,   777,   784,   785,   786,   787,   791,   802,
-     807,   851,   856,   806,   885,   924,   929,   883,   948,   946,
-     986,   985,   999,  1005,  1012,  1019,  1026,  1052,  1079,  1144,
-    1145,  1149,  1150,  1151,  1156,  1162,  1171,  1172,  1177,  1176,
-    1187,  1186,  1197,  1196,  1207,  1206,  1217,  1216,  1227,  1226,
-    1237,  1236,  1247,  1246,  1260,  1273,  1271,  1301,  1308,  1319,
-    1318,  1346,  1344,  1371,  1383,  1429,  1457,  1488,  1493,  1498,
-    1503,  1487,  1556,  1557,  1558,  1559,  1560,  1561,  1562,  1574,
-    1579,  1654,  1656,  1658,  1659,  1673,  1674,  1688,  1689,  1702,
-    1703,  1713,  1726,  1727,  1737,  1750,  1751,  1761,  1771,  1784,
-    1785,  1795,  1805,  1818,  1853,  1854,  1863,  1868,  1875,  1883,
-    1888,  1893,  1899,  1904,  1909,  1917,  1989,  1988,  1998,  2003,
-    2008,  2013,  2040,  2049,  2048,  2119,  2120,  2124,  2132,  2133,
-    2161,  2162,  2163,  2164,  2165,  2166,  2167,  2168,  2172,  2173,
-    2174,  2175,  2179,  2180,  2181,  2185,  2186,  2190,  2203,  2201,
-    2231,  2238,  2239,  2243,  2256,  2254,  2284,  2291,  2308,  2327,
-    2328,  2332,  2337,  2342,  2350,  2355,  2360,  2368,  2373,  2378,
-    2386,  2400,  2405,  2413,  2421,  2429,  2437,  2446,  2445,  2461,
-    2495,  2500,  2460,  2519,  2522,  2523,  2527,  2527,  2537,  2542,
-    2536,  2605,  2604,  2619,  2618,  2633,  2638,  2643,  2648,  2695,
-    2700,  2632,  2724,  2732,  2746,  2756,  2764,  2765,  2873,  2876,
-    2877,  2882,  2887,  2881,  2923,  2922,  2936,  2947,  2969,  2977,
-    2976,  2992,  2997,  2991,  3014,  3013,  3066,  3090,  3115,  3120,
-    3153,  3158,  3114,  3184,  3189,  3187,  3194,  3198,  3235,  3240,
-    3233,  3307,  3362,  3372,  3361,  3387,  3392,  3385,  3433,  3459,
-    3469,  3474,  3467,  3504,  3529,  3538,  3537,  3573,  3584,  3606,
-    3614,  3619,  3613,  3656,  3657,  3662,  3667,  3672,  3677,  3661,
-    3746,  3751,  3756,  3761,  3745,  3839,  3844,  3874,  3879,  3838,
-    3897,  3902,  3955,  3960,  3895,  3997,  4003,  4010,  4017,  4018,
-    4030,  4036,  4078,  4029,  4100,  4099,  4110,  4109,  4122,  4127,
-    4125,  4132,  4137,  4142,  4136,  4183,  4182,  4193,  4192,  4205,
-    4210,  4208,  4215,  4220,  4225,  4219,  4272,  4280,  4281,  4282,
-    4370,  4375,  4380,  4389,  4394,  4388,  4406,  4414,  4419,  4413,
-    4431,  4439,  4444,  4438,  4456,  4464,  4469,  4463,  4481,  4488,
-    4501,  4499,  4527,  4534,  4563,  4601,  4602,  4606,  4636,  4676,
-    4681,  4635,  4700,  4705,  4698,  4747,  4746,  4757,  4764,  4765,
-    4770,  4769,  4780,  4779,  4790,  4789,  4800,  4799,  4810,  4809,
-    4820,  4819,  4830,  4829,  4841,  4900,  4907,  4931,  5005,  5015,
-    5021,  5027,  5074,  5121,  5170,  5169,  5219,  5224,  5229,  5234,
-    5239,  5244,  5218,  5298,  5297,  5308,  5315,  5322,  5330,  5335,
-    5329,  5347,  5348,  5352,  5354,  5353,  5364,  5363,  5378,  5414,
-    5376,  5448,  5484,  5446,  5516,  5517,  5518,  5522,  5523,  5527,
-    5555,  5586,  5631,  5636,  5584,  5653,  5663,  5682,  5694,  5693,
-    5733,  5783,  5788,  5731,  5805,  5810,  5818,  5823,  5828,  5833,
-    5838,  5851,  5856,  5861,  5870,  5892,  5897,  5869,  5914,  5932,
-    5937,  5931,  5960,  5959,  5981,  5988,  6002,  6008,  6015,  6034,
-    6051,  6058,  6068,  6079,  6103,  6110,  6121,  6126,  6131,  6152,
-    6157,  6120,  6172,  6178,  6185,  6192,  6197,  6204,  6203,  6212,
-    6211,  6222,  6227,  6281,  6286,  6340,  6341,  6345,  6403,  6464,
-    6524,  6587,  6598,  6603,  6608,  6613,  6602,  6673,  6678,  6672,
-    6693,  6697,  6698,  6703,  6702,  6713,  6712,  6723,  6722,  6733,
-    6732,  6743,  6742,  6759,  6780,  6804,  6844
+       0,   369,   369,   372,   373,   378,   377,   388,   387,   398,
+     397,   408,   407,   418,   417,   428,   427,   438,   437,   448,
+     447,   458,   457,   468,   467,   478,   477,   488,   487,   498,
+     497,   508,   507,   518,   517,   531,   536,   562,   567,   530,
+     583,   584,   589,   628,   633,   588,   651,   650,   664,   702,
+     733,   767,   766,   778,   785,   786,   787,   788,   792,   803,
+     808,   852,   857,   807,   886,   925,   930,   884,   949,   947,
+     987,   986,  1000,  1006,  1013,  1020,  1027,  1053,  1080,  1145,
+    1146,  1150,  1151,  1152,  1157,  1163,  1172,  1173,  1178,  1177,
+    1188,  1187,  1198,  1197,  1208,  1207,  1218,  1217,  1228,  1227,
+    1238,  1237,  1248,  1247,  1261,  1274,  1272,  1302,  1309,  1320,
+    1319,  1347,  1345,  1372,  1384,  1430,  1458,  1489,  1494,  1499,
+    1504,  1488,  1557,  1558,  1559,  1560,  1561,  1562,  1563,  1575,
+    1580,  1655,  1657,  1659,  1660,  1674,  1675,  1689,  1690,  1703,
+    1704,  1714,  1727,  1728,  1738,  1751,  1752,  1762,  1772,  1785,
+    1786,  1796,  1806,  1819,  1854,  1855,  1864,  1869,  1876,  1884,
+    1889,  1894,  1900,  1905,  1910,  1918,  1990,  1989,  1999,  2004,
+    2009,  2014,  2041,  2050,  2049,  2120,  2121,  2125,  2133,  2134,
+    2162,  2163,  2164,  2165,  2166,  2167,  2168,  2169,  2173,  2174,
+    2175,  2176,  2180,  2181,  2182,  2186,  2187,  2191,  2204,  2202,
+    2232,  2239,  2240,  2244,  2257,  2255,  2285,  2292,  2309,  2328,
+    2329,  2333,  2338,  2343,  2351,  2356,  2361,  2369,  2374,  2379,
+    2387,  2401,  2406,  2414,  2422,  2430,  2438,  2447,  2446,  2462,
+    2496,  2501,  2461,  2520,  2523,  2524,  2528,  2528,  2538,  2543,
+    2537,  2606,  2605,  2620,  2619,  2634,  2639,  2644,  2649,  2696,
+    2701,  2633,  2725,  2733,  2747,  2757,  2765,  2766,  2874,  2877,
+    2878,  2883,  2888,  2882,  2924,  2923,  2937,  2948,  2970,  2978,
+    2977,  2993,  2998,  2992,  3015,  3014,  3067,  3091,  3116,  3121,
+    3154,  3159,  3115,  3185,  3190,  3188,  3195,  3199,  3236,  3241,
+    3234,  3308,  3363,  3373,  3362,  3388,  3393,  3386,  3434,  3460,
+    3470,  3475,  3468,  3505,  3530,  3539,  3538,  3574,  3585,  3607,
+    3615,  3620,  3614,  3657,  3658,  3663,  3668,  3673,  3678,  3662,
+    3747,  3752,  3757,  3762,  3746,  3840,  3845,  3875,  3880,  3839,
+    3898,  3903,  3956,  3961,  3896,  3998,  4004,  4011,  4018,  4019,
+    4031,  4037,  4079,  4030,  4101,  4100,  4111,  4110,  4123,  4128,
+    4126,  4133,  4138,  4143,  4137,  4184,  4183,  4194,  4193,  4206,
+    4211,  4209,  4216,  4221,  4226,  4220,  4273,  4281,  4282,  4283,
+    4371,  4376,  4381,  4390,  4395,  4389,  4407,  4415,  4420,  4414,
+    4432,  4440,  4445,  4439,  4457,  4465,  4470,  4464,  4482,  4489,
+    4502,  4500,  4528,  4535,  4564,  4602,  4603,  4607,  4637,  4677,
+    4682,  4636,  4701,  4706,  4699,  4748,  4747,  4758,  4765,  4766,
+    4771,  4770,  4781,  4780,  4791,  4790,  4801,  4800,  4811,  4810,
+    4821,  4820,  4831,  4830,  4842,  4901,  4908,  4932,  5006,  5016,
+    5022,  5028,  5075,  5122,  5171,  5170,  5220,  5225,  5230,  5235,
+    5240,  5245,  5219,  5299,  5298,  5309,  5316,  5323,  5331,  5336,
+    5330,  5348,  5349,  5353,  5355,  5354,  5365,  5364,  5379,  5415,
+    5377,  5449,  5485,  5447,  5517,  5518,  5519,  5523,  5524,  5528,
+    5556,  5587,  5632,  5637,  5585,  5654,  5664,  5683,  5695,  5694,
+    5734,  5784,  5789,  5732,  5806,  5811,  5819,  5824,  5829,  5834,
+    5839,  5852,  5857,  5862,  5871,  5893,  5898,  5870,  5915,  5933,
+    5938,  5932,  5961,  5960,  5982,  5989,  6003,  6009,  6016,  6035,
+    6052,  6059,  6069,  6080,  6104,  6111,  6122,  6127,  6132,  6153,
+    6158,  6121,  6173,  6179,  6186,  6193,  6198,  6205,  6204,  6213,
+    6212,  6223,  6228,  6282,  6287,  6341,  6342,  6346,  6404,  6465,
+    6525,  6588,  6599,  6604,  6609,  6614,  6603,  6674,  6679,  6673,
+    6694,  6698,  6699,  6704,  6703,  6714,  6713,  6724,  6723,  6734,
+    6733,  6744,  6743,  6760,  6781,  6805,  6845
 };
 #endif
 
@@ -9778,6 +9779,7 @@ tao_yyreduce:
     {
 // connector_inst_spec : template_inst
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
+          (tao_yyval.dcval) = 0;
 
           AST_Decl *d =
             s->lookup_by_name ((tao_yyvsp[(1) - (1)].tival)->name_, true);
@@ -9806,13 +9808,11 @@ tao_yyreduce:
                       Identifier id ("connector");
                       UTL_ScopedName sn (&id, 0);
 
-                      AST_Instantiated_Connector *ic =
+                      (tao_yyval.dcval) =
                         idl_global->gen ()->create_instantiated_connector (
                           &sn,
                           c,
                           args);
-
-                      (void) s->fe_add_instantiated_connector (ic);
                     }
                 }
             }