Commit 44a0c9d5 authored by mullers's avatar mullers
Browse files

Edition 3 selector added to module LibCommon_TextStrings 

module LibCommon_TextStrings language "TTCN-3:2005"

f_setVerdictPreOrPostamble introduced.
f_setVerdictPostamble and f_setVerdictPostamble : log statement added to indicate that these functions are deprecated.

c_uInt64Max and UInt64 deleted
parent 9eeeb343

ttcn/LibCommon_BasicTypesAndValues.ttcn

+10 −2
Original line number Original line Diff line number Diff line
@@ -49,8 +49,9 @@ 
    const integer c_uInt30Max := 1073741823;

    const integer c_uInt30Max := 1073741823;

    const integer c_uInt31Max := 2147483647;

    const integer c_uInt31Max := 2147483647;

    const integer c_uInt32Max := 4294967295;

    const integer c_uInt32Max := 4294967295;

	const integer c_uInt36Max := 68719476735;

    const integer c_uInt48Max := 281474976710655;

    const integer c_uInt48Max := 281474976710655;

    const integer c_uInt64Max := 281474976710655;

	const integer c_uInt52Max := 4503599627370495;





    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"};
@@ -85,8 +86,10 @@ 
    type integer  UInt30 (0 .. c_uInt30Max) with {variant "unsigned 30 bit"};

    type integer  UInt30 (0 .. c_uInt30Max) with {variant "unsigned 30 bit"};

    type integer  UInt31 (0 .. c_uInt31Max) with {variant "unsigned 31 bit"};

    type integer  UInt31 (0 .. c_uInt31Max) with {variant "unsigned 31 bit"};

    type integer  UInt32 (0 .. c_uInt32Max) with {variant "unsigned 32 bit"};

    type integer  UInt32 (0 .. c_uInt32Max) with {variant "unsigned 32 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  UInt64 (0 .. c_uInt64Max) with {variant "unsigned 64 bit"};

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

    

  } // end group unsignedIntegerDefintions

  } // end group unsignedIntegerDefintions

    

    

  /* 

  /*
@@ -198,7 +201,12 @@ 




  group zeroedIntegers {

  group zeroedIntegers {





    const UInt1   c_uInt1Zero := 0;

    const UInt2   c_uInt2Zero := 0;

    const UInt2   c_uInt2Zero := 0;

	const UInt2   c_uInt3Zero := 0;

	const UInt2   c_uInt4Zero := 0;

	const UInt2   c_uInt5Zero := 0;

	const UInt2   c_uInt6Zero := 0;

    const UInt7   c_uInt7Zero := 0;

    const UInt7   c_uInt7Zero := 0;

    const UInt8   c_uInt8Zero := 0;

    const UInt8   c_uInt8Zero := 0;

    const UInt12  c_uInt12Zero := 0;

    const UInt12  c_uInt12Zero := 0;

ttcn/LibCommon_DataStrings.ttcn

+1 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,7 @@ 
    type bitstring  Bit30   length(30) with {encode "length(30)"};

    type bitstring  Bit30   length(30) with {encode "length(30)"};

    type bitstring  Bit31   length(31) with {encode "length(31)"};

    type bitstring  Bit31   length(31) with {encode "length(31)"};

    type bitstring  Bit32   length(32) with {encode "length(32)"};

    type bitstring  Bit32   length(32) with {encode "length(32)"};

	type bitstring  Bit40   length(40) with {encode "length(40)"};





    type bitstring  Bit48   length(48) with {encode "length(48)"};

    type bitstring  Bit48   length(48) with {encode "length(48)"};

    type bitstring  Bit64   length(64) with {encode "length(64)"};

    type bitstring  Bit64   length(64) with {encode "length(64)"};

ttcn/LibCommon_TextStrings.ttcn

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ 
 *            module regarding their modifications or additions so that future

 *            module regarding their modifications or additions so that future

 *            updates will include your changes.

 *            updates will include your changes.

 */

 */

module LibCommon_TextStrings {

module LibCommon_TextStrings language "TTCN-3:2005" {





  /*

  /*

   * @desc  These constants can be used to add special characters into

   * @desc  These constants can be used to add special characters into

ttcn/LibCommon_VerdictControl.ttcn

+19 −10
Original line number Original line Diff line number Diff line
@@ -60,11 +60,8 @@ 
   * @param p_ret Preamble execution status

   * @param p_ret Preamble execution status

   */

   */

  function f_setVerdictPreamble ( FncRetCode p_ret ) {

  function f_setVerdictPreamble ( FncRetCode p_ret ) {

    if ( p_ret != e_success ) {

	log("f_setVerdictPreamble: This function is deprecated. Use f_setVerdictPreOrPostamble instead. ");

      setverdict(inconc);

    f_setVerdictPreOrPostamble(p_ret);

    } else {

      setverdict(pass);

    }

  } // end function f_setVerdictPreamble

  } // end function f_setVerdictPreamble
@@ -77,11 +74,23 @@ 
   * @param p_ret Postamble execution status

   * @param p_ret Postamble execution status

   */

   */

  function f_setVerdictPostamble ( FncRetCode p_ret ) {

  function f_setVerdictPostamble ( FncRetCode p_ret ) {

	log("f_setVerdictPostamble: This function is deprecated. Use f_setVerdictPreOrPostamble instead. ");

    f_setVerdictPreOrPostamble(p_ret);

  } // end function f_setVerdictPostamble



  	/* 

	 * @desc 	This function should be used for verdict

	 *			setting outside the test body.

	 *			Sets verdicts are INCONC in case of a timeout or

	 *          an error, and PASS otherwise.

	 * @param   p_ret Postamble execution status

	 */

	function f_setVerdictPreOrPostamble ( FncRetCode p_ret ) {

		if ( p_ret != e_success ) {

		if ( p_ret != e_success ) {

			setverdict(inconc);

			setverdict(inconc);

		} else {

		} else {

			setverdict(pass);

			setverdict(pass);

		}

		}

  } // end function f_setVerdictPostamble

	} // end function f_setVerdictPreOrPostamble





} // end module LibCommon_VerdictControl
 
} // end module LibCommon_VerdictControl