Re: a simple formatter

[Tsantilas Christos]

> Tested.
>
> I have made a (small) file of the structures I've noticed past formatting
> errors on. With a manual fix-up to what I think it should look like in
> readable C++ under the published squid formatting description.
>
> The output of your script does this:
> ......................

It is the "--break-blocks" option of the astyle. I think it can removed.

> Also, I noticed that the formatter will accept _anything_ given to it as a
> filename and create the files. Thats rather nasty when non-valid filename
> sequences are entered. ie "--help"
>

OK fixed :-).  Now accepts only files with .cc,.h,.cci and .c extensions
and ignore all other files.
I am re-sending the fixed script . In this version also I removed the
"--break-blocks" astyle option. Formated code looks better without it.

--
  Christos


#!/usr/bin/perl
#
# Author: Tsantilas Christos
# email:  [EMAIL PROTECTED]
#
# Distributed under the terms of the GNU General Public License as published
# by the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# The ldap_manager library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
# Library General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See LICENSE or http://www.gnu.org/licenses/gpl.html for details .
#


use IPC::Open2;

$ASTYLE_BIN="/usr/bin/astyle";
$ASTYLE_ARGS ="--mode=c -s4 -O -l";

#$ASTYLE_ARGS="--mode=c -s4 -O --break-blocks -l";
#$ASTYLE_BIN="/usr/local/src/astyle-1.21/bin/astyle";



if(! -e $ASTYLE_BIN){
    print "\nFile $ASTYLE_BIN not found\n";
    print "Please fix the ASTYLE_BIN variable in this script!\n\n";
    exit -1;
}
$ASTYLE_BIN=$ASTYLE_BIN." ".$ASTYLE_ARGS;

$INDENT = "";

$out = shift @ARGV;
#read options, currently no options available
while($out eq "" ||  $out =~ /^-\w+$/){
   if($out eq "-h") {
        usage($0);
        exit 0;
   }
   else {
       usage($0);
       exit -1;
   }
}


while($out){

    if( $out !~ /\.cc$|\.cci$|\.h$|\.c$/) {
         print "Unknown suffix for file $out, ignoring....\n";
         $out = shift @ARGV;
         next;
    }

    $in= "$out.astylebak";
    my($new_in) = $in;
    my($i) = 0;
    while(-e $new_in) {
	$new_in=$in.".".$i;
	$i++;
    }
    $in=$new_in;
    rename($out, $in);
    
    local (*FROM_ASTYLE, *TO_ASTYLE);
    $pid_style=open2(\*FROM_ASTYLE, \*TO_ASTYLE, $ASTYLE_BIN);
    
    if(!$pid_style){
	print "An error while open2\n";
	exit -1;
    }
    
    
    if($pid=fork()){
	#do parrent staf
	close(FROM_ASTYLE);
	
	if(!open(IN, "<$in")){
	    print "Can not open input file: $in\n";
	    exit -1;
	}
	my($line) = '';
	while(<IN>){
	    $line=$line.$_;
	    if(input_filter(\$line)==0){
		next;
	    }
	    print TO_ASTYLE $line;
	    $line = '';
	}
	if($line){
	    print TO_ASTYLE $line;
	}
	close(TO_ASTYLE);
	waitpid($pid,0);
    }
    else{
	# child staf
	close(TO_ASTYLE);
	
	if(!open(OUT,">$out")){
	    print "Can't open output file: $out\n";
	    exit -1;
	}
	my($line)='';
	while(<FROM_ASTYLE>){
	    $line = $line.$_;
	    if(output_filter(\$line)==0){
		next;
	    }
	    print OUT $line;
	    $line = '';
	}
	if($line){
	    print OUT $line;
	}
	close(OUT);
	exit 0;
    }

    $out = shift @ARGV;
}


sub input_filter{
    my($line)[EMAIL PROTECTED];
     #if we have integer declaration, get it all before processing it..
    if($$line =~/.*\s*int\s+.*/  ){ 
	if(index($$line,";") == -1){
	    return 0;
	}
	if($$line =~ /(.*)\s*int\s+([^:]*):\s*(\w+)\s*\;(.*)/s){
#	    print ">>>>> ".$$line."    ($1)\n";
	    $$line= $1." int ".$2."__FORASTYLE__".$3.";".$4;
#	    print "----->".$$line."\n";
	}
	return 1;
    }

    return 1;
}

sub output_filter{
    my($line)[EMAIL PROTECTED];

    if($$line =~ /^\s*$/){
	return 1;
    }
    
    #if line is not preprocessor directive keep indentation
    if($$line !~  /^(\s*)\#/){
	$$line =~ /^(\s*)./;
	$INDENT = $1;
# here we can handle only the case we have a one line C++/C command.
# but looks enougth......
    }
    
    #   The  "#preprocessor_directive {" case
     if($$line =~ /^(\s*)\#(.*){\s*$/ ){
	$$line=$1."#".$2."\n".$INDENT."{\n";
    }
	
    #   The  "{ #preprocessor directive" case
    if($$line =~ /^(\s*)\{(.*)#(if|else|endif)(.*)$/ ){
#      print "From :".$$line."\n";
      $$line= $1."{".$2."\n#".$3.$4."\n";
#      print "-->>".$$line."\n";
    }

   # "The "unsigned int:1; case ....."
    $$line =~ s/__FORASTYLE__/:/;
    
    return 1;
}

sub usage{
    my($name)[EMAIL PROTECTED];
    print "Usage:\n   $name file1 file2 file3 ....\n";
}