added support for pointer to const

[libt2n] / codegen / main.cpp

diff --git a/codegen/main.cpp b/codegen/main.cpp
index f228ece..b1a0ce1 100644 (file)
--- a/codegen/main.cpp
+++ b/codegen/main.cpp
@@ -106,19 +106,14 @@ std::string get_namespace(const xmlpp::Element* root, const std::string &id)
      return element->get_attribute("name")->get_value();
 }
 
-//! extract group from attributes
-std::string
-extract_group(const std::string &attrs)
+//! procedure marked for export?
+bool
+is_marked(const std::string &attrs)
 {
      // todo: improve this
-     std::string error;
      std::string to_match("gccxml(libt2n-");
      std::string::size_type p(attrs.find(to_match));
-     if (p==std::string::npos) return error;
-     std::string group(attrs, p+to_match.length(), attrs.length());
-     p=group.find_first_of(')');
-     assert(p!=std::string::npos);
-     return std::string(group,0,p);
+     return (p!=std::string::npos);
 }
 
 struct type_info
@@ -174,8 +169,15 @@ type_info get_type(const xmlpp::Element* root, const std::string &id)
          ret.name=std::string("const ")+ret.name;
          return ret;
      }else if (tag=="PointerType") {
-         // not yet supported
-         return error;
+          // todo: nearly the same as reference type handling
+         assert(element->get_attribute("type"));
+         type_info ret(get_type(root, element->get_attribute("type")->get_value()));
+         if (ret==error) return error;
+         // at the moment we only support const &
+         // todo: nice error message!
+         if ((ret.noref_name=strip(ret.name,"const ")).empty()) return error;
+         ret.name=ret.name+"*";
+         return ret;
      }
 
      assert(element->get_attribute("name"));
@@ -260,7 +262,7 @@ protected:
          // attributes are speparated by spaces?
 
          t2n_procedure f;
-         if (extract_group(attributes->get_value()).empty()) return;
+         if (!is_marked(attributes->get_value())) return;
 
          // we need the return type
          f.ret_type=get_type(root, returns->get_value());
@@ -378,7 +380,8 @@ void output_common_hpp(std::ostream &o, const std::string &group, const std::lis
        o << ") : ";
        for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
            if (ait!=it->args.begin()) o << ", ";
-           o << ait->first << "(_" << ait->first << ")";
+           // pointers are const pointers and must be dereferenced
+           o << ait->first << "(" << ((ait->second.name.find_first_of('*')!=std::string::npos) ? "*" : "" ) << "_" << ait->first << ")";
        }
        o << " {}\n"
          << "  libt2n::result* operator()();\n"
@@ -461,6 +464,9 @@ void output_server_cpp(std::ostream &o, const std::string &group, const std::lis
          o << "libt2n::result* " << it->cmd_classname() << "::operator()() { return new " << it->ret_classname() << "(" << it->name << "(";
          for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
               if (ait!=it->args.begin()) o << ", ";
+              // get pointer
+              if (ait->second.name.find_first_of('*')!=std::string::npos)
+                o << '&';
               o << ait->first;
          }
          o << ")); }\n";