ChangeLogTag: Tue Sep 30 14:06:53 2003 Chad Elliott <elliott_c@ociweb.com>

9 files changed, 314 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 13af3dd272e..923a823cec3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,28 +1,46 @@
+Tue Sep 30 14:06:53 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * apps/gperf/tests/gperf_test.mpb:
+        * apps/gperf/tests/tests.mpc:
+
+          Added an mpc file for all of the gperf tests.
+
+        * bin/MakeProjectCreator/modules/AutomakeProjectCreator.pm:
+        * bin/MakeProjectCreator/modules/BorlandProjectCreator.pm:
+        * bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm:
+        * bin/MakeProjectCreator/modules/MakeProjectCreator.pm:
+        * bin/MakeProjectCreator/modules/NMakeProjectCreator.pm:
+        * bin/MakeProjectCreator/modules/ProjectCreator.pm:
+
+          Added code to handle double dollar signs ($$) in mpc assignment
+          values.  In make based projects, leave $$ as it is, but in others
+          convert $$ into $.
+
 Tue Sep 30 10:44:42 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* ace/Bug_1576_Regression_Test.cpp: Fixed fuzz errors.
+        * ace/Bug_1576_Regression_Test.cpp: Fixed fuzz errors.
 
 Tue Sep 30 10:43:34 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* ace/UUID.cpp (ACE_Utils): 
+        * ace/UUID.cpp (ACE_Utils):
+
+          Fixed fuzz errors.
 
-	  Fixed fuzz errors.
-	
 Tue Sep 30 10:40:37 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* Kokyu/DSRT_Direct_Dispatcher_Impl_T.h:
-	* Kokyu/DSRT_Dispatch_Item_T.h:
-	* Kokyu/DSRT_Dispatch_Item_T.i:
-	* Kokyu/DSRT_Dispatcher_Impl_T.h:
-	* Kokyu/DSRT_Sched_Queue_T.h:
-	* Kokyu/Default_Dispatcher_Impl.h:
-	* Kokyu/Dispatcher_Impl.h:
-	* Kokyu/Dispatcher_Task.h:
-	* Kokyu/Kokyu.h:
-	* Kokyu/Kokyu_defs.h:
-	* Kokyu/Kokyu_dsrt.h:
-
-	  Fixed fuzz errors.
+        * Kokyu/DSRT_Direct_Dispatcher_Impl_T.h:
+        * Kokyu/DSRT_Dispatch_Item_T.h:
+        * Kokyu/DSRT_Dispatch_Item_T.i:
+        * Kokyu/DSRT_Dispatcher_Impl_T.h:
+        * Kokyu/DSRT_Sched_Queue_T.h:
+        * Kokyu/Default_Dispatcher_Impl.h:
+        * Kokyu/Dispatcher_Impl.h:
+        * Kokyu/Dispatcher_Task.h:
+        * Kokyu/Kokyu.h:
+        * Kokyu/Kokyu_defs.h:
+        * Kokyu/Kokyu_dsrt.h:
+
+          Fixed fuzz errors.
 
 Tue Sep 30 10:10:17 2003  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/apps/gperf/tests/gperf_test.mpb b/apps/gperf/tests/gperf_test.mpb
new file mode 100644
index 00000000000..0b6e4b0298d
--- /dev/null
+++ b/apps/gperf/tests/gperf_test.mpb
@@ -0,0 +1,13 @@
+project: aceexe {
+  Define_Custom(GPERF) {
+    command          = $(ACE_ROOT)/bin/gperf
+    libpath         += $(ACE_ROOT)/lib
+    output_option    = >
+    inputext         = .gperf
+    source_outputext = .cpp
+  }
+
+  Source_Files {
+    test.cpp
+  }
+}
diff --git a/apps/gperf/tests/tests.mpc b/apps/gperf/tests/tests.mpc
new file mode 100644
index 00000000000..c73806ad78c
--- /dev/null
+++ b/apps/gperf/tests/tests.mpc
@@ -0,0 +1,220 @@
+project(cinset): gperf_test {
+  exename = cout
+
+  verbatim(gnuace, bottom) {
+    all: runtests
+
+    runtests:
+    "	@echo "Testing cout"
+    "	./cout -v < c.gperf > cout.out
+    "	-diff -b c.exp cout.out"
+  }
+
+  GPERF_Files {
+    commandflags += -a -p -c -l -S1 -o
+    c.gperf
+  }
+
+  Source_Files {
+    c.cpp
+  }
+}
+
+project(adainset): gperf_test {
+  exename = aout
+
+  verbatim(gnuace, bottom) {
+    all: runtests
+
+    runtests:
+    "	@echo "Testing aout"
+    "	./aout -v < ada.gperf > aout.out
+    "	-diff -b ada-res.exp aout.out"
+  }
+
+  GPERF_Files {
+    commandflags += -a -k1,4,$$
+    ada.gperf
+  }
+
+  Source_Files {
+    ada.cpp
+  }
+}
+
+project(c++inset): gperf_test {
+  exename = c++out
+
+  verbatim(gnuace, bottom) {
+    all: runtests
+
+    runtests:
+    "	@echo "Testing c++out"
+    "	./c++out -v < c++.gperf > c++out.out
+    "	-diff -b c++-res.exp c++out.out"
+  }
+
+  GPERF_Files {
+    commandflags += -a -D
+    c++.gperf
+  }
+
+  Source_Files {
+    c++.cpp
+  }
+}
+
+project(preinset): gperf_test {
+  exename = preout
+
+  verbatim(gnuace, bottom) {
+    all: runtests
+
+    runtests:
+    "	@echo "Testing preout"
+    "	./preout -v < adadefs.gperf > preout.out
+    "	-diff -b ada-pred.exp preout.out"
+  }
+
+  GPERF_Files {
+    commandflags += -a -p -D -k1,$$ -s 2 -o
+    adadefs.gperf
+  }
+
+  Source_Files {
+    adadefs.cpp
+  }
+}
+
+project(m3inset): gperf_test {
+  exename = m3out
+
+  verbatim(gnuace, bottom) {
+    all: runtests
+
+    runtests:
+    "	@echo "Testing m3out"
+    "	./m3out -v < modula3.gperf > m3out.out
+    "	-diff -b modula.exp m3out.out"
+  }
+
+  GPERF_Files {
+    commandflags += -a -k1,2,$$
+    modula3.gperf
+  }
+
+  Source_Files {
+    modula3.cpp
+  }
+}
+
+project(pinset): gperf_test {
+  exename = pout
+
+  verbatim(gnuace, bottom) {
+    all: runtests
+
+    runtests:
+    "	@echo "Testing pout"
+    "	./pout -v < pascal.gperf > pout.out
+    "	-diff -b pascal.exp pout.out"
+  }
+
+  GPERF_Files {
+    commandflags += -a -o -S2 -p
+    pascal.gperf
+  }
+
+  Source_Files {
+    pascal.cpp
+  }
+}
+
+project(iinset): gperf_test {
+  exename = iout
+
+  verbatim(gnuace, bottom) {
+    all: runtests
+
+    runtests:
+    "	@echo "Testing iout"
+    "	./iout -v < idl.gperf > iout.out
+    "	-diff -b idl.exp iout.out"
+  }
+
+  GPERF_Files {
+    commandflags += -m -M -c -C -D -S1 -E -T -a -o -p
+    idl.gperf
+  }
+
+  Source_Files {
+    idl.cpp
+  }
+}
+
+project(iinset2): gperf_test {
+  exename = iout2
+  after  += iinset
+
+  verbatim(gnuace, bottom) {
+    all: runtests
+
+    runtests:
+    "	@echo "Testing iout2"
+    "	./iout2 -v < idl.gperf > iout2.out
+    "	-diff -b idl.exp iout2.out"
+  }
+
+  GPERF_Files {
+    commandflags += -m -M -c -C -D -E -T -a -o -p
+    idl.gperf
+  }
+
+  Source_Files {
+    idl.cpp
+  }
+}
+
+project(tinset): gperf_test {
+  exename = tout
+
+  verbatim(gnuace, bottom) {
+    all: runtests
+
+    runtests:
+    "	@echo "Testing tout"
+    "	./tout -v < corba.gperf > tout.out
+    "	-diff -b corba.exp tout.out"
+  }
+
+  GPERF_Files {
+    commandflags += -a -o
+    corba.gperf
+  }
+
+  Source_Files {
+    corba.cpp
+  }
+}
+
+project(taoinset): gperf_test {
+  exename = taoout
+
+  verbatim(gnuace, bottom) {
+    all: runtests
+
+    runtests:
+    "	@echo "Testing taoout"
+    "	./taoout -v < tao.gperf > taoout.out
+    "	-diff -b tao.exp taoout.out"
+  }
+
+  GPERF_Files {
+    commandflags += -c -C -D -E -f 0 -a -o 
+    tao.gperf
+  }
+
+  Source_Files {
+    tao.cpp
+  }
+}
diff --git a/bin/MakeProjectCreator/modules/AutomakeProjectCreator.pm b/bin/MakeProjectCreator/modules/AutomakeProjectCreator.pm
index 2266e8589fc..02aa488820e 100644
--- a/bin/MakeProjectCreator/modules/AutomakeProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/AutomakeProjectCreator.pm
@@ -22,6 +22,12 @@ use vars qw(@ISA);
 # Subroutine Section
 # ************************************************************
 
+sub dollar_special {
+  #my($self) = shift;
+  return 1;
+}
+
+
 sub sort_files {
   #my($self) = shift;
   return 0;
diff --git a/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm b/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm
index dced6225440..ea2aef87799 100644
--- a/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm
@@ -22,6 +22,12 @@ use vars qw(@ISA);
 # Subroutine Section
 # ************************************************************
 
+sub dollar_special {
+  #my($self) = shift;
+  return 1;
+}
+
+
 sub fill_value {
   my($self)  = shift;
   my($name)  = shift;
diff --git a/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm b/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
index 1cb9f30c5e3..f663f5b876c 100644
--- a/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
@@ -31,6 +31,12 @@ my(%compscript) = ('ACE_COMPONENTS'     => ['--ace',     '--set'],
 # Subroutine Section
 # ************************************************************
 
+sub dollar_special {
+  #my($self) = shift;
+  return 1;
+}
+
+
 sub sort_files {
   #my($self) = shift;
   return 0;
diff --git a/bin/MakeProjectCreator/modules/MakeProjectCreator.pm b/bin/MakeProjectCreator/modules/MakeProjectCreator.pm
index c852fca6905..0992922b93d 100644
--- a/bin/MakeProjectCreator/modules/MakeProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/MakeProjectCreator.pm
@@ -21,6 +21,12 @@ use vars qw(@ISA);
 # Subroutine Section
 # ************************************************************
 
+sub dollar_special {
+  #my($self) = shift;
+  return 1;
+}
+
+
 sub sort_files {
   #my($self) = shift;
   return 0;
diff --git a/bin/MakeProjectCreator/modules/NMakeProjectCreator.pm b/bin/MakeProjectCreator/modules/NMakeProjectCreator.pm
index dfab3435f98..c4759850002 100644
--- a/bin/MakeProjectCreator/modules/NMakeProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/NMakeProjectCreator.pm
@@ -21,6 +21,12 @@ use vars qw(@ISA);
 # Subroutine Section
 # ************************************************************
 
+sub dollar_special {
+  #my($self) = shift;
+  return 1;
+}
+
+
 sub sort_files {
   #my($self) = shift;
   return 0;
diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm
index d0d6c3993d5..ee98ef8176a 100644
--- a/bin/MakeProjectCreator/modules/ProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm
@@ -176,6 +176,7 @@ sub new {
   $self->{'convert_slashes'}       = $self->convert_slashes();
   $self->{'sort_files'}            = $self->sort_files();
   $self->{'source_callback'}       = undef;
+  $self->{'dollar_special'}        = $self->dollar_special();
   $self->reset_generating_types();
 
   return $self;
@@ -210,6 +211,9 @@ sub process_assignment {
     my($def) = $self->get_default_project_name();
     $value = $self->fill_type_name($value, $def);
   }
+  if (defined $value && !$self->{'dollar_special'} && $value =~ /\$\$/) {
+    $value =~ s/\$\$/\$/g;
+  }
   $self->SUPER::process_assignment($name, $value, $assign);
 }
 
@@ -700,10 +704,16 @@ sub process_feature {
   }
 
   if ($self->check_features($requires, $avoids)) {
+    ## The required features are enabled, so we say that
+    ## a project has been defined and we allow the parser to
+    ## find the data held within the feature.
     $self->{'feature_defined'} = 0;
     $self->{$self->{'type_check'}} = 1;
   }
   else {
+    ## Otherwise, we read in all the lines until we find the
+    ## closing brace for the feature and it appears to the parser
+    ## that nothing was defined.
     my($curly) = 1;
     while($_ = $fh->getline()) {
       my($line) = $self->strip_line($_);
@@ -1997,7 +2007,7 @@ sub write_output_file {
           my($pjname) = $self->get_assignment('project_name');
           my(@list)   = $self->get_component_list('source_files');
           if (UNIVERSAL::isa($cb, 'ARRAY')) {
-            my(@copy) = @$cb;                
+            my(@copy) = @$cb;
             my($s) = shift(@copy);
             &$s(@copy, $name, $pjname, @list);
           }
@@ -2356,6 +2366,11 @@ sub get_default_element_name {
 # Virtual Methods To Be Overridden
 # ************************************************************
 
+sub dollar_special {
+  #my($self) = shift;
+  return 0;
+}
+
 sub translate_value {
   my($self) = shift;
   my($key)  = shift;