X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=tools%2Fremove_cpp_comands.perl;h=ca19e7a17e9ccf2b49ed296c638ab6516a117ad3;hb=ff0e8d7fcb34481652f0bf521ba04b1eca5e2106;hp=56a8c2a240892ba8d059792bdd5538dd0b08da55;hpb=1a09f25603172665322612b51760898e54d13530;p=libfirm

diff --git a/tools/remove_cpp_comands.perl b/tools/remove_cpp_comands.perl
index 56a8c2a24..ca19e7a17 100644
--- a/tools/remove_cpp_comands.perl
+++ b/tools/remove_cpp_comands.perl
@@ -62,26 +62,41 @@ $scndlastline = "";
 $lastline = "";
 
 $eat = 0;
+$multiline = 0;
 
 foreach $line (@lines) {
 
     if ($line =~ /\#ifdef __cplusplus/) {
-#       There is extern "C" in firm.h, guarded by #ifdef __cplusplus
+#       There is extern "C" in some header files guarded by #ifdef __cplusplus
 #       crecoder does not grok the extern "C", so remove thses three lines.
 	$eat = 2;
     } elsif ($eat > 0) {
 	$eat = $eat -1;
-    } elsif (($line =~ /^\#/)   ) {
+    } elsif ($line =~ /wchar_t/) {
+	# of course crecoder cannot handle wchar_t, what else?
+    } elsif ($multiline > 0) {
+        # this line connects a previous one, kill it
+        if ($line =~ /\\$/) {
+          $multiline = 1;
+        } else {
+          $multiline = 0;
+        }
+    } elsif ($line =~ /^\#/) {
 	# eat the line
 	$scndlastline = $lastline;
 	$lastline = $line;
-    } elsif ($openbracket == 1) {
+        if ($line =~ /\\$/) {
+          $multiline = 1;
+        } else {
+          $multiline = 0;
+        }
+    } elsif ($openbracket >= 1) {
 	print TDF "$line";
-	if ((index($line, "}") > -1)) {
-	    $openbracket = 0;
-	    if (($guardedtypedef == 1)) {
-		print TDF "#endif\n";
-		$guardedtypedef = 0;
+	$openbracket += num_brackets($line);
+        if ($openbracket == 0) {
+ 	    if (($guardedtypedef == 1)) {
+	        print TDF "#endif\n";
+	        $guardedtypedef = 0;
 	    }
 	}
 	$lastline = "";
@@ -94,16 +109,10 @@ foreach $line (@lines) {
 	    print TDF "$lastline"; 	$lastline = "";
 	}
 	print TDF "$line";
-	if ((index($line, "{") > -1)) {
-	    $openbracket = 1;
-	} elsif (($guardedtypedef == 1)) {
-	    print TDF "#endif\n";
-	    $guardedtypedef = 0;
-	}
-	if ((index($line, "}") > -1)) {
-	    $openbracket = 0;
+	$openbracket += num_brackets($line);
+        if ($openbracket == 0) {
 	    if (($guardedtypedef == 1)) {
-		print TDF "#endif\n";
+	        print TDF "#endif\n";
 		$guardedtypedef = 0;
 	    }
 	}
@@ -117,3 +126,44 @@ foreach $line (@lines) {
 
 close(TDF);
 close(OUT);
+
+# count the bracket ballance
+sub num_brackets {
+  my $line = shift;
+  my $lastpos;
+  my $cnt = 0;
+
+  $lastpos = -1;
+  while(1) {
+    $lastpos = index($line, "{", $lastpos+1);
+    if ($lastpos < 0) {
+      last;
+    }
+    $cnt++;
+  }
+  $lastpos = -1;
+  while(1) {
+    $lastpos = index($line, "(", $lastpos+1);
+    if ($lastpos < 0) {
+      last;
+    }
+    $cnt++;
+  }
+  $lastpos = -1;
+  while(1) {
+    $lastpos = index($line, "}", $lastpos+1);
+    if ($lastpos < 0) {
+      last;
+    }
+    $cnt--;
+  }
+  $lastpos = -1;
+  while(1) {
+    $lastpos = index($line, ")", $lastpos+1);
+    if ($lastpos < 0) {
+      last;
+    }
+    $cnt--;
+  }
+  return $cnt;
+}