Last sync 2016.04.01

[deliverable/titan.core.git] / compiler2 / ttcn3 / RawAST.cc

diff --git a/compiler2/ttcn3/RawAST.cc b/compiler2/ttcn3/RawAST.cc
index 47ec94d8dbfe9261bc4c245cf7d495aed76e4867..4975ecf32cf9c0a6b085df3778c094455fe7e5b1 100644 (file)
--- a/compiler2/ttcn3/RawAST.cc
+++ b/compiler2/ttcn3/RawAST.cc
@@ -1,10 +1,18 @@
-///////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2000-2014 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
+ *   Raduly, Csaba
+ *   Szabo, Janos Zoltan – initial implementation
+ *   Szalai, Gabor
+ *
+ ******************************************************************************/
 #include "../../common/memory.h"
 #include "RawAST.hh"
 #include <stdio.h>
@@ -56,6 +64,7 @@ RawAST::RawAST(RawAST *other,bool int_type){
     topleveleind=other->topleveleind;
     toplevel.bitorder=other->toplevel.bitorder;
     length_restrition=other->length_restrition;
+    intx = other->intx;
     }
     else init_rawast(int_type);
 }
@@ -94,7 +103,7 @@ void RawAST::init_rawast(bool int_type){
     presence.nElements=0;
     presence.keyList=NULL;
     topleveleind=0;
-
+    intx = false;
 }
 
 RawAST::~RawAST(){
@@ -183,7 +192,7 @@ void RawAST::print_RawAST(){
         printf("\n\r");
       }
     }
-
+    printf("%sIntX encoding\n\r", intx ? "" : "not ");
 }
 
 void copy_rawAST_to_struct(RawAST *from, raw_attrib_struct *to){
@@ -291,5 +300,6 @@ int compare_raw_attrib(RawAST *a, RawAST *b){
            a->padding!=b->padding ||
            a->ptroffset!=b->ptroffset ||
            a->repeatable!=b->repeatable ||
-           a->unit!=b->unit;
+           a->unit!=b->unit ||
+           a->intx != b->intx;
 }