[ccmtools-cvs] ccmtools/test/CppGenerator/struct_constructor Makefile, 1.1, 1.2 Test.idl, 1.1, 1.2

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/struct_constructor
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26816/test/CppGenerator/struct_constructor

Modified Files:
	Makefile Test.idl 
Log Message:
Added support for C++ struct (init and default) constructors. 

Index: Makefile
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/struct_constructor/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	22 Jan 2007 17:34:29 -0000	1.1
--- Makefile	23 Jan 2007 10:53:18 -0000	1.2
***************
*** 11,15 ****
  
  local: idl3
! 	ccmtools c++local ${IDL_INCLUDE} -o ${DEST_DIR}/src/interface ${DEST_DIR}/idl/interface/*.idl
  	mkdir ${DEST_DIR}/src/test
  
--- 11,15 ----
  
  local: idl3
! 	ccmtools c++local ${IDL_INCLUDE} -o ${DEST_DIR}/src/interface ${DEST_DIR}/idl/interface/world/*.idl
  	mkdir ${DEST_DIR}/src/test
  

Index: Test.idl
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/struct_constructor/Test.idl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Test.idl	22 Jan 2007 17:34:30 -0000	1.1
--- Test.idl	23 Jan 2007 10:53:18 -0000	1.2
***************
*** 1,37 ****
  
  
! typedef long TimeStamp;
  
! enum Color {red, green, blue, black, orange};
  
! typedef sequence<string> StringSeq;
  
! interface EmptyInterface {};
  
  
- struct BasicTypesStructure 
- {
-   short shortMember;
-   long longMember;
-   unsigned short ushortMember;
-   unsigned long uLongMember;
-   float floatMember;
-   double doubleMember;
-   char charMember;
-   string stringMember;
-   boolean booleanMember;
-   octet octetMember;
-   wchar wcharMember;
-   wstring wstringMember;
- };
  
  
! struct UserTypesStructure
! {
!   any anyMember;
!   TimeStamp typedefMember;
!   Color enumMember;
!   BasicTypesStructure structMember;
!   StringSeq sequenceMember;
!   EmptyInterface interfaceMember;
! };
--- 1,43 ----
+ /**
+  * This test case simulates the usage of structs with simple and complex
+  * members.
+  */
  
+ module world {
  
! 	typedef long TimeStamp;
  
! 	enum Color {red, green, blue, black, orange};
  
! 	typedef sequence<string> StringSeq;
  
! 	interface EmptyInterface {};
  
+ 	struct BasicTypesStructure 
+ 	{
+   		short shortMember;
+ 		long longMember;
+ 		unsigned short ushortMember;
+ 		unsigned long uLongMember;
+ 		float floatMember;
+ 		double doubleMember;
+ 		char charMember;
+ 		string stringMember;
+ 		boolean booleanMember;
+ 		octet octetMember;
+ 		wchar wcharMember;
+ 		wstring wstringMember;
+ 	};
  
  
+ 	struct UserTypesStructure
+ 	{
+ 		any anyMember;
+ 		TimeStamp typedefMember;
+ 		Color enumMember;
+ 		BasicTypesStructure structMember;
+ 		StringSeq sequenceMember;
+ 		EmptyInterface interfaceMember;
+ 	};
  
! }; // end of module world	
\ No newline at end of file