[Tinyos-commits] CVS: tinyos-1.x/tos/lib/VM/languages/motlle/tools genfns.pl, 1.2, 1.3

[David Gay]

Update of /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29044/tools

Modified Files:
	genfns.pl 
Log Message:
misc fixes


Index: genfns.pl
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/tools/genfns.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** genfns.pl	30 Nov 2004 18:52:45 -0000	1.2
--- genfns.pl	25 Oct 2005 00:39:11 -0000	1.3
***************
*** 1,4 ****
--- 1,9 ----
  #!/usr/bin/perl
  
+ if ($ARGV[0] eq "-scheme") {
+     shift;
+     $scheme = true;
+ }
+ 
  $target = shift @ARGV;
  
***************
*** 24,29 ****
  	}
  	$msg = 0;
! 	if ($spec =~ /^(:?[a-zA-Z][a-zA-Z0-9$_:?!]*):\s+((.|\n)*)$/) {
  	    $fn = $1;
  	    $help = $2;
  
--- 29,38 ----
  	}
  	$msg = 0;
! 	if ($spec =~ /^([!\$%&*\/:<=>?~_^a-zA-Z][!\$%&*\/:<=>?~_^a-zA-Z0-9.+-]*|[+]|[-]|[|]):\s+((.|\n)*)$/) {
  	    $fn = $1;
+ 	    unless ($scheme) {
+ 		$fn =~ s/->/2/g;
+ 		$fn =~ s/-/_/g;
+ 	    }
  	    $help = $2;
  
***************
*** 83,89 ****
      $cname = "m$fn";
      $cname =~ tr/A-Z/a-z/;
!     $cname =~ s/[$:]/_/g;
      $cname =~ s/\?/p/g;
      $cname =~ s/!/b/g;
  
      print ALLFNS "<FUNCTION name=$cname>\n";
--- 92,107 ----
      $cname = "m$fn";
      $cname =~ tr/A-Z/a-z/;
!     $cname =~ s/[-\$]/_/g;
      $cname =~ s/\?/p/g;
      $cname =~ s/!/b/g;
+     $cname =~ s/</_lt/g;
+     $cname =~ s/>/_gt/g;
+     $cname =~ s/=/_eq/g;
+     $cname =~ s/[+]/_plus/g;
+     $cname =~ s/[*]/_times/g;
+     $cname =~ s/\//_slash/g;
+     $cname =~ s/[|]/_bar/g;
+     $cname =~ s/&/_ampersand/g;
+     $cname =~ s/[\^]/_caret/g;
  
      print ALLFNS "<FUNCTION name=$cname>\n";