[Tinyos-commits] CVS: tinyos-1.x/tools/scripts/codeGeneration generateNescDecls.pl, 1.2, 1.3

[Henri DF]

Update of /cvsroot/tinyos/tinyos-1.x/tools/scripts/codeGeneration
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21172

Modified Files:
	generateNescDecls.pl 
Log Message:
tweak regexps to accept type identifiers that have $ in them (which can happen
ie when typedeffing a struct in a module)


Index: generateNescDecls.pl
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/scripts/codeGeneration/generateNescDecls.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** generateNescDecls.pl	12 Jan 2006 22:50:44 -0000	1.2
--- generateNescDecls.pl	18 Jan 2006 15:47:33 -0000	1.3
***************
*** 158,162 ****
  #make this a little faster by reducing the size of app.c
  my $brief = '';
! my @lines = $appText =~ m|^\s*(\w[\w\s]+?\*?\s+\*?[\w\$]+(\[.*?\])?(?:\s*=.*?)?;)\s*$|mg;
  for my $line (@lines) {
      if (!$line || $line =~ m/^\s*return\s+/){
--- 158,162 ----
  #make this a little faster by reducing the size of app.c
  my $brief = '';
! my @lines = $appText =~ m|^\s*(\w[\w\s\$]+?\*?\s+\*?[\w\$]+(\[.*?\])?(?:\s*=.*?)?;)\s*$|mg;
  for my $line (@lines) {
      if (!$line || $line =~ m/^\s*return\s+/){
***************
*** 175,179 ****
  	    my $nameRegexp = $name;
  	    $nameRegexp =~ s/\$/\\\$/;
! 	    if ( $brief =~ m|^\s*(\w[\w\s]+?\*?\s+\*?)$nameRegexp(\[.*?\])?(?:\s*=.*?)?;\s*$|m){
  		my $arraySize = $2;
  		my $type = $1;
--- 175,179 ----
  	    my $nameRegexp = $name;
  	    $nameRegexp =~ s/\$/\\\$/;
! 	    if ( $brief =~ m|^\s*(\w[\w\s\$]+?\*?\s+\*?)$nameRegexp(\[.*?\])?(?:\s*=.*?)?;\s*$|m){
  		my $arraySize = $2;
  		my $type = $1;