Sync with 5.2.0

[deliverable/titan.core.git] / compiler2 / encdec.c

diff --git a/compiler2/encdec.c b/compiler2/encdec.c
index 2dc6e6642702670f744191ba06d44c22293dc78c..4d5362d21abed21939a27613479bbd1bfdc1b10a 100644 (file)
--- a/compiler2/encdec.c
+++ b/compiler2/encdec.c
@@ -50,8 +50,10 @@ void def_encdec(const char *p_classname,
 #ifndef NDEBUG
       "// written by %s in " __FILE__ " at %d\n"
 #endif
-      "int XER_encode(const XERdescriptor_t&, TTCN_Buffer&, unsigned int, int) const;\n"
-      "int XER_decode(const XERdescriptor_t&, XmlReaderWrap&, unsigned int);\n"
+      "int XER_encode(const XERdescriptor_t&, TTCN_Buffer&, unsigned int, int, "
+      "embed_values_enc_struct_t*) const;\n"
+      "int XER_decode(const XERdescriptor_t&, XmlReaderWrap&, unsigned int, "
+      "embed_values_dec_struct_t*);\n"
       "static boolean can_start(const char *name, const char *uri, "
       "XERdescriptor_t const& xd, unsigned int);\n"
       "%s"
@@ -114,7 +116,7 @@ void def_encdec(const char *p_classname,
       /* Do not use %s_xer_ here. It supplies the XER descriptor of oldtype
        * even if encoding newtype for:
        * <ttcn>type newtype oldtype;</ttcn> */
-     "    XER_encode(*(p_td.xer),p_buf, XER_coding, 0);\n"
+     "    XER_encode(*(p_td.xer),p_buf, XER_coding, 0, 0);\n"
      "    p_buf.put_c('\\n');\n" /* make sure it has a newline */
      "    break;}\n"
      "  case TTCN_EncDec::CT_JSON: {\n"
@@ -215,7 +217,7 @@ void def_encdec(const char *p_classname,
      "    for (int rd_ok=reader.Read(); rd_ok==1; rd_ok=reader.Read()) {\n"
      "      if (reader.NodeType() == XML_READER_TYPE_ELEMENT) break;\n"
      "    }\n"
-     "    XER_decode(*(p_td.xer), reader, XER_coding | XER_TOPLEVEL);\n"
+     "    XER_decode(*(p_td.xer), reader, XER_coding | XER_TOPLEVEL, 0);\n"
      "    size_t bytes = reader.ByteConsumed();\n"
      "    p_buf.set_pos(bytes);\n"
      "    break;}\n"