ChangeLogTag: Mon Jul 27 19:20:07 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>

3 files changed, 66 insertions, 59 deletions

diff --git a/modules/TAO/ChangeLog b/modules/TAO/ChangeLog
index b61bd15ac22..4fddd31868c 100644
--- a/modules/TAO/ChangeLog
+++ b/modules/TAO/ChangeLog
@@ -1,10 +1,17 @@
+Mon Jul 27 19:20:07 UTC 2009  Jeff Parsons  <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/y.tab.cpp:
+
+          Fixed typos in idl.yy and regenerated.
+
 Mon Jul 27 18:57:11 UTC 2009  Jeff Parsons  <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/include/ast_connector.h:
         * TAO_IDL/ast/ast_connector.cp:
-        
+
           New files, defining a connector node class.
-        
+
         * TAO_IDL/ast/ast_extended_port.cpp:
         * TAO_IDL/ast/ast_generator.cpp:
         * TAO_IDL/ast/ast_mirror_port.cpp:
@@ -28,7 +35,7 @@ Mon Jul 27 18:57:11 UTC 2009  Jeff Parsons  <j.parsons@vanderbilt.edu>
         * TAO_IDL/include/ast_porttype.h:
         * TAO_IDL/include/utl_err.h:
         * TAO_IDL/util/utl_err.cpp:
-        
+
           Changed extended port and mirror port classes to take
           an actual list of AST nodes, instead of a list of names.
           Lookup and error checking on the list of names is now
diff --git a/modules/TAO/TAO_IDL/fe/idl.yy b/modules/TAO/TAO_IDL/fe/idl.yy
index d8be251ecc2..19737e7ce94 100644
--- a/modules/TAO/TAO_IDL/fe/idl.yy
+++ b/modules/TAO/TAO_IDL/fe/idl.yy
@@ -6329,6 +6329,7 @@ extended_port_decl
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d = s->lookup_by_name ($2->name_, true);
           AST_PortType *pt = 0;
+          AST_PortType::T_ARGLIST *args = 0;
           bool so_far_so_good = true;
 
           if (d == 0)
@@ -6349,8 +6350,8 @@ extended_port_decl
                else
                  {
                    args =
-                     pt->match_arg_names ((tao_yyvsp[(2) - (3)].tival)->args_);
-                
+                     pt->match_arg_names ($2->args_);
+
                    if (args == 0)
                      {
                        so_far_so_good = false;
@@ -6386,7 +6387,6 @@ extended_port_decl
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d = s->lookup_by_name ($2, true);
           AST_PortType *pt = 0;
-          AST_PortType::T_ARGLIST *args = 0;
           bool so_far_so_good = true;
 
           if (d == 0)
@@ -6408,7 +6408,7 @@ extended_port_decl
                 {
                   FE_Utils::T_PARAMLIST_INFO *p_list =
                     pt->template_params ();
-                    
+
                   if (p_list != 0 && p_list->size () != 0)
                     {
                       idl_global->err ()->error0 (
@@ -6468,8 +6468,8 @@ extended_port_decl
                else
                  {
                    args =
-                     pt->match_arg_names ((tao_yyvsp[(2) - (3)].tival)->args_);
-                
+                     pt->match_arg_names ($2->args_);
+
                    if (args == 0)
                      {
                        so_far_so_good = false;
@@ -6526,7 +6526,7 @@ extended_port_decl
                  {
                    FE_Utils::T_PARAMLIST_INFO *p_list =
                      pt->template_params ();
-                    
+
                    if (p_list != 0 && p_list->size () != 0)
                      {
                        idl_global->err ()->error0 (
diff --git a/modules/TAO/TAO_IDL/fe/y.tab.cpp b/modules/TAO/TAO_IDL/fe/y.tab.cpp
index 9ecc8797fce..6543ae40909 100644
--- a/modules/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/modules/TAO/TAO_IDL/fe/y.tab.cpp
@@ -916,7 +916,7 @@ static const tao_yytype_uint16 tao_yyrline[] =
     5944,  5966,  5973,  5987,  5993,  6000,  6019,  6036,  6043,  6053,
     6064,  6088,  6095,  6106,  6111,  6116,  6137,  6142,  6105,  6157,
     6163,  6170,  6177,  6182,  6189,  6188,  6197,  6196,  6207,  6212,
-    6266,  6271,  6325,  6373,  6421,  6469,  6520
+    6266,  6271,  6325,  6383,  6443,  6501,  6564
 };
 #endif
 
@@ -9192,31 +9192,31 @@ tao_yyreduce:
           AST_PortType::T_ARGLIST *args = 0;
           bool so_far_so_good = true;
 
-         if (d == 0)
-           {
-             idl_global->err ()->lookup_error ((tao_yyvsp[(2) - (3)].tival)->name_);
-             so_far_so_good = false;
-           }
-          else
+          if (d == 0)
             {
-              pt = AST_PortType::narrow_from_decl (d);
+              idl_global->err ()->lookup_error ((tao_yyvsp[(2) - (3)].tival)->name_);
+              so_far_so_good = false;
+            }
+           else
+             {
+               pt = AST_PortType::narrow_from_decl (d);
 
-              if (pt == 0)
-                {
-                  idl_global->err ()->error1 (UTL_Error::EIDL_PORTTYPE_EXPECTED,
-                                              d);
-                  so_far_so_good = false;
-                }
-              else
-                {
-                  args =
-                    pt->match_arg_names ((tao_yyvsp[(2) - (3)].tival)->args_);
-                
-                  if (args == 0)
-                    {
-                      so_far_so_good = false;
-                    }
-                }
+               if (pt == 0)
+                 {
+                   idl_global->err ()->error1 (UTL_Error::EIDL_PORTTYPE_EXPECTED,
+                                               d);
+                   so_far_so_good = false;
+                 }
+               else
+                 {
+                   args =
+                     pt->match_arg_names ((tao_yyvsp[(2) - (3)].tival)->args_);
+
+                   if (args == 0)
+                     {
+                       so_far_so_good = false;
+                     }
+                 }
              }
 
           if (so_far_so_good)
@@ -9257,29 +9257,29 @@ tao_yyreduce:
               idl_global->err ()->lookup_error ((tao_yyvsp[(2) - (3)].idlist));
               so_far_so_good = false;
             }
-           else
-             {
-               pt = AST_PortType::narrow_from_decl (d);
+          else
+            {
+              pt = AST_PortType::narrow_from_decl (d);
 
-               if (pt == 0)
-                 {
-                   idl_global->err ()->error1 (UTL_Error::EIDL_PORTTYPE_EXPECTED,
-                                               d);
-                   so_far_so_good = false;
-                 }
-               else
-                 {
-                   FE_Utils::T_PARAMLIST_INFO *p_list =
-                     pt->template_params ();
-                    
-                   if (p_list != 0 && p_list->size () != 0)
-                     {
-                       idl_global->err ()->error0 (
-                         UTL_Error::EIDL_T_ARG_LENGTH);
-                       so_far_so_good = false;  
-                     }
-                 }
-             }
+              if (pt == 0)
+                {
+                  idl_global->err ()->error1 (UTL_Error::EIDL_PORTTYPE_EXPECTED,
+                                              d);
+                  so_far_so_good = false;
+                }
+              else
+                {
+                  FE_Utils::T_PARAMLIST_INFO *p_list =
+                    pt->template_params ();
+
+                  if (p_list != 0 && p_list->size () != 0)
+                    {
+                      idl_global->err ()->error0 (
+                        UTL_Error::EIDL_T_ARG_LENGTH);
+                      so_far_so_good = false;
+                    }
+                }
+            }
 
           if (so_far_so_good)
             {
@@ -9335,7 +9335,7 @@ tao_yyreduce:
                  {
                    args =
                      pt->match_arg_names ((tao_yyvsp[(2) - (3)].tival)->args_);
-                
+
                    if (args == 0)
                      {
                        so_far_so_good = false;
@@ -9395,12 +9395,12 @@ tao_yyreduce:
                  {
                    FE_Utils::T_PARAMLIST_INFO *p_list =
                      pt->template_params ();
-                    
+
                    if (p_list != 0 && p_list->size () != 0)
                      {
                        idl_global->err ()->error0 (
                          UTL_Error::EIDL_T_ARG_LENGTH);
-                       so_far_so_good = false;  
+                       so_far_so_good = false;
                      }
                  }
              }