Sync with 5.4.0

[deliverable/titan.core.git] / regression_test / json / Functions.ttcn

diff --git a/regression_test/json/Functions.ttcn b/regression_test/json/Functions.ttcn
index 6064b626941174e88784b188f88dd6515d1e4f9b..912df569b0dbb5c9d78c70c18dea2d1fe5c22619 100755 (executable)
--- a/regression_test/json/Functions.ttcn
+++ b/regression_test/json/Functions.ttcn
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright (c) 2000-2014 Ericsson Telecom AB
+ * 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
@@ -62,7 +62,6 @@ external function f_enc_A(in A u) return octetstring
 external function f_enc_ER(in EmptyRec u) return octetstring
   with { extension "prototype(convert)"; extension "encode(JSON)"; }
   
-  
 external function f_enc_roi(in RoI u) return octetstring
   with { extension "prototype(convert)"; extension "encode(JSON)"; }
   
@@ -105,6 +104,18 @@ external function f_enc_stuff(in Stuff x) return octetstring
 external function f_enc_hpt(in HasPardType x) return octetstring
   with { extension "prototype(convert) encode(JSON)" }
 
+external function f_enc_asn_stuff(in AsnStuff x) return octetstring
+  with { extension "prototype(convert) encode(JSON)" }
+  
+external function f_enc_opt_uni(in OptionalUnions x) return octetstring
+  with { extension "prototype(convert) encode(JSON)" }
+  
+external function f_enc_meta_rec(in MetainfoRecord x) return octetstring
+  with { extension "prototype(convert) encode(JSON)" }
+  
+external function f_enc_meta_set(in MetainfoSet x) return octetstring
+  with { extension "prototype(convert) encode(JSON)" }
+
 // for ASN.1 types
 external function f_enc_seqofint(in SeqOfInt x) return octetstring
   with { extension "prototype(convert) encode(JSON)" }
@@ -211,6 +222,18 @@ external function f_dec_def(in octetstring x) return RecDef
 external function f_dec_hpt(in octetstring x) return HasPardType
   with { extension "prototype(convert) decode(JSON)" }
 
+external function f_dec_asn_stuff(in octetstring x) return AsnStuff
+  with { extension "prototype(convert) decode(JSON)" }
+
+external function f_dec_opt_uni(in octetstring x) return OptionalUnions
+  with { extension "prototype(convert) decode(JSON)" }
+  
+external function f_dec_meta_rec(in octetstring x) return MetainfoRecord
+  with { extension "prototype(convert) decode(JSON)" }
+  
+external function f_dec_meta_set(in octetstring x) return MetainfoSet
+  with { extension "prototype(convert) decode(JSON)" }
+
 // for ASN.1 types
 external function f_dec_seqofint(in octetstring x) return SeqOfInt
   with { extension "prototype(convert) decode(JSON)" }