From 6c66a8e0d5a8d9025d34da6d1f526a778b0b7a80 Mon Sep 17 00:00:00 2001 From: crouzet Date: Fri, 17 Jul 2009 12:07:03 +0000 Subject: [PATCH] Portage pour SALOME V5/YACS. Replace Sender types by YACS types sequence (dblevec) and dbleint --- scripts/parse3.awk | 63 ++++++++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/scripts/parse3.awk b/scripts/parse3.awk index 6bd5867..22d3daa 100644 --- a/scripts/parse3.awk +++ b/scripts/parse3.awk @@ -42,14 +42,14 @@ BEGIN { idl_arg_type["const MEDMEM::FIELD*"]="in SALOME_MED::FIELDDOUBLE" idl_arg_type["const MEDMEM::FIELD&"]="in SALOME_MED::FIELDDOUBLE" idl_arg_type["MEDMEM::FIELD*&"]="out SALOME_MED::FIELDDOUBLE" - idl_arg_type["const std::vector&"]="in SALOME::SenderDouble" + idl_arg_type["const std::vector&"]="in SALOME::vectorOfDouble" idl_arg_type["const std::vector >&"]="in SALOME::Matrix" - idl_arg_type["std::vector*&"]="out SALOME::SenderDouble" + idl_arg_type["std::vector*&"]="out SALOME::vectorOfDouble" idl_arg_type["const MEDMEM::FIELD*"]="in SALOME_MED::FIELDINT" idl_arg_type["const MEDMEM::FIELD&"]="in SALOME_MED::FIELDINT" idl_arg_type["MEDMEM::FIELD*&"]="out SALOME_MED::FIELDINT" - idl_arg_type["const std::vector&"]="in SALOME::SenderInt" - idl_arg_type["std::vector*&"]="out SALOME::SenderInt" + idl_arg_type["const std::vector&"]="in SALOME::vectorOfLong" + idl_arg_type["std::vector*&"]="out SALOME::vectorOfLong" # # # mapping for returned types @@ -73,13 +73,13 @@ BEGIN { idl_rtn_type["MEDMEM::FIELD*"]="SALOME_MED::FIELDDOUBLE" idl_rtn_type["MEDMEM::FIELD&"]="SALOME_MED::FIELDDOUBLE" idl_rtn_type["const MEDMEM::FIELD&"]="SALOME_MED::FIELDDOUBLE" - idl_rtn_type["std::vector*"]="SALOME::SenderDouble" + idl_rtn_type["std::vector*"]="SALOME::vectorOfDouble" idl_rtn_type["std::vector >*"]="SALOME::Matrix" idl_rtn_type["const MEDMEM::FIELD*"]="SALOME_MED::FIELDINT" idl_rtn_type["MEDMEM::FIELD*"]="SALOME_MED::FIELDINT" idl_rtn_type["MEDMEM::FIELD&"]="SALOME_MED::FIELDINT" idl_rtn_type["const MEDMEM::FIELD&"]="SALOME_MED::FIELDINT" - idl_rtn_type["std::vector*"]="SALOME::SenderInt" + idl_rtn_type["std::vector*"]="SALOME::vectorOfLong" # # # Corba mapping table (for argument's types and returned types) @@ -100,13 +100,13 @@ BEGIN { idl_impl_hxx["in SALOME_MED::SUPPORT"]="SALOME_MED::SUPPORT_ptr" idl_impl_hxx["in SALOME_MED::FIELDDOUBLE"]="SALOME_MED::FIELDDOUBLE_ptr" idl_impl_hxx["out SALOME_MED::FIELDDOUBLE"]="SALOME_MED::FIELDDOUBLE_out" - idl_impl_hxx["in SALOME::SenderDouble"]="SALOME::SenderDouble_ptr" - idl_impl_hxx["out SALOME::SenderDouble"]="SALOME::SenderDouble_out" + idl_impl_hxx["in SALOME::vectorOfDouble"]="const SALOME::vectorOfDouble&" + idl_impl_hxx["out SALOME::vectorOfDouble"]="SALOME::vectorOfDouble_out" idl_impl_hxx["in SALOME::Matrix"]="SALOME::Matrix_ptr" idl_impl_hxx["in SALOME_MED::FIELDINT"]="SALOME_MED::FIELDINT_ptr" idl_impl_hxx["out SALOME_MED::FIELDINT"]="SALOME_MED::FIELDINT_out" - idl_impl_hxx["in SALOME::SenderInt"]="SALOME::SenderInt_ptr" - idl_impl_hxx["out SALOME::SenderInt"]="SALOME::SenderInt_out" + idl_impl_hxx["in SALOME::vectorOfLong"]="const SALOME::vectorOfLong&" + idl_impl_hxx["out SALOME::vectorOfLong"]="SALOME::vectorOfLong_out" idl_impl_hxx["void"]="void" idl_impl_hxx["long"]="CORBA::Long" idl_impl_hxx["double"]="CORBA::Double" @@ -115,10 +115,10 @@ BEGIN { idl_impl_hxx["SALOME_MED::MESH"]="SALOME_MED::MESH_ptr" idl_impl_hxx["SALOME_MED::SUPPORT"]="SALOME_MED::SUPPORT_ptr" idl_impl_hxx["SALOME_MED::FIELDDOUBLE"]="SALOME_MED::FIELDDOUBLE_ptr" - idl_impl_hxx["SALOME::SenderDouble"]="SALOME::SenderDouble_ptr" + idl_impl_hxx["SALOME::vectorOfDouble"]="SALOME::vectorOfDouble*" idl_impl_hxx["SALOME::Matrix"]="SALOME::Matrix_ptr" idl_impl_hxx["SALOME_MED::FIELDINT"]="SALOME_MED::FIELDINT_ptr" - idl_impl_hxx["SALOME::SenderInt"]="SALOME::SenderInt_ptr" + idl_impl_hxx["SALOME::vectorOfLong"]="SALOME::vectorOfLong*" # # # table for c++ code generation : argument's processing @@ -145,8 +145,10 @@ BEGIN { cpp_impl_a["MEDMEM::FIELD*&"]="\tMEDMEM::FIELD* _%s;\n" cpp_impl_a["const MEDMEM::FIELD*"]="\tstd::auto_ptr > _%s ( new MEDMEM::FIELDClient(%s) );\n" cpp_impl_a["const MEDMEM::FIELD&"]="\tMEDMEM::FIELDClient _%s(%s);\n" - cpp_impl_a["const std::vector&"]="\tlong _%s_size;\n\tdouble *_%s_value = ReceiverFactory::getValue(%s,_%s_size);\n"\ - "\tstd::vector _%s(_%s_value,_%s_value+_%s_size);\n\tdelete [] _%s_value;" + cpp_impl_a["const std::vector&"]="\tlong _%s_size=%s.length();\n\tconst double *_%s_value = &%s[0];\n"\ + "\tstd::vector _%s(_%s_value,_%s_value+_%s_size);\n" +# cpp_impl_a["const std::vector&"]="\tlong _%s_size;\n\tdouble *_%s_value = ReceiverFactory::getValue(%s,_%s_size);\n"\ +# "\tstd::vector _%s(_%s_value,_%s_value+_%s_size);\n\tdelete [] _%s_value;" cpp_impl_a["std::vector*&"]="\tstd::vector* _%s;\n" cpp_impl_a["const std::vector >&"]="\tMatrixClient _%s_client;\n\tint _%s_nbRow;\n\tint _%s_nbCol;\n"\ "\tdouble* _%s_tab = _%s_client.getValue(%s,_%s_nbCol,_%s_nbRow);\n\tstd::vector > _%s(_%s_nbRow);\n"\ @@ -155,8 +157,11 @@ BEGIN { cpp_impl_a["MEDMEM::FIELD*&"]="\tMEDMEM::FIELD* _%s;\n" cpp_impl_a["const MEDMEM::FIELD*"]="\tstd::auto_ptr > _%s ( new MEDMEM::FIELDClient(%s) );\n" cpp_impl_a["const MEDMEM::FIELD&"]="\tMEDMEM::FIELDClient _%s(%s);\n" - cpp_impl_a["const std::vector&"]="\tlong _%s_size;\n\tint *_%s_value = ReceiverFactory::getValue(%s,_%s_size);\n"\ - "\tstd::vector _%s(_%s_value,_%s_value+_%s_size);\n\tdelete [] _%s_value;" + cpp_impl_a["const std::vector&"]="\tlong _%s_size=%s.length();\n"\ + "\tstd::vector _%s(_%s_size);\n"\ + "\tfor (int i=0; i!=_%s_size; ++i)\n\t _%s[i]=%s[i];" +# cpp_impl_a["const std::vector&"]="\tlong _%s_size;\n\tint *_%s_value = ReceiverFactory::getValue(%s,_%s_size);\n"\ +# "\tstd::vector _%s(_%s_value,_%s_value+_%s_size);\n\tdelete [] _%s_value;" cpp_impl_a["std::vector*&"]="\tstd::vector* _%s;\n" # @@ -202,7 +207,12 @@ BEGIN { "\tMEDMEM::FIELDTEMPLATE_I * _rtn_field_i = new MEDMEM::FIELDTEMPLATE_I(const_cast*>(&_rtn_cpp),false);\n"\ "\tSALOME_MED::FIELDDOUBLE_ptr _rtn_ior = _rtn_field_i->_this();\n" cpp_impl_b["std::vector*"]=\ - "\tSALOME::SenderDouble_ptr _rtn_ior = SenderFactory::buildSender(*this,&(*_rtn_cpp)[0],(*_rtn_cpp).size(),true);\n" + "\tSALOME::vectorOfDouble * _rtn_ior = new SALOME::vectorOfDouble;\n"\ + "\tint _rtn_cpp_length=(*_rtn_cpp).size();\n"\ + "\t_rtn_ior->length(_rtn_cpp_length);\n"\ + "\tfor (int i=0; i<_rtn_cpp_length; ++i)\n\t (*_rtn_ior)[i] = (*_rtn_cpp)[i];\n" +# cpp_impl_b["std::vector*"]=\ +# "\tSALOME::SenderDouble_ptr _rtn_ior = SenderFactory::buildSender(*this,&(*_rtn_cpp)[0],(*_rtn_cpp).size(),true);\n" cpp_impl_b["std::vector >*"]=\ "\tint _rtn_cpp_i=(*_rtn_cpp).size();\n\tint _rtn_cpp_j=(*_rtn_cpp)[0].size();\n"\ "\tdouble* _rtn_tab = new double[_rtn_cpp_i*_rtn_cpp_j];\n"\ @@ -222,7 +232,12 @@ BEGIN { "\tMEDMEM::FIELDINT_i * _rtn_field_i = new MEDMEM::FIELDINT_i(const_cast*>(&_rtn_cpp),false);\n"\ "\tSALOME_MED::FIELDINT_ptr _rtn_ior = _rtn_field_i->_this();\n" cpp_impl_b["std::vector*"]=\ - "\tSALOME::SenderInt_ptr _rtn_ior = SenderFactory::buildSender(*this,&(*_rtn_cpp)[0],(*_rtn_cpp).size(),true);\n" + "\tSALOME::vectorOfLong * _rtn_ior = new SALOME::vectorOfLong;\n"\ + "\tint _rtn_cpp_length=(*_rtn_cpp).size();\n"\ + "\t_rtn_ior->length(_rtn_cpp_length);\n"\ + "\tfor (int i=0; i<_rtn_cpp_length; ++i)\n\t (*_rtn_ior)[i] = (*_rtn_cpp)[i];\n" +# cpp_impl_b["std::vector*"]=\ +# "\tSALOME::SenderInt_ptr _rtn_ior = SenderFactory::buildSender(*this,&(*_rtn_cpp)[0],(*_rtn_cpp).size(),true);\n" # # @@ -235,9 +250,15 @@ BEGIN { "\tMEDMEM::FIELDINT_i * %s_ior = new MEDMEM::FIELDINT_i(_%s, true);\n"\ "\t%s = %s_ior->_this();\n" cpp_impl_c["std::vector*&"]=\ - "\t%s = SenderFactory::buildSender(*this,&(*_%s)[0],(*_%s).size(),true);\n" + "\t%s = new SALOME::vectorOfDouble;\n"\ + "\t%s->length((*_%s).size());\n"\ + "\tfor (int i=0; i<(*_%s).size(); ++i)\n\t (*%s)[i] = (*_%s)[i];\n" +# "\t%s = SenderFactory::buildSender(*this,&(*_%s)[0],(*_%s).size(),true);\n" cpp_impl_c["std::vector*&"]=\ - "\t%s = SenderFactory::buildSender(*this,&(*_%s)[0],(*_%s).size(),true);\n" + "\t%s = new SALOME::vectorOfLong;\n"\ + "\t%s->length((*_%s).size());\n"\ + "\tfor (int i=0; i<(*_%s).size(); ++i)\n\t (*%s)[i] = (*_%s)[i];\n" +# "\t%s = SenderFactory::buildSender(*this,&(*_%s)[0],(*_%s).size(),true);\n" cpp_impl_c["std::string&"]="\t%s = CORBA::string_dup(_%s.c_str());\n" cpp_impl_c["int&"]="\t%s = _%s;\n" cpp_impl_c["double&"]="\t%s = _%s;\n" @@ -389,7 +410,7 @@ BEGIN { # d) generate the post_processing of returned and out parameters printf ");\n//\tPost-processing & return\n" >> cxx_file for (i=2; i<=NF; i++) - printf cpp_impl_c[type[i]],name[i],name[i],name[i],name[i] >> cxx_file # process for out parameters + printf cpp_impl_c[type[i]],name[i],name[i],name[i],name[i],name[i],name[i] >> cxx_file # process for out parameters printf cpp_impl_b[type[1]] >> cxx_file # process for returned value printf "\tendService(\"%s\");\n\tEND_OF(\"%s\");\n",func_name,func_name >> cxx_file if ( type[1] != "void" ) -- 2.39.2