XER: text variant encodes and decodes escaped xml characters (Bug 522143)

Change-Id: Ic01f2e49902efe729fea97a1a0c2f1bbc09136d2
Signed-off-by: BenceJanosSzabo <bence.janos.szabo@ericsson.com>

compiler2/EnumItem.cc

@@ -77,6 +77,41 @@ void EnumItem::set_value(Value *p_value)
 void EnumItem::set_text(const string& p_text)
 {
   text = p_text;
+  
+  // De escape special XML characters if any found, into descaped_text
+  descaped_text = p_text;
+  size_t pos = 0;
+  while ((pos = descaped_text.find("'", 0)) != descaped_text.size()) {
+    descaped_text.replace(pos, 6, "'");
+  }
+  while ((pos = descaped_text.find(""", 0)) != descaped_text.size()) {
+    descaped_text.replace(pos, 6, "\\\"");
+  }
+  while ((pos = descaped_text.find("<", 0)) != descaped_text.size()) {
+    descaped_text.replace(pos, 4, "<");
+  }
+  while ((pos = descaped_text.find("&gt;", 0)) != descaped_text.size()) {
+    descaped_text.replace(pos, 4, ">");
+  }
+  while ((pos = descaped_text.find("&amp;", 0)) != descaped_text.size()) {
+    descaped_text.replace(pos, 5, "&");
+  }
+  while ((pos = descaped_text.find("&#60;", 0)) != descaped_text.size()) {
+    descaped_text.replace(pos, 5, "<");
+  }
+  while ((pos = descaped_text.find("&#62;", 0)) != descaped_text.size()) {
+    descaped_text.replace(pos, 5, ">");
+  }
+  while ((pos = descaped_text.find("&#34;", 0)) != descaped_text.size()) {
+    descaped_text.replace(pos, 5, "\\\"");
+  }
+  while ((pos = descaped_text.find("&#38;", 0)) != descaped_text.size()) {
+    descaped_text.replace(pos, 5, "&");
+    pos++;
+  }
+  while ((pos = descaped_text.find("&#39;", 0)) != descaped_text.size()) {
+    descaped_text.replace(pos, 5, "'");
+  }
 }
 
 bool EnumItem::calculate_int_value() {

compiler2/EnumItem.hh

@@ -32,6 +32,7 @@ private:
   Identifier *name;
   Value *value;
   string text; ///< for TEXT encoding instruction
+  string descaped_text; ///< made from text variable but replaces all the escaped values
   int_val_t *int_value;
   /** Copy constructor not implemented */
   EnumItem(const EnumItem&);
@@ -46,6 +47,7 @@ public:
   Value *get_value() const { return value; }
   void set_value(Value *p_value);
   const string& get_text() const { return text; }
+  const string& get_descaped_text() const { return descaped_text; }
   void set_text(const string& p_text);
   virtual void set_my_scope(Scope *p_scope);
   bool calculate_int_value();

compiler2/Type_codegen.cc

@@ -1147,6 +1147,7 @@ void Type::generate_code_Enum(output_struct *target)
     else {
       e_def.xerText = TRUE;
       e_def.elements[i].text = ei->get_text().c_str();
+      e_def.elements[i].descaped_text = ei->get_descaped_text().c_str();
     }
     e_def.elements[i].value = ei->get_int_val()->get_val();
   }

compiler2/datatypes.h

@@ -159,6 +159,7 @@ typedef struct {
     const char *name; /* identifier name */
     const char *dispname; /* identifier TTCN-3 name */
     const char *text; /* modified by TEXT */
+    const char *descaped_text; /* text but the escaped characters are descaped */
     int value;
 } enum_field;
 

compiler2/enum.c

@@ -268,8 +268,8 @@ void defEnumClass(const enum_def *edef, output_struct *output)
     "{\n", qualified_enum_type, name);
   for (i = 0; i < edef->nElements; i++) {
     if (edef->elements[i].text) {
-      src = mputprintf(src, "if (!strcmp(str_par, \"%s\") || !strcmp(str_par, \"%s\")) return %s;\n"
-        "else ", edef->elements[i].text, edef->elements[i].dispname, edef->elements[i].name);
+      src = mputprintf(src, "if (!strcmp(str_par, \"%s\") || !strcmp(str_par, \"%s\") || !strcmp(str_par, \"%s\")) return %s;\n"
+        "else ", edef->elements[i].text, edef->elements[i].descaped_text, edef->elements[i].dispname, edef->elements[i].name);
     }
     else {
       src = mputprintf(src, "if (!strcmp(str_par, \"%s\")) return %s;\n"

regression_test/XML/EXER-whitepaper/Text.ttcnpp

@@ -8,6 +8,7 @@
  * Contributors:
  *   Balasko, Jeno
  *   Raduly, Csaba
+ *   Szabo, Bence Janos
  *
  ******************************************************************************/
 module Text
@@ -236,6 +237,36 @@ testcase decode_truth() runs on Plain
   CHECK_DECODE(exer_dec_x, estr_xdunno, XmlTruth, xdunno);
 }
 
+/* * * * * * * * * * * * * * * * * * * * * * */
+// Regression test for special escaped characters present in the text as variant
+
+type record Special
+{
+  enumerated {
+    numbers
+  } expr
+}
+with {
+  variant (expr) "text 'numbers' as '<>"&'numbers<>"&''";
+};
+
+DECLARE_EXER_ENCODERS(Special, s);
+
+const Special spec  := { expr := numbers };
+
+const universal charstring estr_spec :=
+  "<Special>\n\t<expr>&lt;&gt;&quot;&amp;&apos;numbers&#60;&#62;&#34;&#38;&#39;</expr>\n</Special>\n\n";
+
+testcase encode_special() runs on Plain
+{
+  CHECK_METHOD(exer_enc_s,  spec, estr_spec);
+}
+
+testcase decode_special() runs on Plain
+{
+  CHECK_DECODE(exer_dec_s, estr_spec, Special, spec);
+}
+
 control
 {
   execute(encode_txt());
@@ -249,6 +280,9 @@ control
   
   execute(encode_truth());
   execute(decode_truth());
+
+  execute(encode_special());
+  execute(decode_special());
 }