X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=tools%2Fremove_cpp_comands.perl;h=ca19e7a17e9ccf2b49ed296c638ab6516a117ad3;hb=296607102219c3895e55a5b662e340b0c749510d;hp=7597720220cc27bfe142a1944d7bdbb9c842de35;hpb=f80cb22323f457e765fd66e4020ceee3c91dc3b6;p=libfirm

diff --git a/tools/remove_cpp_comands.perl b/tools/remove_cpp_comands.perl
index 759772022..ca19e7a17 100644
--- a/tools/remove_cpp_comands.perl
+++ b/tools/remove_cpp_comands.perl
@@ -67,11 +67,13 @@ $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 =~ /wchar_t/) {
+	# of course crecoder cannot handle wchar_t, what else?
     } elsif ($multiline > 0) {
         # this line connects a previous one, kill it
         if ($line =~ /\\$/) {
@@ -88,13 +90,13 @@ foreach $line (@lines) {
         } else {
           $multiline = 0;
         }
-    } elsif ($openbracket == 1) {
+    } 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 = "";
@@ -107,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;
 	    }
 	}
@@ -130,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;
+}