1 files changed, 3 insertions, 1 deletions
diff --git a/src/declinfo.l b/src/declinfo.l
index 3affce2..13c0715 100644
--- a/src/declinfo.l
+++ b/src/declinfo.l
@@ -128,9 +128,11 @@ ID	"$"?([a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]*)|(@[0-9]+)
 				    name += yytext;
 				  }
   				}
-<Start>(~{B}*)?{ID}/({B}*"["{B}*"]")* { // the []'s are for Java, 
+<Start>([~!]{B}*)?{ID}/({B}*"["{B}*"]")* { // the []'s are for Java, 
                                         // the / was add to deal with multi-
                                         // dimensional C++ arrays like A[][15]
+                                        // the leading ~ is for a destructor
+                                        // the leading ! is for a C++/CLI finalizer (see bug 456475 and 635198)
   				  addTypeName();
 				  name += yytext;
   				}