implemented decmatch (artf724241)

[deliverable/titan.core.git] / core / Bitstring.hh

diff --git a/core/Bitstring.hh b/core/Bitstring.hh
index b890333a9bc63cf9fc26738b01fc9b3f5168b06d..877a564957b20719b4feb2e950e0544dc61abd2b 100644 (file)
--- a/core/Bitstring.hh
+++ b/core/Bitstring.hh
@@ -1,10 +1,26 @@
-///////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2000-2015 Ericsson Telecom AB
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-///////////////////////////////////////////////////////////////////////////////
+/******************************************************************************
+ * Copyright (c) 2000-2016 Ericsson Telecom AB
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Balasko, Jeno
+ *   Baranyi, Botond
+ *   Beres, Szabolcs
+ *   Delic, Adam
+ *   Forstner, Matyas
+ *   Horvath, Gabriella
+ *   Kovacs, Ferenc
+ *   Raduly, Csaba
+ *   Szabados, Kristof
+ *   Szabo, Bence Janos
+ *   Szabo, Janos Zoltan – initial implementation
+ *   Szalai, Gabor
+ *   Tatarka, Gabor
+ *
+ ******************************************************************************/
 #ifndef BITSTRING_HH
 #define BITSTRING_HH
 
@@ -175,7 +191,7 @@ public:
      boolean no_err=FALSE, int sel_field=-1, boolean first_call=TRUE);
 
   int XER_encode(const XERdescriptor_t&, TTCN_Buffer&, unsigned int, int, embed_values_enc_struct_t*) const;
-  int XER_decode(const XERdescriptor_t&, XmlReaderWrap& reader, unsigned int, embed_values_dec_struct_t*);
+  int XER_decode(const XERdescriptor_t&, XmlReaderWrap& reader, unsigned int, unsigned int, embed_values_dec_struct_t*);
   
   /** Encodes accordingly to the JSON encoding rules.
     * Returns the length of the encoded data. */
@@ -229,6 +245,8 @@ public:
 };
 
 /// bitstring template class
+struct decmatch_struct;
+
 class BITSTRING_template : public Restricted_Length_Template {
 #ifdef __SUNPRO_CC
 public:
@@ -242,6 +260,7 @@ private:
       BITSTRING_template *list_value;
     } value_list;
     bitstring_pattern_struct *pattern_value;
+    decmatch_struct* dec_match;
   };
 
   void copy_template(const BITSTRING_template& other_value);
@@ -276,8 +295,10 @@ public:
 
   int lengthof() const;
 
-  void set_type(template_sel template_type, unsigned int list_length);
+  void set_type(template_sel template_type, unsigned int list_length = 0);
   BITSTRING_template& list_item(unsigned int list_index);
+  
+  void set_decmatch(Dec_Match_Interface* new_instance);
 
   void log() const;
   void log_match(const BITSTRING& match_value, boolean legacy = FALSE) const;