From 753c7d4f69582687a98f8401272d72d17cb8bf6f Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 7 Jan 2004 17:50:02 +0000
Subject: ChangeLogTag: Wed Jan  7 17:49:46 UTC 2004  Johnny Willemsen 
 <jwillemsen@remedy.nl>

---
 apps/gperf/tests/Makefile    | 26 ++++++++--------
 apps/gperf/tests/Makefile.am | 12 ++++----
 apps/gperf/tests/c++-res.exp | 73 --------------------------------------------
 apps/gperf/tests/c++.gperf   | 73 --------------------------------------------
 apps/gperf/tests/cpp-res.exp | 73 ++++++++++++++++++++++++++++++++++++++++++++
 apps/gperf/tests/cpp.gperf   | 73 ++++++++++++++++++++++++++++++++++++++++++++
 apps/gperf/tests/tests.mpc   | 18 +++++------
 7 files changed, 174 insertions(+), 174 deletions(-)
 delete mode 100644 apps/gperf/tests/c++-res.exp
 delete mode 100644 apps/gperf/tests/c++.gperf
 create mode 100644 apps/gperf/tests/cpp-res.exp
 create mode 100644 apps/gperf/tests/cpp.gperf

diff --git a/apps/gperf/tests/Makefile b/apps/gperf/tests/Makefile
index f9a29417a6f..d2d076f296a 100644
--- a/apps/gperf/tests/Makefile
+++ b/apps/gperf/tests/Makefile
@@ -28,7 +28,7 @@ GPERF = ../src/gperf
 PROG_SRCS = \
 	test.cpp \
 	cinset.cpp \
-	c++inset.cpp \
+	cppinset.cpp \
 	iinset.cpp \
 	iinset2.cpp \
 	tinset.cpp \
@@ -47,7 +47,7 @@ AOUT_OBJS = test.o \
 	    adainset.o
 
 CPPOUT_OBJS = test.o \
-	      c++inset.o
+	      cppinset.o
 
 PREOUT_OBJS = test.o \
 	      preinset.o
@@ -72,7 +72,7 @@ TAOOUT_OBJS = test.o \
 
 BIN  =  cout \
 	aout \
-	c++out \
+	cppout \
 	preout \
 	m3out \
 	pout \
@@ -103,7 +103,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 all: cout \
 	aout \
-	c++out \
+	cppout \
 	preout \
 	m3out \
 	pout \
@@ -118,8 +118,8 @@ cinset.cpp: $(srcdir)/c.gperf $(GPERF)
 adainset.cpp: $(srcdir)/ada.gperf $(GPERF)
 	$(GPERF)  -a -k1,4,'$$' $(srcdir)/ada.gperf > $@
 
-c++inset.cpp: $(srcdir)/c++.gperf $(GPERF)
-	$(GPERF) -a -D $(srcdir)/c++.gperf > $@
+cppinset.cpp: $(srcdir)/cpp.gperf $(GPERF)
+	$(GPERF) -a -D $(srcdir)/cpp.gperf > $@
 
 preinset.cpp: $(srcdir)/adadefs.gperf $(GPERF)
 	$(GPERF)  -a -p -D -k1,'$$' -s 2 -o $(srcdir)/adadefs.gperf > $@
@@ -151,7 +151,7 @@ cout:$(addprefix $(VDIR),$(COUT_OBJS))
 aout:$(addprefix $(VDIR),$(AOUT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-c++out:$(addprefix $(VDIR),$(CPPOUT_OBJS))
+cppout:$(addprefix $(VDIR),$(CPPOUT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 preout:$(addprefix $(VDIR),$(PREOUT_OBJS))
@@ -175,7 +175,7 @@ tout:$(addprefix $(VDIR),$(TOUT_OBJS))
 taoout:$(addprefix $(VDIR),$(TAOOUT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-runtests: cout aout c++out preout m3out pout iout iout2 tout taoout
+runtests: cout aout cppout preout m3out pout iout iout2 tout taoout
 	 @echo "performing some tests of the perfect hash generator"
 	 # test cout
 	 ./cout -v < $(srcdir)/c.gperf > c.out
@@ -183,9 +183,9 @@ runtests: cout aout c++out preout m3out pout iout iout2 tout taoout
 	 # test aout
 	 ./aout -v < $(srcdir)/ada.gperf > ada-res.out
 	 -diff -b $(srcdir)/ada-res.exp ada-res.out
-	 # test c++out
-	 ./c++out -v < $(srcdir)/c++.gperf > c++-res.out
-	 -diff -b $(srcdir)/c++-res.exp c++-res.out
+	 # test cppout
+	 ./cppout -v < $(srcdir)/cpp.gperf > cpp-res.out
+	 -diff -b $(srcdir)/cpp-res.exp cpp-res.out
 	 # test preout
 	 ./preout -v < $(srcdir)/adadefs.gperf > ada-pred.out
 	 -diff -b $(srcdir)/ada-pred.exp ada-pred.out
@@ -225,9 +225,9 @@ runtests: cout aout c++out preout m3out pout iout iout2 tout taoout
 	 -diff -b $(srcdir)/test-7.exp test-7.out
 
 realclean:
-	$(RM) -rf *.out cinset.cpp c++inset.cpp iinset.cpp iinset2.cpp \
+	$(RM) -rf *.out cinset.cpp cppinset.cpp iinset.cpp iinset2.cpp \
 	tinset.cpp taoinset.cpp pinset.cpp m3inset.cpp adainset.cpp preinset.cpp
-	$(RM) -rf c.out aout preout m3out pout cout c++out iout iout2 tout taoout
+	$(RM) -rf c.out aout preout m3out pout cout cppout iout iout2 tout taoout
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/apps/gperf/tests/Makefile.am b/apps/gperf/tests/Makefile.am
index a6cc359241b..c5ee4623956 100644
--- a/apps/gperf/tests/Makefile.am
+++ b/apps/gperf/tests/Makefile.am
@@ -33,13 +33,13 @@
 AUTOMAKE_OPTIONS = 1.4
 
 
-noinst_PROGRAMS = cout aout c++out preout m3out pout iout iout2 tout
+noinst_PROGRAMS = cout aout cppout preout m3out pout iout iout2 tout
 
 cout_SOURCES = cinset.cpp test.cpp
 
 aout_SOURCES = adainset.cpp test.cpp
 
-c++out_SOURCES = c++inset.cpp test.cpp
+cppout_SOURCES = cppinset.cpp test.cpp
 
 preout_SOURCES = preinset.cpp test.cpp
 
@@ -56,7 +56,7 @@ tout_SOURCES = tinset.cpp test.cpp
 BUILT_SOURCES = \
         cinset.cpp \
         adainset.cpp \
-        c++inset.cpp \
+        cppinset.cpp \
         preinset.cpp \
         m3inset.cpp \
         pinset.cpp \
@@ -72,7 +72,7 @@ EXTRA_DIST = \
         modula2.gperf \
         ada-pred.exp \
         ada-res.exp \
-        c++-res.exp \
+        cpp-res.exp \
         c.exp \
         corba.exp \
         idl.exp \
@@ -92,8 +92,8 @@ cinset.cpp: c.gperf
 adainset.cpp: ada.gperf
         $(GPERF) -a -k1,4,'$$' $(srcdir)/ada.gperf > adainset.cpp
 
-c++inset.cpp: c++.gperf
-        $(GPERF) -a -D $(srcdir)/c++.gperf > c++inset.cpp
+cppinset.cpp: cpp.gperf
+        $(GPERF) -a -D $(srcdir)/cpp.gperf > cppinset.cpp
 
 preinset.cpp: adadefs.gperf
         $(GPERF) -a -p -D -k1,'$$' -s 2 -o $(srcdir)/adadefs.gperf > preinset.cpp
diff --git a/apps/gperf/tests/c++-res.exp b/apps/gperf/tests/c++-res.exp
deleted file mode 100644
index 124af99193f..00000000000
--- a/apps/gperf/tests/c++-res.exp
+++ /dev/null
@@ -1,73 +0,0 @@
-in word set and
-in word set and_eq
-in word set asm
-in word set auto
-in word set bitand
-in word set bitor
-in word set bool
-in word set break
-in word set case
-in word set catch
-in word set char
-in word set class
-in word set compl
-in word set const
-in word set const_cast
-in word set continue
-in word set default
-in word set delete
-in word set do
-in word set double
-in word set dynamic_cast
-in word set else
-in word set enum
-in word set explicit
-in word set extern
-in word set false
-in word set float
-in word set for
-in word set friend
-in word set goto
-in word set if
-in word set inline
-in word set int
-in word set long
-in word set mutable
-in word set namespace
-in word set new
-in word set not
-in word set not_eq
-in word set operator
-in word set or
-in word set or_eq
-in word set private
-in word set protected
-in word set public
-in word set register
-in word set reinterpret_cast
-in word set return
-in word set short
-in word set signed
-in word set sizeof
-in word set static
-in word set static_cast
-in word set struct
-in word set switch
-in word set template
-in word set this
-in word set throw
-in word set true
-in word set try
-in word set typedef
-in word set typeid
-in word set typename
-in word set union
-in word set unsigned
-in word set using
-in word set virtual
-in word set void
-in word set volatile
-in word set wchar_t
-in word set while
-in word set xor
-in word set xor_eq
diff --git a/apps/gperf/tests/c++.gperf b/apps/gperf/tests/c++.gperf
deleted file mode 100644
index e8c8dc3f251..00000000000
--- a/apps/gperf/tests/c++.gperf
+++ /dev/null
@@ -1,73 +0,0 @@
-and
-and_eq
-asm
-auto
-bitand
-bitor
-bool
-break
-case
-catch
-char
-class
-compl
-const
-const_cast
-continue
-default
-delete
-do
-double
-dynamic_cast
-else
-enum
-explicit
-extern
-false
-float
-for
-friend
-goto
-if
-inline
-int
-long
-mutable
-namespace
-new
-not
-not_eq
-operator
-or
-or_eq
-private
-protected
-public
-register
-reinterpret_cast
-return
-short
-signed
-sizeof
-static
-static_cast
-struct
-switch
-template
-this
-throw
-true
-try
-typedef
-typeid
-typename
-union
-unsigned
-using
-virtual
-void
-volatile
-wchar_t
-while
-xor
-xor_eq
diff --git a/apps/gperf/tests/cpp-res.exp b/apps/gperf/tests/cpp-res.exp
new file mode 100644
index 00000000000..124af99193f
--- /dev/null
+++ b/apps/gperf/tests/cpp-res.exp
@@ -0,0 +1,73 @@
+in word set and
+in word set and_eq
+in word set asm
+in word set auto
+in word set bitand
+in word set bitor
+in word set bool
+in word set break
+in word set case
+in word set catch
+in word set char
+in word set class
+in word set compl
+in word set const
+in word set const_cast
+in word set continue
+in word set default
+in word set delete
+in word set do
+in word set double
+in word set dynamic_cast
+in word set else
+in word set enum
+in word set explicit
+in word set extern
+in word set false
+in word set float
+in word set for
+in word set friend
+in word set goto
+in word set if
+in word set inline
+in word set int
+in word set long
+in word set mutable
+in word set namespace
+in word set new
+in word set not
+in word set not_eq
+in word set operator
+in word set or
+in word set or_eq
+in word set private
+in word set protected
+in word set public
+in word set register
+in word set reinterpret_cast
+in word set return
+in word set short
+in word set signed
+in word set sizeof
+in word set static
+in word set static_cast
+in word set struct
+in word set switch
+in word set template
+in word set this
+in word set throw
+in word set true
+in word set try
+in word set typedef
+in word set typeid
+in word set typename
+in word set union
+in word set unsigned
+in word set using
+in word set virtual
+in word set void
+in word set volatile
+in word set wchar_t
+in word set while
+in word set xor
+in word set xor_eq
diff --git a/apps/gperf/tests/cpp.gperf b/apps/gperf/tests/cpp.gperf
new file mode 100644
index 00000000000..e8c8dc3f251
--- /dev/null
+++ b/apps/gperf/tests/cpp.gperf
@@ -0,0 +1,73 @@
+and
+and_eq
+asm
+auto
+bitand
+bitor
+bool
+break
+case
+catch
+char
+class
+compl
+const
+const_cast
+continue
+default
+delete
+do
+double
+dynamic_cast
+else
+enum
+explicit
+extern
+false
+float
+for
+friend
+goto
+if
+inline
+int
+long
+mutable
+namespace
+new
+not
+not_eq
+operator
+or
+or_eq
+private
+protected
+public
+register
+reinterpret_cast
+return
+short
+signed
+sizeof
+static
+static_cast
+struct
+switch
+template
+this
+throw
+true
+try
+typedef
+typeid
+typename
+union
+unsigned
+using
+virtual
+void
+volatile
+wchar_t
+while
+xor
+xor_eq
diff --git a/apps/gperf/tests/tests.mpc b/apps/gperf/tests/tests.mpc
index 8a54a8bc58b..c90648dad84 100644
--- a/apps/gperf/tests/tests.mpc
+++ b/apps/gperf/tests/tests.mpc
@@ -45,25 +45,25 @@ project(adainset): gperf_test {
   }
 }
 
-project(c++inset): gperf_test {
-  exename = c++out
+project(cppinset): gperf_test {
+  exename = cppout
 
   verbatim(gnuace, bottom) {
     all: runtests
 
-    runtests: c++out
-    "	@echo "Testing c++out"
-    "	./c++out -v < c++.gperf > c++out.out
-    "	-diff -b c++-res.exp c++out.out"
+    runtests: cppout
+    "	@echo "Testing cppout"
+    "	./cppout -v < cpp.gperf > cppout.out
+    "	-diff -b cpp-res.exp cppout.out"
   }
 
   GPERF_Files {
     commandflags += -a -D
-    c++.gperf
+    cpp.gperf
   }
 
   Source_Files {
-    c++.cpp
+    cpp.cpp
   }
 }
 
@@ -213,7 +213,7 @@ project(taoinset): gperf_test {
   }
 
   GPERF_Files {
-    commandflags += -c -C -D -E -f 0 -a -o 
+    commandflags += -c -C -D -E -f 0 -a -o
     tao.gperf
   }
 
-- 
cgit v1.2.1