ChangeLogTag: Tue Jul 31 10:39:18 2001 Jeff Parsons <parsons@cs.wustl.edu>

4 files changed, 176 insertions, 0 deletions

diff --git a/TAO/tests/IDL_Test/Makefile b/TAO/tests/IDL_Test/Makefile
index e689afae5a2..79e06fb746b 100644
--- a/TAO/tests/IDL_Test/Makefile
+++ b/TAO/tests/IDL_Test/Makefile
@@ -22,6 +22,7 @@ IDL_ALWAYS =	anonymous		\
                 full                    \
                 fwd                     \
 		generic_object		\
+                gperf                   \
 		included		\
 		including		\
 		interface		\
diff --git a/TAO/tests/IDL_Test/Makefile.bor b/TAO/tests/IDL_Test/Makefile.bor
index 77bd990493f..d82cc9e5e2b 100644
--- a/TAO/tests/IDL_Test/Makefile.bor
+++ b/TAO/tests/IDL_Test/Makefile.bor
@@ -21,6 +21,8 @@ OBJFILES = \
 	$(OBJDIR)\fwdS.obj \
 	$(OBJDIR)\generic_objectC.obj \
 	$(OBJDIR)\generic_objectS.obj \
+	$(OBJDIR)\gperfC.obj \
+	$(OBJDIR)\gperfS.obj \
 	$(OBJDIR)\includedC.obj \
 	$(OBJDIR)\includedS.obj \
 	$(OBJDIR)\includingC.obj \
@@ -68,6 +70,7 @@ IDLFILES = \
         $(IDLDIR)\full.idl \
         $(IDLDIR)\fwd.idl \
         $(IDLDIR)\generic_object.idl \
+        $(IDLDIR)\gperf.idl \
         $(IDLDIR)\included.idl \
         $(IDLDIR)\including.idl \
         $(IDLDIR)\interface.idl \
@@ -112,6 +115,9 @@ $(IDLDIR)\fwdC.cpp $(IDLDIR)\fwdS.cpp: $(IDLDIR)\fwd.idl
 $(IDLDIR)\generic_objectC.cpp $(IDLDIR)\generic_objectS.cpp: $(IDLDIR)\generic_object.idl
 	$(TAO_IDL) $**
 
+$(IDLDIR)\gperfC.cpp $(IDLDIR)\gperfS.cpp: $(IDLDIR)\gperf.idl
+	$(TAO_IDL) $**
+
 $(IDLDIR)\includedC.cpp $(IDLDIR)\includedS.cpp: $(IDLDIR)\included.idl
 	$(TAO_IDL) $**
 
diff --git a/TAO/tests/IDL_Test/gperf.idl b/TAO/tests/IDL_Test/gperf.idl
new file mode 100644
index 00000000000..a26cb9f9f33
--- /dev/null
+++ b/TAO/tests/IDL_Test/gperf.idl
@@ -0,0 +1,98 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/tests/IDL_Test
+//
+// = FILENAME
+//    gperf.idl
+//
+// = DESCRIPTION
+//    This file contains examples of IDL code that has 
+//    caused problems in the past for the TAO IDL
+//    compiler. This test is to make sure the problems
+//    stay fixed.
+//
+// = AUTHORS
+//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+//
+// ============================================================================
+
+// The examples below uncovered some bugs in gperf,
+// in the form of runtime errors when clients made
+// requests on some of the methods, for example
+
+//       TAO_Perfect_Hash_Table:find failed
+//       Bad operation <ackConfArchData>
+
+
+enum TestEnum
+{
+  first,
+  second,
+  third
+};
+
+interface testlistitem
+{
+  readonly attribute string name;
+};
+
+
+interface test
+{
+  attribute string stest;
+#ifndef WITHOUT_CORBA_WSTRING
+  attribute wstring wstest;
+#else
+  attribute string wstest;
+#endif
+#ifndef WITHOUT_CORBA_LONGLONG
+  attribute long long ltest;
+#else
+  attribute long ltest;
+#endif
+#ifndef WITHOUT_CORBA_LONGDOUBLE
+  attribute long double ldtest;
+#else
+  attribute double ldtest;
+#endif
+  attribute TestEnum etest;
+#ifndef WITHOUT_CORBA_WSTRING
+  attribute wstring setest;
+#else
+  attribute string setest;
+#endif
+  attribute testlistitem tltest;
+
+  testlistitem new_testlistitem (in string name);
+}; 
+
+interface Simple_Server
+{
+ oneway void ackConfBasData ();
+
+ oneway void ackConfMosData ();
+ oneway void ackConfTwmData ();
+ oneway void ackConfArchData ();
+ oneway void ackConfVonData ();
+ oneway void ackConfFftData ();
+ oneway void ackConfSosData ();
+ oneway void ackConfSscData ();
+ oneway void ackConfCsData ();
+
+ oneway void ackConfR10Data ();
+ oneway void ackConfR11Data ();
+ oneway void ackConfR12Data ();
+ oneway void ackConfR13Data ();
+ oneway void ackConfR14Data ();
+ oneway void ackConfR15Data ();
+
+ oneway void shutdown ();
+
+ oneway void transferTriggerDb ();
+ oneway void transferTriggerTdc ();
+};
+ 
+
diff --git a/TAO/tests/IDL_Test/idl_test.dsp b/TAO/tests/IDL_Test/idl_test.dsp
index dbb548e805f..6b9dd766e8c 100644
--- a/TAO/tests/IDL_Test/idl_test.dsp
+++ b/TAO/tests/IDL_Test/idl_test.dsp
@@ -145,6 +145,14 @@ SOURCE=.\generic_objectS.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\gperfC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\gperfS.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\includedC.cpp

 # End Source File

 # Begin Source File

@@ -313,6 +321,14 @@ SOURCE=.\generic_objectS.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\gperfC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\gperfS.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\includedC.h

 # End Source File

 # Begin Source File

@@ -457,6 +473,14 @@ SOURCE=.\generic_objectC.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\gperfC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\gperfS.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\includedC.i

 # End Source File

 # Begin Source File

@@ -1000,6 +1024,53 @@ BuildCmds= \
 # End Source File

 # Begin Source File

 

+SOURCE=.\gperf.idl

+

+!IF  "$(CFG)" == "idl_test - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "idl_test - Win32 Debug"

+

+USERDEP__GPERF="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl

+InputPath=.\gperf.idl

+InputName=gperf

+

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=.\included.idl

 

 !IF  "$(CFG)" == "idl_test - Win32 Release"