Commit 663e1423 authored by garciay's avatar garciay
Browse files

Merge tag 1.4.0 with trunk 

Add Int64 type
parent ba7a1091

ttcn/LibCommon_BasicTypesAndValues.ttcn

+6 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,7 @@ 
    const integer c_uInt36Max := 68719476735;

    const integer c_uInt36Max := 68719476735;

    const integer c_uInt48Max := 281474976710655;

    const integer c_uInt48Max := 281474976710655;

    const integer c_uInt52Max := 4503599627370495;

    const integer c_uInt52Max := 4503599627370495;

    const integer c_uInt64Max := 18446744073709551615;





    type integer  UInt  (0 .. infinity);

    type integer  UInt  (0 .. infinity);

    type integer  UInt1 (0 .. c_uInt1Max) with {variant "unsigned 1 bit"};

    type integer  UInt1 (0 .. c_uInt1Max) with {variant "unsigned 1 bit"};
@@ -90,6 +91,7 @@ 
    type integer  UInt36 (0 .. c_uInt36Max) with {variant "unsigned 36 bit"};

    type integer  UInt36 (0 .. c_uInt36Max) with {variant "unsigned 36 bit"};

    type integer  UInt48 (0 .. c_uInt48Max) with {variant "unsigned 48 bit"};

    type integer  UInt48 (0 .. c_uInt48Max) with {variant "unsigned 48 bit"};

    type integer  UInt52 (0 .. c_uInt52Max) with {variant "unsigned 52 bit"};

    type integer  UInt52 (0 .. c_uInt52Max) with {variant "unsigned 52 bit"};

    type integer  UInt64 (0 .. c_uInt64Max) with {variant "unsigned 64 bit"};

    

    

  } // end group unsignedIntegerDefintions

  } // end group unsignedIntegerDefintions
@@ -163,6 +165,8 @@ 
    const integer c_int31Max := 1073741823;

    const integer c_int31Max := 1073741823;

    const integer c_int32Min := -2147483648;

    const integer c_int32Min := -2147483648;

    const integer c_int32Max := 2147483647;

    const integer c_int32Max := 2147483647;

    const integer c_int64Min := -9223372036854775808;

    const integer c_int64Max := 9223372036854775807;





    type integer  Int;

    type integer  Int;

    type integer  Int1  (c_int1Min .. c_int1Max) with { variant "1 bit"};

    type integer  Int1  (c_int1Min .. c_int1Max) with { variant "1 bit"};
@@ -197,6 +201,7 @@ 
    type integer  Int30  (c_int30Min .. c_int30Max) with { variant "30 bit"};

    type integer  Int30  (c_int30Min .. c_int30Max) with { variant "30 bit"};

    type integer  Int31  (c_int31Min .. c_int31Max) with { variant "31 bit"};

    type integer  Int31  (c_int31Min .. c_int31Max) with { variant "31 bit"};

    type integer  Int32  (c_int32Min .. c_int32Max) with { variant "32 bit"};

    type integer  Int32  (c_int32Min .. c_int32Max) with { variant "32 bit"};

    type integer  Int64  (c_int64Min .. c_int64Max) with { variant "64 bit"};





  } // end group signedIntegerDefintions

  } // end group signedIntegerDefintions
@@ -218,6 +223,7 @@ 
    const UInt24  c_uInt24Zero := 0;

    const UInt24  c_uInt24Zero := 0;

    const UInt32  c_uInt32Zero := 0;

    const UInt32  c_uInt32Zero := 0;

    const UInt48  c_uInt48Zero := 0;

    const UInt48  c_uInt48Zero := 0;

    const UInt64  c_uInt64Zero := 0;

    

    

  }//end group zeroedInt

  }//end group zeroedInt

ttcn/LibCommon_DataStrings.ttcn

+8 −0
Original line number Original line Diff line number Diff line
@@ -99,6 +99,7 @@ 
    type octetstring  Oct14   length(14) with {encode "length(14)"};

    type octetstring  Oct14   length(14) with {encode "length(14)"};

    type octetstring  Oct15   length(15) with {encode "length(15)"};

    type octetstring  Oct15   length(15) with {encode "length(15)"};

    type octetstring  Oct16   length(16) with {encode "length(16)"};

    type octetstring  Oct16   length(16) with {encode "length(16)"};

    type octetstring  Oct32   length(32) with {encode "length(32)"};

    

    

    type octetstring  Oct20   length(20) with {encode "length(20)"};

    type octetstring  Oct20   length(20) with {encode "length(20)"};

    type octetstring  Oct64   length(64) with {encode "length(64)"};

    type octetstring  Oct64   length(64) with {encode "length(64)"};
@@ -110,11 +111,18 @@ 
    type octetstring  Oct1280 length(1280) with {encode "length(1280)"};

    type octetstring  Oct1280 length(1280) with {encode "length(1280)"};

    type octetstring  Oct1380 length(1380) with {encode "length(1380)"};

    type octetstring  Oct1380 length(1380) with {encode "length(1380)"};





    type octetstring  Oct0to3  length(0..3) with {encode "length(0..3)"};

    type octetstring  Oct0to8  length(0..16) with {encode "length(0..8)"};

    type octetstring  Oct0to12  length(0..12) with {encode "length(0..12)"};

    type octetstring  Oct0to16  length(0..16) with {encode "length(0..16)"};

    type octetstring  Oct0to16  length(0..16) with {encode "length(0..16)"};

    type octetstring  Oct0to31  length(0..31) with {encode "length(0..31)"};

    type octetstring  Oct0to20  length(0..20) with {encode "length(0..20)"};

    type octetstring  Oct0to30  length(0..20) with {encode "length(0..30)"};

    type octetstring  Oct0to127   length(0..127) with {encode "length(0..127)"};

    type octetstring  Oct0to127   length(0..127) with {encode "length(0..127)"};

    type octetstring  Oct0to255   length(0..255) with {encode "length(0..255)"};

    type octetstring  Oct0to255   length(0..255) with {encode "length(0..255)"};





    type octetstring  Oct1to15  length(1..15) with {encode "length(1..15)"};

    type octetstring  Oct1to15  length(1..15) with {encode "length(1..15)"};

    type octetstring  Oct1to31  length(1..31) with {encode "length(1..31)"};

    type octetstring  Oct1to128   length(1..128) with {encode "length(1..128)"};

    type octetstring  Oct1to128   length(1..128) with {encode "length(1..128)"};

    type octetstring  Oct1to254   length(1..254) with {encode "length(1..254)"};

    type octetstring  Oct1to254   length(1..254) with {encode "length(1..254)"};

    type octetstring  Oct1to255   length(1..255) with {encode "length(1..255)"};

    type octetstring  Oct1to255   length(1..255) with {encode "length(1..255)"};