diff -rNu headerdoc-8.9.14/Makefile headerdoc-8.9.20/Makefile
--- headerdoc-8.9.14/Makefile	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/Makefile	2014-02-14 18:03:01.000000000 -0800
@@ -22,12 +22,13 @@
 endif
 endif
 startperl   := $(shell perl -e 'require Config; print "$$Config::Config{'startperl'}\n";')
+testsuite_version := $(shell cat testsuite/version)
 
 all: all_internal test apidoc
 
 # Override the default compiler to GCC 4.0 if building for Snow Leopard internally.
 all_internal:
-	cd xmlman ; make all CC=`if [ "$$DEVELOPER_BIN_DIR" != "" -a "$(building_ppc)" != "0" ] ; then echo "gcc-4.0" ; else echo "cc"; fi` ARCH=`uname` VERS=`{ echo "10.6"; sw_vers -productVersion | sed 's/\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1.\2/'; } | sort | head -n 1` ; cd ..
+	cd xmlman ; make all CC=`if [ "$$DEVELOPER_BIN_DIR" != "" -a "$(building_ppc)" != "0" ] ; then echo "gcc-4.0" ; else echo "cc"; fi` ARCH=`uname` VERS=`{ echo "10.8"; sw_vers -productVersion | sed 's/\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1.\2/'; } | sort | head -n 1` ; cd ..
 
 clean:
 	cd xmlman ; make clean ; cd ..
@@ -78,6 +79,7 @@
 
 realinstall: all_internal
 	DSTROOT="" make installsub
+	DSTROOT="" make installtests
 
 install: all_internal
 	@echo ; \
@@ -136,6 +138,7 @@
 	install -s -c -m 755 xmlman/resolveLinks $(DSTROOT)$(bindir)/resolveLinks
 	install -c -m 755 headerDoc2HTML.pl $(DSTROOT)$(bindir)/$(program1)
 	perl -i -pe 's|^#!/usr/bin/perl.*$$|$(startperl)|;' $(DSTROOT)$(bindir)/$(program1)
+	perl -i -pe 's|^\$$HeaderDoc::testsuite_version="\d+";|\$$HeaderDoc::testsuite_version="$(testsuite_version)";|;' $(DSTROOT)$(bindir)/$(program1)
 	chmod 555 $(DSTROOT)$(bindir)/$(program1)
 	umask 022 && install -d $(DSTROOT)$(bindir)
 	install -c -m 755 gatherHeaderDoc.pl $(DSTROOT)$(bindir)/$(program2)
@@ -149,6 +152,7 @@
 	install -c -m 444 Documentation/man/*.5 $(DSTROOT)$(DEVELOPER_DIR)/usr/share/man/man5
 	cd xmlman ; make clean ; cd ..
 
+installtests:
 	# Install test suite
 	umask 022 && install -d $(DSTROOT)$(DEVELOPER_DIR)/usr/share/headerdoc/testsuite
 	umask 022 && install -d $(DSTROOT)$(DEVELOPER_DIR)/usr/share/headerdoc/testsuite/parser_tests
@@ -158,6 +162,8 @@
 	umask 022 && install -d $(DSTROOT)$(DEVELOPER_DIR)/usr/share/headerdoc/testsuite/c_preprocessor_tests
 	install -c -m 444 testsuite/parser_tests/*.test $(DSTROOT)$(DEVELOPER_DIR)/usr/share/headerdoc/testsuite/parser_tests
 
+	install -c -m 755 testsuite/version $(DSTROOT)$(DEVELOPER_DIR)/usr/share/headerdoc/testsuite
+
 	# Install resolvelinks test tools
 	install -c -m 755 testsuite/resolvelinks/update.sh $(DSTROOT)$(DEVELOPER_DIR)/usr/share/headerdoc/testsuite/resolvelinks
 	install -c -m 755 testsuite/resolvelinks/runtests.sh $(DSTROOT)$(DEVELOPER_DIR)/usr/share/headerdoc/testsuite/resolvelinks
diff -rNu headerdoc-8.9.14/Modules/HeaderDoc/APIOwner.pm headerdoc-8.9.20/Modules/HeaderDoc/APIOwner.pm
--- headerdoc-8.9.14/Modules/HeaderDoc/APIOwner.pm	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/Modules/HeaderDoc/APIOwner.pm	2014-02-14 18:03:01.000000000 -0800
@@ -3,7 +3,7 @@
 # Class name: APIOwner
 # Synopsis: Abstract superclass for Header and OO structures
 #
-# Last Updated: $Date: 2012/06/19 16:53:38 $
+# Last Updated: $Date: 2014/02/14 17:55:29 $
 # 
 # Method additions by SKoT McDonald <skot@tomandandy.com> Aug 2001 
 #
@@ -213,7 +213,6 @@
 }
 use HeaderDoc::HeaderElement;
 use HeaderDoc::Group;
-use HeaderDoc::DBLookup;
 use HeaderDoc::Utilities qw(findRelativePath safeName getAPINameAndDisc printArray printHash resolveLink sanitize dereferenceUIDObject validTag objName byLinkage byAccessControl objGroup linkageAndObjName byMethodType html_fixup_links xml_fixup_links calcDepth);
 use HeaderDoc::BlockParse qw(blockParseOutside);
 use File::Basename;
@@ -230,7 +229,7 @@
 #         In the git repository, contains the number of seconds since
 #         January 1, 1970.
 #  */
-$HeaderDoc::APIOwner::VERSION = '$Revision: 1340150018 $';
+$HeaderDoc::APIOwner::VERSION = '$Revision: 1392429329 $';
 
 my $addToDebug = 0;
 
@@ -1466,7 +1465,7 @@
 			    } elsif ($HeaderDoc::use_iframes) {
 	        		$tocString .= "<nobr>$entrypreface<a href=\"$class_baseref#$urlname\" target=\"_top\">$name</a></nobr><br>\n";
 			    } else {
-	        		$tocString .= "<nobr>$entrypreface<a href=\"$class_baseref#$urlname\" target=\"doc\">$name</a></nobr><br>\n";
+	        		$tocString .= "<nobr>$entrypreface<a href=\"$class_baseref#$urlname\" target=\"_top\">$name</a></nobr><br>\n";
 			    }
 			} else {
 			}
@@ -5805,8 +5804,14 @@
 
 	if ($HeaderDoc::use_iframes || $HeaderDoc::newTOC == 5) {
 	    if (!$HeaderDoc::suppressDefaultStyles) {
+		print OUTFILE $self->styleSheet(1);
 		print OUTFILE "<style><!--\n";
 		if ($HeaderDoc::newTOC == 5) {
+			print OUTFILE "body {\n";
+			print OUTFILE "    padding: 0px;\n";
+			print OUTFILE "    margin: 0px;\n";
+			print OUTFILE "    border: 0px;\n";
+			print OUTFILE "}\n";
 			print OUTFILE ".toc_contents_text {\n";
 			# print OUTFILE "    white-space: nowrap;\n";
 			print OUTFILE "    padding-left: 1em;\n";
@@ -5852,7 +5857,16 @@
 			print OUTFILE ".specbox a {\n";
 			print OUTFILE "		font-size: 12px;\n";
 			print OUTFILE "}\n";
-			print OUTFILE ".disclosure_triangle_td a:hover {\n";
+			print OUTFILE ".disclosure_triangle_td a {\n";
+			print OUTFILE "		text-decoration: none;\n";
+			print OUTFILE "}\n";
+			print OUTFILE ".disclosure_triangle_td a:link {\n";
+			print OUTFILE "		text-decoration: none;\n";
+			print OUTFILE "}\n";
+			print OUTFILE ".disclosure_triangle_td a:active {\n";
+			print OUTFILE "		text-decoration: none;\n";
+			print OUTFILE "}\n";
+			print OUTFILE ".disclosure_triangle_td a:visited:hover {\n";
 			print OUTFILE "		text-decoration: none;\n";
 			print OUTFILE "}\n";
 			print OUTFILE ".disclosure_triangle_td a:hover {\n";
@@ -5901,6 +5915,12 @@
 			print OUTFILE "		color: #808080;\n";
 			print OUTFILE "}\n";
 			print OUTFILE "\n";
+			print OUTFILE "#hd_outermost_table { margin-left: 0px; border-spacing: 0px; margin-top: 0px; padding-left: 0px; padding-top: 0px; border: none; }\n";
+			print OUTFILE "#hd_outermost_table > tr { border-spacing: 0px; margin-left: 0px; margin-top: 0px; padding-left: 0px; padding-top: 0px; border: none; }\n";
+			print OUTFILE "#hd_outermost_table > tr > td { border-spacing: 0px; margin-left: 0px; margin-top: 0px; }\n";
+			print OUTFILE "#hd_outermost_table > tbody > tr { border-spacing: 0px; margin-left: 0px; margin-top: 0px; padding-left: 0px; padding-top: 0px; border: none; }\n";
+			print OUTFILE "#hd_outermost_table > tbody > tr > td { border-spacing: 0px; margin-left: 0px; margin-top: 0px; padding-top: 3px; }\n";
+			print OUTFILE "\n";
 		}
 		print OUTFILE "#tocMenu {\n";
 		if ($HeaderDoc::newTOC == 5) {
@@ -5924,15 +5944,53 @@
 			print OUTFILE "		width: auto;\n";
 			# print OUTFILE "         position: absolute; top: 0px;\n";
 			print OUTFILE "		padding-left: 15px;\n";
+			print OUTFILE "}\n";
 		} else {
 			print OUTFILE "#bodyText {\n";
 			print OUTFILE "		top: 0px;\n";
 			print OUTFILE "		margin-left: 230px;\n";
+			print OUTFILE "}\n";
 		}
-		print OUTFILE "}\n";
 		print OUTFILE "--></style>\n";
+
+
+		if ($HeaderDoc::newTOC == 5) {
+			print OUTFILE "<style id=\"disable_before_iOS_5\"><!--\n";
+			print OUTFILE "#tocMenu {\n";
+			print OUTFILE "		position: fixed;\n";
+			print OUTFILE "		height: 100%;\n";
+			print OUTFILE "		overflow: auto;\n";
+			print OUTFILE "}\n";
+			print OUTFILE "#bodyContents {\n";
+			# print OUTFILE "		float: right;\n"; # Old div layout that proved unworkable
+			print OUTFILE "		width: auto;\n";
+			# print OUTFILE "         position: absolute; top: 0px;\n";
+			print OUTFILE "		left: 235px;\n";
+			print OUTFILE "		right: 0;\n";
+			print OUTFILE "		padding-left: 15px;\n";
+			print OUTFILE "		position: fixed;\n";
+			print OUTFILE "		height: 100%;\n";
+			print OUTFILE "		overflow-y: scroll;\n";
+			print OUTFILE "}\n";
+			print OUTFILE "--></style>\n";
+		}
 	    }
 	    if (!$HeaderDoc::suppressDefaultJavaScript) {
+		if ($HeaderDoc::newTOC == 5) {
+			print OUTFILE "<script language=\"JavaScript\" type=\"text/javascript\"><!--\n";
+			print OUTFILE "    if (navigator.platform && (navigator.platform.match(/iPad/) || navigator.platform.match(/iPhone/) || navigator.platform.match(/iPod/))) {\n";
+			print OUTFILE "        if (navigator.userAgent.match(/OS 1(_\\d)+/) ||\n";
+			print OUTFILE "            navigator.userAgent.match(/OS 2(_\\d)+/) ||\n";
+			print OUTFILE "            navigator.userAgent.match(/OS 3(_\\d)+/) ||\n";
+			print OUTFILE "            navigator.userAgent.match(/OS 4(_\\d)+/)) {\n";
+			print OUTFILE "                /* Earlier iOS versions require different scrolling gestures with position: fixed. */\n";
+			print OUTFILE "                var del_style_elt = document.getElementById(\"disable_before_iOS_5\");\n";
+			print OUTFILE "                if (del_style_elt) del_style_elt.parentNode.removeChild(del_style_elt);\n";
+			print OUTFILE "        }\n";
+			print OUTFILE "    }\n";
+			print OUTFILE "// --></script>\n";
+		}
+
 		if ($newTOC && $newTOC != 5) {
 			# if (!$HeaderDoc::use_iframes) { print OUTFILE "<script language=\"JavaScript\" src=\"/Resources/JavaScript/toc.js\" type=\"text/javascript\"></script>\n"; }
 			print OUTFILE "<meta id=\"toc-file\" name=\"toc-file\" content=\"toc.html\" />\n";
@@ -6680,6 +6738,10 @@
 		# @@@ FIXME DAG
 		my $cppAccessControlState = "protected:";
 
+		if ($sublang eq "IDL") {
+			$cppAccessControlState = "public:"; # IDLs have no notion of protection, typically.
+		}
+
 		my $fieldsref = \@fields;
 		my $filename = $self->filename;
 
diff -rNu headerdoc-8.9.14/Modules/HeaderDoc/AvailHelper.pm headerdoc-8.9.20/Modules/HeaderDoc/AvailHelper.pm
--- headerdoc-8.9.14/Modules/HeaderDoc/AvailHelper.pm	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/Modules/HeaderDoc/AvailHelper.pm	2014-02-14 18:03:01.000000000 -0800
@@ -3,7 +3,7 @@
 # Class name: AvailHelper
 # Synopsis: Helper code for availability
 #
-# Last Updated: $Date: 2011/02/18 19:02:57 $
+# Last Updated: $Date: 2014/02/14 17:55:29 $
 # 
 # Copyright (c) 2006 Apple Computer, Inc.  All rights reserved.
 #
@@ -59,7 +59,6 @@
     }
 }
 use HeaderDoc::HeaderElement;
-use HeaderDoc::DBLookup;
 use HeaderDoc::Utilities qw(findRelativePath safeName printArray printHash sanitize);
 use File::Basename;
 use Cwd;
@@ -75,7 +74,7 @@
 #         In the git repository, contains the number of seconds since
 #         January 1, 1970.
 #  */
-$HeaderDoc::AvailHelper::VERSION = '$Revision: 1298084577 $';
+$HeaderDoc::AvailHelper::VERSION = '$Revision: 1392429329 $';
 
 # Inheritance
 # @ISA = qw(HeaderDoc::HeaderElement);
diff -rNu headerdoc-8.9.14/Modules/HeaderDoc/BlockParse.pm headerdoc-8.9.20/Modules/HeaderDoc/BlockParse.pm
--- headerdoc-8.9.14/Modules/HeaderDoc/BlockParse.pm	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/Modules/HeaderDoc/BlockParse.pm	2014-02-21 10:06:00.000000000 -0800
@@ -3,7 +3,7 @@
 # Module name: BlockParse
 # Synopsis: Block parser code
 #
-# Last Updated: $Date: 2012/04/06 15:56:50 $
+# Last Updated: $Date: 2014/02/21 09:52:56 $
 # 
 # Copyright (c) 1999-2004 Apple Computer, Inc.  All rights reserved.
 #
@@ -122,7 +122,7 @@
 #         In the git repository, contains the number of seconds since
 #         January 1, 1970.
 #  */
-$HeaderDoc::BlockParse::VERSION = '$Revision: 1333753010 $';
+$HeaderDoc::BlockParse::VERSION = '$Revision: 1393005176 $';
 
 ################ Portability ###################################
 my $isMacOS;
@@ -367,6 +367,9 @@
 	    ($tos eq "\@protocol") && do {
 			return "\@end";
 		};
+	    (($lang eq "applescript") && $tos =~ /(if|repeat|try|tell)/) && do {
+			return "end";
+		};
 	    (($lang eq "ruby") && $tos =~ /(for|while|if|until|begin)/) && do {
 			return "end";
 		};
@@ -811,6 +814,8 @@
     my $asDebug                 = 0;
     my $reMarkDebug             = 0;
 
+    if ($asDebug && (!$HeaderDoc::AppleScriptDebug)) { $HeaderDoc::AppleScriptDebug = 1; }
+
     $cppDebug = $cppDebugDefault ? $cppDebugDefault : $HeaderDoc::fileDebug;
 
     # State variables (part 1 of 3)
@@ -1637,6 +1642,9 @@
 	    $treeSkip = 0;
 	    my $reMark = "";
 
+	    print "PARSER STATE COUNT: ".scalar(@parserStack)."\n" if ($parserStackDebug);
+	    $parserState->print() if ($parserStackDebug);
+
 	    print STDERR "INMACROLINE: ".$parserState->{inMacroLine}."\n" if ($localDebug || $parseDebug || $parmDebug);
 	    if ($part) { $leavingRegexp = 0; } # Reset to 0 at the top of the loop.
 
@@ -1697,6 +1705,7 @@
 			next;
 	    }
 	    print STDERR "PART IS \"$part\"\n" if ($localDebug || $parserStackDebug || $parseDebug || $liteDebug || $spaceDebug || $tokenDebug);
+	    print STDERR "SPS: ".scalar(@parserStack)." BSC: ".(scalar(@braceStack))." IBSC: ".$parserState->{initbsCount}."\n" if ($parserStackDebug);
 	    print STDERR "QUOTED: ".$parserState->isQuoted($lang, $sublang)."\n" if ($localDebug || $parserStackDebug || $parseDebug || $liteDebug || $spaceDebug);
 	    print STDERR "CURLINE IS \"$curline\"\n" if ($localDebug || $hangDebug || $liteDebug);
 	    # print STDERR "RETURNTYPE IS \"$parserState->{returntype}\"\n" if ($localDebug || $hangDebug || $liteDebug);
@@ -1881,13 +1890,15 @@
 
 	print "IC: $parserState->{inClass} TOK: $part\n" if ($parseDebug || $classDebug);
 
-	    my $externCDebug = 0;
+	my $externCDebug = 0;
+	my $iskw = isKeyword($part, $keywordhashref, $case_sensitive);
+
+	if ($HeaderDoc::includeFunctionContents || !$parserState->{seenBraces}) {
 
 	    # Handle the GCC "__attribute__" extension outside the context of
 	    # the parser because it isn't part of the language and massively
 	    # breaks the syntax.
 	    # Same for asm
-	    my $iskw = isKeyword($part, $keywordhashref, $case_sensitive);
 	    if (($iskw == 8) && !$parserState->{attributeState} &&
 		!$parserState->{parsedParamParse} &&
 		!$parserState->{inBrackets} &&
@@ -2007,6 +2018,8 @@
 		}
 	    }
 
+	}
+
 	    # Here be the parser.  Abandon all hope, ye who enter here.
 	    $treepart = "";
 
@@ -2177,8 +2190,7 @@
 			} else {
 				$parserState->{implementsClass} = "";
 			}
-		} elsif ($parserState->isLeftBrace($part, $lang, $parseTokens{lbrace}, $parseTokens{lbraceunconditionalre}, $parseTokens{lbraceconditionalre},
-		         $parseTokens{classisbrace}, $parseTokens{functionisbrace}, $case_sensitive, scalar(@braceStack)) || $part eq ";") {
+		} elsif ($parserState->isLeftBrace($part, $lang, \%parseTokens, $case_sensitive, scalar(@braceStack)) || $part eq ";") {
 
 			# $part eq "{"
 			print STDERR "INCLASS BRCSEMI\n" if ($parseDebug || $classDebug);
@@ -2392,21 +2404,21 @@
 	    };
 
 
-	    if ($lang eq "tcl") {
-		if ($part =~ /[\n\r]/) {
-			# 2 until first non-space token.
-			$parserState->{afterNL} = 2;
+	    if ($part =~ /[\n\r]/) {
+		# 2 until first non-space token.
+		$parserState->{afterNL} = 2;
 
+		if ($lang eq "tcl") {
 			if ($parserState->{inTCLRegExpCommand}) {
 				$parserState->{inTCLRegExpCommand} = 0;
 			}
-		} elsif ($parserState->{afterNL} == 1) {
+		}
+	    } elsif ($parserState->{afterNL} == 1) {
 			# 0 after first non-space token.
 			$parserState->{afterNL} = 0;
-		} elsif ($parserState->{afterNL} == 2 && $part =~ /\S/) {
+	    } elsif ($parserState->{afterNL} == 2 && $part =~ /\S/) {
 			# 1 during first non-space token.
 			$parserState->{afterNL} = 1;
-		}
 	    }
 
 
@@ -2448,7 +2460,10 @@
 			last SWITCH;
 		};
 
-		(($lang eq "applescript") && $parserState->{inOfIn} && ($part =~ /\w/)) && do  {
+		(($lang eq "applescript") &&
+		 !($parserState->{inString} || $parserState->{inComment} || $parserState->{inInlineComment} ||
+		   $parserState->{inChar}) &&
+		 $parserState->{inOfIn} && ($part =~ /\w/)) && do  {
 			print STDERR "APPLESCRIPT OF/IN: CASE AS_00B\n" if ($liteDebug);
 			print STDERR "IN APPLESCRIPT OF/IN: ADDING $part\n" if ($asDebug);
 			$parserState->{OfIn} .= " ".$part;
@@ -2456,31 +2471,44 @@
 			last SWITCH;
 		};
 		
-		(($lang eq "applescript") && !$argparse && $labelregexp && ($part =~ /$labelregexp/) && ($parserState->{startOfDec} != 1)) && do {
-			print STDERR "APPLESCRIPT OF/IN: CASE AS_00C\n" if ($liteDebug);
+		(($lang eq "applescript") &&
+		 !($parserState->{inString} || $parserState->{inComment} || $parserState->{inInlineComment} ||
+		   $parserState->{inChar}) &&
+		 !$argparse && $labelregexp && ($part =~ /$labelregexp/) && ($parserState->{startOfDec} != 1)) && do {
+			print STDERR "APPLESCRIPT LABEL: CASE AS_00C\n" if ($liteDebug);
 			print STDERR "IN APPLESCRIPT LABEL: SET TO $part SOD=".$parserState->{startOfDec}."\n" if ($asDebug);
 			$parserState->{inLabel} = 1;
 			$parserState->{ASlabel} = $part;
 			last SWITCH;
 		};
 
-		(($lang eq "applescript") && $labelregexp && $parserState->{inLabel} && ($part =~ /\w/)) && do {
-			print STDERR "APPLESCRIPT OF/IN: CASE AS_00D\n" if ($liteDebug);
+		(($lang eq "applescript") &&
+		 !($parserState->{inString} || $parserState->{inComment} || $parserState->{inInlineComment} ||
+		   $parserState->{inChar}) &&
+		 $labelregexp && $parserState->{inLabel} && ($part =~ /\w/)) && do {
+			print STDERR "APPLESCRIPT LABEL: CASE AS_00D\n" if ($liteDebug);
 			print STDERR "IN APPLESCRIPT LABEL: ADDING $part\n" if ($asDebug);
 			$parserState->{ASlabel} .= " ".$part;
 			$parserState->{inLabel} = 0;
 			last SWITCH;
 		};
 
-		(($lang eq "applescript") && ($part eq "given")) && do {
-			print STDERR "APPLESCRIPT OF/IN: CASE AS_00E\n" if ($liteDebug);
+		(($lang eq "applescript") &&
+		 !($parserState->{inString} || $parserState->{inComment} || $parserState->{inInlineComment} ||
+		   $parserState->{inChar}) &&
+		 ($part eq "given")) && do {
+			print STDERR "APPLESCRIPT GIVEN: CASE AS_00E\n" if ($liteDebug);
 			print STDERR "IN APPLESCRIPT GIVEN ($part)\n" if ($asDebug);
 			$parserState->{inGiven} = 1;
 			$parserState->{inLabel} = 0;
 			last SWITCH;
 		};
-		(($lang eq "applescript") && $parserState->{inGiven} && ($part !~ /[\r\n]/)) && do {
-			print STDERR "APPLESCRIPT OF/IN: CASE AS_00F\n" if ($liteDebug);
+
+		(($lang eq "applescript") && $parserState->{inGiven} &&
+		 !($parserState->{inString} || $parserState->{inComment} || $parserState->{inInlineComment} ||
+		   $parserState->{inChar}) &&
+		 ($part !~ /[\r\n]/)) && do {
+			print STDERR "APPLESCRIPT GIVEN: CASE AS_00F\n" if ($liteDebug);
 			print STDERR "IN APPLESCRIPT GIVEN\n" if ($asDebug);
 			if ($part eq ",") {
 				print STDERR "IN APPLESCRIPT GIVEN COMMA\n" if ($asDebug);
@@ -3002,8 +3030,13 @@
 		# Pascal and PHP)
 
 		(($part eq $parseTokens{sofunction} || $part eq $parseTokens{soprocedure} || $part eq $parseTokens{soconstructor}) &&
+		  (($lang ne "applescript") || $parserState->appleScriptFunctionLegalHere(\@braceStack)) &&
 		  !($parserState->{inString} || $parserState->{inComment} || $parserState->{inInlineComment} || $parserState->{inChar}) &&
 		  !(scalar(@braceStack)-$parserState->{initbsCount}) && !$parserState->{seenBraces}) && do {
+
+			# print STDERR "(($part eq $parseTokens{sofunction} || $part eq $parseTokens{soprocedure} || $part eq $parseTokens{soconstructor}) &&".
+		  # "!($parserState->{inString} || $parserState->{inComment} || $parserState->{inInlineComment} || $parserState->{inChar})\n";
+			# print STDERR "AFTERNL: ".$parserState->{afterNL}."\n";
 			print STDERR "SOFUNC: CASE 10\n" if ($liteDebug);
 				if ($part eq $parseTokens{soconstructor}) {
 					$parserState->{isConstructor} = 1;
@@ -3040,6 +3073,9 @@
 				if ($parseTokens{parmswithcurlybraces}) {
 					$parserState->{pendingBracedParameters} = 1;
 				}
+				if ($parseTokens{functionisapiowner}) {
+					$pushParserStateAtBrace = 1;
+				}
 				last SWITCH;
 			};
 
@@ -3086,6 +3122,13 @@
 		 (!($parseTokens{classisbrace} && $parserState->{sodclass} eq "class" && (!$parserState->{inRubyClass}))) &&
 		 (!($parseTokens{functionisbrace} && $parserState->{pushedfuncbrace} == 1)) &&
 		 ($parserState->isQuoted($lang, $sublang) || (!$parserState->{newlineIsSemi}))) && do {
+
+			my $precursor = $parserState->clearLeftBracePrecursor();
+			if ($precursor) {
+				push(@braceStack, $precursor);
+				print STDERR "Pushing $precursor onto the brace stack [clearLeftBracePrecursor]\n" if ($HeaderDoc::AppleScriptDebug || $braceDebug || $parseDebug);
+			}
+
 			if ($lang eq "shell") {
 				if ($part eq ";;") {
 					$parserState->{afterSemi} = 2;
@@ -3733,7 +3776,7 @@
 			      last SWITCH;
 			    }
 			};
-		($part eq "'") && do {
+		($part eq "'" && $lang ne "applescript") && do {
 			print STDERR "SINGLE QUOTE: CASE 24\n" if ($liteDebug);
 				print STDERR "squo\n" if ($localDebug);
 
@@ -4113,7 +4156,7 @@
 			    print STDERR "OUTGOING CURLINE: \"$curline\"\n" if ($localDebug);
 			    last SWITCH;
 			};
-		((($part eq ")" && (!$parserState->{inCase})) || (casecmp($part, $parseTokens{rbrace}, $case_sensitive) && ($parserState->{pendingBracedParameters} == 2)))) && do {
+		((($part eq ")" && (!$parserState->{inCase})) || ($parserState->isRightBrace($part, $lang, \%parseTokens, $case_sensitive) && ($parserState->{pendingBracedParameters} == 2)))) && do {
 			print STDERR "CLOSE PAREN: CASE 29\n" if ($liteDebug);
 			# print STDERR "TOBS: \"".peek(\@braceStack)."\"\n";
 			    print STDERR "TOP OF RE STACK IS: \"".peek(\@regexpStack)."\"\n" if ($localDebug || $parseDebug);
@@ -4217,8 +4260,7 @@
 			      }
 			    }
 			};
-		(($lang ne "perl" || !($parserState->{inTemplate} || $inRegexp || $leavingRegexp)) && $parserState->isLeftBrace($part, $lang, $parseTokens{lbrace}, $parseTokens{lbraceunconditionalre}, $parseTokens{lbraceconditionalre},
-			$parseTokens{classisbrace}, $parseTokens{functionisbrace}, $case_sensitive, scalar(@braceStack))) && do {
+		(($lang ne "perl" || !($parserState->{inTemplate} || $inRegexp || $leavingRegexp)) && $parserState->isLeftBrace($part, $lang, \%parseTokens, $case_sensitive, scalar(@braceStack))) && do {
 
 			my $brctoken = $part;
 			print STDERR "IRC ".$parserState->{inRubyClass}."\n" if ($rubyDebug || $parseDebug);
@@ -4233,7 +4275,11 @@
 
 			my $oldParsedParamParse = $parserState->{parsedParamParse};
 			print STDERR "LEFT BRACE: CASE 30\n" if ($liteDebug);
-			    if ($parserState->{onlyComments} && !$parserState->{inComment} && !$parserState->{inInlineComment} && !$parserState->{inChar} && !$inRegexp && !scalar(@parserStack) && !$parserState->{INIF} && !$tempInIf) {
+			    if ($lang eq "applescript" && $pushParserStateAtBrace) {
+				$pushParserStateAtBrace = 0;
+				$pushParserStateAfterToken = 1;
+			    }
+			    if ($parserState->{onlyComments} && !$parserState->{inComment} && !$parserState->{inInlineComment} && !$parserState->{inChar} && !$inRegexp && !scalar(@parserStack) && !$parserState->{INIF} && !$tempInIf && ($lang ne "applescript")) {
 				print STDERR "BAILING NOW\n" if ($externCDebug);
 				$continue_no_return = 1;
 				print STDERR "CONTINUE -> 0 [NORETURN]\n" if ($parseDebug || $cppDebug || $macroDebug || $localDebug || $continueDebug);
@@ -4244,7 +4290,7 @@
 				print STDERR "PUSHING \"$parsedParam\" onto parsed parameters list ()\n" if ($parseDebug || $asDebug);
 				$parsedParam = "";
 			    }
-			    if ($parserState->{onlyComments} && !$parserState->{inComment} && !$parserState->{inInlineComment} && !$parserState->{inChar} && !$inRegexp && scalar(@parserStack)) {
+			    if ($parserState->{onlyComments} && !$parserState->{inComment} && !$parserState->{inInlineComment} && !$parserState->{inChar} && !$inRegexp && scalar(@parserStack) && $lang ne "applescript") {
 				# Somebody put in a brace in the middle of
 				# a class or else we're seeing ObjC private
 				# class bits.  Either way, throw away the
@@ -4342,7 +4388,7 @@
 			    }
 			    last SWITCH;
 			};
-		((casecmp($part, $parseTokens{rbrace}, $case_sensitive) || $parserState->{inrbraceargument}) && ($parserState->{pendingBracedParameters} != 2) && ($lang ne "perl" || !($parserState->{inTemplate} || $inRegexp || $leavingRegexp))) && do {
+		(($parserState->isRightBrace($part, $lang, \%parseTokens, $case_sensitive) || $parserState->{inrbraceargument}) && ($parserState->{pendingBracedParameters} != 2) && ($lang ne "perl" || !($parserState->{inTemplate} || $inRegexp || $leavingRegexp))) && do {
 			# {Treat } within <> as ordinary character in Perl.
 			print STDERR "RIGHT BRACE: CASE 31\n" if ($liteDebug);
 			print STDERR "INBRACEARGUMENT: ".$parserState->{inrbraceargument}."\n" if ($parserStateInsertDebug);
@@ -4424,6 +4470,11 @@
 							# the brace.
 							print STDERR "CONTINUE -> 0 [1aOutOfBraces]\n" if ($parseDebug || $cppDebug || $macroDebug || $localDebug || $continueDebug);
 							$continue = 0;
+						} elsif ($lang eq "applescript" && (scalar(@braceStack)-$parserState->{initbsCount}) == 1) {
+							# AppleScript allows nested classes and does not have a semicolon to
+							# indicate the point at which we should stop parsing a class.
+							print STDERR "Terminating nested class at newline.\n" if ($localDebug || $parseDebug || $asDebug); # @@@
+							$parserState->{declarationEndsAtNewLine} = 1;
 						}
 					}
 					if ($parserState->{noInsert} && scalar(@parserStack)) {
@@ -4672,11 +4723,13 @@
 				$parserState->{pendingBracedParameters} = 1;
 			}
 
+			print STDERR "INCLASSCHECK AFTERNL: ".$parserState->{afterNL}."\n" if ($parseDebug);
+
 			my $localclasstype = $1;
 			if ($part =~ /^\@/) { $part =~ s/^\@//s; }
-			if (!(scalar(@braceStack)-$parserState->{initbsCount})) {
-			    if (!($parserState->{inString} || $parserState->{inComment} || $parserState->{inInlineComment} || $parserState->{inChar})) {
-				print STDERR "ITISACLASS\n" if ($localDebug);
+			if ((($lang eq "applescript") && $parserState->{afterNL}) || (($lang ne "applescript") && !(scalar(@braceStack)-$parserState->{initbsCount}))) {
+			    if (!($parserState->{inString} || $parserState->{inComment} || $parserState->{inInlineComment} || ($parserState->{inChar} && $lang ne "applescript"))) {
+				print STDERR "ITISACLASS\n" if ($localDebug || $classDebug);
 				if (!length($parserState->{sodclass}) && !$parserState->{inTypedef}) {
 					print STDERR "GOOD.\n" if ($localDebug);
 					$parserState->{inClass} = 1;
@@ -4766,6 +4819,8 @@
 					$HeaderDoc::lang = $lang;
 					$HeaderDoc::sublang = $sublang;
 
+					# print STDERR "ELSE CASE: $lang $sublang\n";
+
 					# ($parseTokens{sotemplate}, $parseTokens{eotemplate}, $parseTokens{operator}, $parseTokens{soc}, $parseTokens{eoc}, $parseTokens{ilc}, $parseTokens{ilc_b}, $parseTokens{sofunction},
 						# $parseTokens{soprocedure}, $parseTokens{sopreproc}, $parseTokens{lbrace}, $parseTokens{rbrace}, $parseTokens{unionname}, $parseTokens{structname},
 						# $parseTokens{enumname},
@@ -4797,6 +4852,8 @@
 
 			    		last SWITCH;
 				}
+			    } else {
+				print STDERR "STR: ".$parserState->{inString}." COM: ".$parserState->{inComment}." ILC: ".$parserState->{inInlineComment}." CHAR: ".$parserState->{inChar}." LANG: ".$lang."\n";
 			    }
 			}
 		};
@@ -5910,6 +5967,29 @@
 			print STDERR "parserState pushed onto stack[token]\n" if ($parserStackDebug);
 			print STDERR "Last tree node set to $treeCur [11]\n" if ($parserStateInsertDebug);
 			$parserState->{lastTreeNode} = $treeCur;
+			if ($lang eq "applescript") {
+				# AppleScript needs a little help because functions can contain other things.
+				if (!$parserState->{lastDisplayNode}) {
+					$parserState->{lastDisplayNode} = $treeCur;
+				}
+				if (!$treeTop->{lastDisplayNode}) {
+					$treeTop->{lastDisplayNode} = $treeCur;
+				}
+				if (!$parserState->{lastDisplayNode}) {
+					$parserState->{lastDisplayNode} = $treeCur;
+				}
+				if (!$treeTop->{lastDisplayNode}) {
+					$treeTop->{lastDisplayNode} = $treeCur;
+				}
+
+				# print STDERR "CUR: $treeCur\n";
+				# print STDERR "FOR PS: $parserState\n";
+				# $treeCur->dbprint();
+				# print STDERR "TOP:\n";
+				# $treeTop->dbprint();
+				# print STDERR "SET TN: $treeTop\n";
+				# print STDERR "TTLDN: ".$treeTop->{lastDisplayNode}."\n";
+			}
 			$curline = "";
 			$parserState->{storeDec} = $declaration;
 			$parserState->{freezereturn} = 1;
@@ -5948,10 +6028,9 @@
 
 		# if (casecmp($part, $parseTokens{lbrace}, $case_sensitive)) 
 
-		print STDERR "check: ".$parserState->isLeftBrace($part, $lang, $parseTokens{lbrace}, $parseTokens{lbraceunconditionalre}, $parseTokens{lbraceconditionalre}, $parseTokens{classisbrace}, $parseTokens{functionisbrace}, $case_sensitive, scalar(@braceStack))."\n" if ($rubyDebug || $parseDebug);
+		print STDERR "check: ".$parserState->isLeftBrace($part, $lang, \%parseTokens, $case_sensitive, scalar(@braceStack))."\n" if ($rubyDebug || $parseDebug || $HeaderDoc::AppleScriptDebug);
 
-		if ($parserState->isLeftBrace($part, $lang, $parseTokens{lbrace}, $parseTokens{lbraceunconditionalre}, $parseTokens{lbraceconditionalre},
-		    $parseTokens{classisbrace}, $parseTokens{functionisbrace}, $case_sensitive, scalar(@braceStack))) {
+		if ($parserState->isLeftBrace($part, $lang, \%parseTokens, $case_sensitive, scalar(@braceStack))) {
 			if ($part =~ /[\n\r]/) { $parserState->{inRubyClass} = 2; }
 			$parserState->{ISFORWARDDECLARATION} = 0;
 
@@ -5995,7 +6074,7 @@
 			if ($tok =~ /\S/) {
 				print STDERR "parserState: PS IS $parserState\n" if ($parserStackDebug);
 				print STDERR "parserState: NOT WHITESPACE : ".$parserState->{hollow}." -> $treeCur\n" if ($parserStackDebug);
-				if (!casecmp($tok, $parseTokens{rbrace}, $case_sensitive) && $part !~ /\)/) {
+				if (!$parserState->isRightBrace($tok, $lang, \%parseTokens, $case_sensitive) && $part !~ /\)/) {
 					# $parserState->{hollow} = $treeCur;
 					$parserState->setHollowWithLineNumbers($treeCur, $fileoffset, $inputCounter);
 					# $HeaderDoc::curParserState = $parserState;
@@ -6017,7 +6096,7 @@
 			if ($tok =~ /\S/) {
 				print STDERR "parserState: PS IS $parserState\n" if ($parserStackDebug);
 				print STDERR "parserState: NOT WHITESPACE : ".$parserState->{hollow}." -> $treeCur\n" if ($parserStackDebug);
-				if (!casecmp($tok, $parseTokens{rbrace}, $case_sensitive) && $part !~ /\)/) {
+				if (!$parserState->isRightBrace($tok, $lang, \%parseTokens, $case_sensitive) && $part !~ /\)/) {
 					$parserState->setHollowWithLineNumbers($treeCur, $fileoffset, $inputCounter);
 					# $HeaderDoc::curParserState = $parserState;
 					print STDERR "parserState: WILL INSERT STATE $parserState (HOLLOW-AUTO-2) AT TOKEN \"$part\"/\"".$treeCur->token()."\"\n" if ($parserStackDebug);
@@ -6330,6 +6409,10 @@
 	$parserState->{classtype} = "class";
 	print "SETTING sodtype TO $sodtype\n" if ($forcedebug);
     }
+    if ($lang eq "applescript" && $parserState->{sodclass} eq "class") {
+	$sodclass = "script";
+	$parserState->{sodclass} = "script";
+    }
 
     # AppleScript supports multi-word names, but does not support
     # types.
@@ -7233,9 +7316,30 @@
 	
     }
 
+    # print STDERR "SODCLASS: $sodclass SODNAME: $sodname SODTYPE: $sodtype LANG: $sublang\n";
+
     my $memberOfClass = "";
+    my $origsodname = $sodname;
     if ($sodclass eq "function" && $parserState->{isConstructor} && $lang eq "tcl") {
 	$memberOfClass = $sodname;
+	print STDERR "MEMBER OF CLASS: $memberOfClass\n" if ($localDebug || $forcedebug);
+    } elsif ($sublang eq "javascript" && $sodclass eq "variable" && $sodname =~ s/^(\w+(?:\.\w+)*)\s*\.\s*prototype\s*\.\s*//s) {
+	my $headerobj = $HeaderDoc::headerObject;
+	my $possible_class = $1;
+	my $temp = $headerobj->findClass($possible_class);
+
+    print STDERR "Checking for class \"$possible_class\"\n" if ($localDebug || $forcedebug);
+
+	# Don't throw away the class part unless we've actually seen this class.
+	if ($temp) {
+		$memberOfClass = $possible_class;
+		print STDERR "MEMBER OF CLASS: $memberOfClass\n" if ($localDebug || $forcedebug);
+		changeAllMatching(\@nameObjects, "NAME", "$origsodname", "NAME", "$sodname", 0);
+		changeAllMatching(\@nameObjects, "TYPE", "variable", "TYPE", "function", 0);
+		changeAllMatching(\@nameObjects, "TYPE", "variable", "POSSTYPES", "function constant variable", 0);
+	} else {
+		$sodname = $origsodname;
+	}
     } elsif ($sodclass eq "function" && $sodtype =~ /(\w+)\s*::\s*$/) {
 	$memberOfClass = $1;
 	print STDERR "MEMBER OF CLASS: $memberOfClass\n" if ($localDebug || $forcedebug);
@@ -7255,6 +7359,14 @@
     changeAllMatching(\@nameObjects, "TYPE", "constant", "POSSTYPES", "constant variable", 0);
     changeAllMatching(\@nameObjects, "TYPE", "variable", "POSSTYPES", "constant variable", 0);
 
+    if ($sublang eq "javascript" && $sodclass eq "function") {
+        $posstypes = "function method class";
+	    changeAll(\@nameObjects, "POSSTYPES", $posstypes, 0); # may be no-op.
+    } elsif ($lang eq "applescript" && $sodclass eq "function") {
+        $posstypes = "function method ".$parserState->{classtype};
+	    changeAll(\@nameObjects, "POSSTYPES", $posstypes, 0); # may be no-op.
+    }
+
 	# print STDERR "ATEND PS $parserState HAS ARGS: ".$parserState->{cppMacroHasArgs}."\n";
 
     # We're outta here.
@@ -9150,6 +9262,18 @@
 				warn("NL: \"$namelist\"\n");
 				warn("PT: \"$posstypes\"\n");
 			}
+		} elsif ($HeaderDoc::ignore_apiowner_names == 2 && length($outername) && !$curObj->isBlock) {
+			if ($localDebug || $nameDebug) {
+				print STDERR "CURNAME CHANGED FROM $curname -> $outername\n";
+				print STDERR "CURNAME_EXTENDED CHANGED FROM $curname_extended -> $outername\n";
+			}
+			$curname = $outername;
+			$curname_extended = $outername;
+		}
+		if ($localDebug || $nameDebug) {
+			print STDERR "CURNAME: $curname\n";
+			print STDERR "OUTERNAME: $outername\n";
+			print STDERR "IGNORE: ".$HeaderDoc::ignore_apiowner_names."\n";
 		}
 
 		if ($outername eq "") {
@@ -12104,11 +12228,13 @@
     } elsif ($lang eq "java") {
 		$HeaderDoc::AccessControlState = "package-private";
     } elsif ($lang eq "C") {
-	if ($parserState->{classIsObjC} || ($parserState->{lang} eq "IDL" && $HeaderDoc::idl_language eq "occ")) {
+	if ($parserState->{classIsObjC} || ($parserState->{sublang} eq "IDL" && $HeaderDoc::idl_language eq "occ")) {
 		$HeaderDoc::AccessControlState = "private";
 		if ($parserState->{inProtocol}) {
 			$HeaderDoc::OptionalOrRequired = "\@required"; # The default in Objective C
 		}
+        } elsif ($parserState->{sublang} eq "IDL" && ($HeaderDoc::idl_language eq "idl" || $HeaderDoc::idl_language eq "javascript" || $HeaderDoc::idl_language eq "js")) {
+		$HeaderDoc::AccessControlState = "public";
 	} else {
 		$HeaderDoc::AccessControlState = "protected";
 	}
diff -rNu headerdoc-8.9.14/Modules/HeaderDoc/DBLookup.pm headerdoc-8.9.20/Modules/HeaderDoc/DBLookup.pm
--- headerdoc-8.9.14/Modules/HeaderDoc/DBLookup.pm	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/Modules/HeaderDoc/DBLookup.pm	1969-12-31 16:00:00.000000000 -0800
@@ -1,206 +0,0 @@
-#! /usr/bin/perl -w
-#
-# Class name: DBLookup
-# Synopsis: Encapsulates the look-up tables and routines to get info 
-#           from database output. Since we need only one of these DBLookups
-#           we implement only class methods
-#
-# Last Updated: $Date: 2011/02/18 19:02:57 $
-# 
-# Copyright (c) 1999-2004 Apple Computer, Inc.  All rights reserved.
-#
-# @APPLE_LICENSE_HEADER_START@
-#
-# This file contains Original Code and/or Modifications of Original Code
-# as defined in and that are subject to the Apple Public Source License
-# Version 2.0 (the 'License'). You may not use this file except in
-# compliance with the License. Please obtain a copy of the License at
-# http://www.opensource.apple.com/apsl/ and read it before using this
-# file.
-# 
-# The Original Code and all software distributed under the License are
-# distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-# EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-# INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
-# Please see the License for the specific language governing rights and
-# limitations under the License.
-#
-# @APPLE_LICENSE_HEADER_END@
-#
-######################################################################
-
-
-# /*! @header
-#     @abstract
-#         <code>DBLookup</code> package file.
-#     @discussion
-#         This module is slated to be removed in future releases.
-#         It was used for special purpose dumps of the documentation,
-#         and is no longer needed.   If you rely on this module,
-#         please send a note to dgatwood\@apple.com and we can
-#         reconsider its future.
-#     @indexgroup HeaderDoc Miscellaneous Helpers
-#  */
-# /*!
-#     @abstract
-#         Deprecated and defunct.
-#     @discussion
-#         File for <code>DBLookup</code> class.
-#
-#         This module is slated to be removed in future releases.
-#         It was used for special purpose dumps of the documentation,
-#         and is no longer needed.  Further, the command-line flags
-#         that took advantage of this module have been reused for
-#         other things.
-#
-#         If you rely on this module, please send a note to
-#         dgatwood\@apple.com and we can reconsider its future.
-#  */
-package HeaderDoc::DBLookup;
-
-use strict;
-use vars qw($VERSION @ISA);
-
-# /*!
-#     @abstract
-#         The revision control revision number for this module.
-#     @discussion
-#         In the git repository, contains the number of seconds since
-#         January 1, 1970.
-#  */
-$HeaderDoc::DBLookup::VERSION = '$Revision: 1298084577 $';
-
-################ Portability ###################################
-my $isMacOS;
-my $pathSeparator;
-if ($^O =~ /MacOS/i) {
-	$pathSeparator = ":";
-	$isMacOS = 1;
-} else {
-	$pathSeparator = "/";
-	$isMacOS = 0;
-}
-
-################ General Constants ###################################
-my $debugging = 0;
-
-# my $theTime = time();
-# my ($sec, $min, $hour, $dom, $moy, $year, @rest);
-# ($sec, $min, $hour, $dom, $moy, $year, @rest) = localtime($theTime);
-# $moy++;
-# $year += 1900;
-# my $dateStamp = "$moy/$dom/$year";
-######################################################################
-
-################ Lookup Hashes ###################################
-my %datatypeNameToIDHash;
-my %functionNameToIDHash;
-######################################################################
-
-
-# /*! @abstract
-#         Deprecated.
-#  */
-sub loadUsingFolderAndFiles {
-    my($class) = shift;
-    my $folder = shift;
-	my $functionFilename = shift;
-	my $typesFilename = shift;
-	my $enumsFilename = shift;
-
-    if (ref $class)  { die "Class method called as object method" };
-    
-	###################### Read in lookup table of functionID to name ######################
-	my $functionTable = $folder.$pathSeparator.$functionFilename;
-	open(FUNCIDS, "<$functionTable") || die "Can't open $functionTable.\n";
-	my @funcIDLines = <FUNCIDS>;
-	close FUNCIDS;
-	foreach my $line (@funcIDLines) {
-	    if ($line =~/^#/) {next;};
-	    chomp $line;
-	    my ($funcID, $funcName);
-	    ($funcID, $funcName) = split (/\t/, $line);
-	    if (length($funcID)) {
-	        $functionNameToIDHash{$funcName} = $funcID;
-	    }
-	}
-	undef @funcIDLines;
-	
-	###################### Read in lookup table of typeID to name ######################
-	my $typeTable = $folder.$pathSeparator.$typesFilename;
-	open(TYPEIDS, "<$typeTable") || die "Can't open $typeTable.\n";
-	my @typeIDLines = <TYPEIDS>;
-	close TYPEIDS;
-	foreach my $line (@typeIDLines) {
-	    if ($line =~/^#/) {next;};
-	    chomp $line;
-	    my ($typeID, $typeName);
-	    ($typeID, $typeName) = split (/\t/, $line);
-	    if (length($typeID)) {
-	        $datatypeNameToIDHash{$typeName} = $typeID;
-	    }
-	}
-	undef @typeIDLines;
-	
-	###################### Read in lookup table of enumID to name ######################
-	##### Add this to the types lookup since enums are often identified by the name of their first constant #####
-	my $enumTable = $folder.$pathSeparator.$enumsFilename;
-	open(ENUMIDS, "<$enumTable") || die "Can't open $enumTable.\n";
-	my @enumIDLines = <ENUMIDS>;
-	close ENUMIDS;
-	foreach my $line (@enumIDLines) {
-	    if ($line =~/^#/) {next;};
-	    chomp $line;
-	    my ($enumID, $enumName);
-	    ($enumID, $enumName) = split (/\t/, $line);
-	    if (length($enumID)) {
-	        $datatypeNameToIDHash{$enumName} = $enumID;
-	    }
-	}
-	undef @enumIDLines;
-}
-
-# /*! @abstract
-#         Deprecated.
-#  */
-sub dataTypeNameToIDHash {
-    return %datatypeNameToIDHash;
-}
-
-# /*! @abstract
-#         Deprecated.
-#  */
-sub functionNameToIDHash {
-    return %functionNameToIDHash;
-}
-
-# /*! @abstract
-#         Deprecated.
-#  */
-sub functionIDForName {
-    my $class = shift;
-    my $name = shift;
-    
-    if (exists ($functionNameToIDHash{$name})) {
-		return $functionNameToIDHash{$name};
-    } else {
-        return "UNKNOWN_ID";
-    }
-}
-
-# /*! @abstract
-#         Deprecated.
-#  */
-sub typeIDForName {
-    my $class = shift;
-    my $name = shift;
-    
-    if (exists ($datatypeNameToIDHash{$name})) {
-		return $datatypeNameToIDHash{$name};
-    } else {
-        return "UNKNOWN_ID";
-    }
-}
-
-1;
diff -rNu headerdoc-8.9.14/Modules/HeaderDoc/HeaderElement.pm headerdoc-8.9.20/Modules/HeaderDoc/HeaderElement.pm
--- headerdoc-8.9.14/Modules/HeaderDoc/HeaderElement.pm	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/Modules/HeaderDoc/HeaderElement.pm	2013-05-14 15:29:49.000000000 -0700
@@ -3,7 +3,7 @@
 # Class name: HeaderElement
 # Synopsis: Root class for Function, Typedef, Constant, etc. -- used by HeaderDoc.
 #
-# Last Updated: $Date: 2012/06/29 16:13:19 $
+# Last Updated: $Date: 2013/05/14 15:29:11 $
 #
 # Copyright (c) 1999-2004 Apple Computer, Inc.  All rights reserved.
 #
@@ -157,6 +157,8 @@
 #     @var FIRSTCONSTNAME
 #         The first constant name within an enumeration.  Used as the name of
 #         an anonymous enumeration if no name is specified in the comment.
+#     @var FORCENAME
+#         The contents of an \@name tag, which overrides any name obtained in any other way.
 #     @var FULLPATH
 #         The filename containing this declaration (with leading parts left intact).
 #     @var FUNCORMETHOD
@@ -361,7 +363,7 @@
 #         In the git repository, contains the number of seconds since
 #         January 1, 1970.
 #  */
-$HeaderDoc::HeaderElement::VERSION = '$Revision: 1341011599 $';
+$HeaderDoc::HeaderElement::VERSION = '$Revision: 1368570551 $';
 
 # /*!
 #     @abstract
@@ -1129,7 +1131,7 @@
 
 	print STDERR "NAMESET: $self -> $name\n" if ($localDebug);
 
-	if (!($class eq "HeaderDoc::Header") && ($oldname && length($oldname))) {
+	if (!($class eq "HeaderDoc::Header") && ($oldname && length($oldname)) && !length($self->{FORCENAME})) {
 		# Don't warn for headers, as they always change if you add
 		# text after @header.  Also, don't warn if the new name
 		# contains the entire old name, to avoid warnings for
@@ -1156,7 +1158,9 @@
 		} elsif (($class eq "HeaderDoc::CPPClass" || $class =~ /^HeaderDoc::ObjC/o) && $name =~ /:/o) {
 			warn("$fullpath:$linenum: warning: Class name contains colon, which is probably not what you want.\n");
 		}
-	}
+	} elsif (length($self->{FORCENAME})) {
+        $name = $self->{FORCENAME};
+    }
 
 	$name =~ s/\n$//sgo;
 	$name =~ s/\s$//sgo;
@@ -4981,6 +4985,7 @@
 
     if ($stdstyles) {
 	# Most stuff is 10 pt.
+	$css .= "body {border: 0px; margin: 0px;}";
 	$css .= "div {font-size: 10pt; text-decoration: none; font-family: lucida grande, geneva, helvetica, arial, sans-serif; color: #000000;}";
 	$css .= "td {font-size: 10pt; text-decoration: none; font-family: lucida grande, geneva, helvetica, arial, sans-serif; color: #000000;}";
 
@@ -7650,7 +7655,7 @@
 		$top_level_field = validTag($fieldname, 1);
 
 		if ($top_level_field && $seen_top_level_field && ($fieldname !~ /const(ant)?/) &&
-		    ($fieldname !~ /var/) && (!$self->isBlock() || $fieldname ne "define")) {
+		    ($fieldname !~ /var/) && (!$self->isBlock() || $fieldname ne "define") && $fieldname ne "name") {
 			# We've seen more than one top level field.
 
 			$field =~ s/^(\w+)(\s)//s;
@@ -8130,6 +8135,7 @@
 				print STDERR "TLF: $field\n" if ($localDebug);
 
 				my $pattern = "";
+
 				if ($class =~ /HeaderDoc\:\:PDefine/ && $field =~ s/^(availabilitymacro)(\s+|$)/$2/sio) {
 					$self->isAvailabilityMacro(1);
 					$keepname = 1;
@@ -8169,6 +8175,7 @@
 
 				my ($name, $abstract_or_disc, $namedisc) = getAPINameAndDisc($field, $self->lang(), $pattern);
 				print STDERR "FIELD: $field\nNAME: $name AOD: $abstract_or_disc ND: $namedisc" if ($localDebug);
+				if ($fieldname eq "name") {$self->{FORCENAME} = $name; print STDERR "FORCED NAME TO \"$name\"\n"};
 
 				print STDERR "KEEPNAME: $keepname\n" if ($localDebug);
 
diff -rNu headerdoc-8.9.14/Modules/HeaderDoc/LineRange.pm headerdoc-8.9.20/Modules/HeaderDoc/LineRange.pm
--- headerdoc-8.9.14/Modules/HeaderDoc/LineRange.pm	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/Modules/HeaderDoc/LineRange.pm	2014-02-14 18:03:01.000000000 -0800
@@ -3,7 +3,7 @@
 # Class name: LineRange
 # Synopsis: Helper code for availability (line ranges)
 #
-# Last Updated: $Date: 2011/02/18 19:02:58 $
+# Last Updated: $Date: 2014/02/14 17:55:29 $
 # 
 # Copyright (c) 2006 Apple Computer, Inc.  All rights reserved.
 #
@@ -63,7 +63,6 @@
     }
 }
 use HeaderDoc::HeaderElement;
-use HeaderDoc::DBLookup;
 use HeaderDoc::Utilities qw(findRelativePath safeName printArray printHash sanitize);
 use File::Basename;
 use Cwd;
@@ -79,7 +78,7 @@
 #         In the git repository, contains the number of seconds since
 #         January 1, 1970.
 #  */
-$HeaderDoc::LineRange::VERSION = '$Revision: 1298084578 $';
+$HeaderDoc::LineRange::VERSION = '$Revision: 1392429329 $';
 
 # Inheritance
 # @ISA = qw(HeaderDoc::HeaderElement);
diff -rNu headerdoc-8.9.14/Modules/HeaderDoc/ParseTree.pm headerdoc-8.9.20/Modules/HeaderDoc/ParseTree.pm
--- headerdoc-8.9.14/Modules/HeaderDoc/ParseTree.pm	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/Modules/HeaderDoc/ParseTree.pm	2013-05-14 15:29:49.000000000 -0700
@@ -2,7 +2,7 @@
 #
 # Class name: 	ParseTree
 # Synopsis: 	Used by headerdoc2html to hold parse trees
-# Last Updated: $Date: 2012/04/05 16:29:36 $
+# Last Updated: $Date: 2013/05/14 15:29:11 $
 # 
 # Copyright (c) 1999-2004 Apple Computer, Inc.  All rights reserved.
 #
@@ -64,6 +64,14 @@
 #         The first child (descendant) node of this node.
 #     @var PARENT
 #         The parent node in the parse tree.
+#     @var lastDisplayNode
+#             The last node in the parse tree rooted at this node that
+#             should be displayed.  Used only in AppleScript, to hide
+#             content nested inside functions while still parsing them
+#             fully.  This is used for functions that are not inside
+#             scripts.  For functions that are inside a script statement,
+#             the <code>lastDisplayNode</code> in the parser state object
+#             is used instead.
 #
 #  @vargroup File information
 #     @var FILENAME
@@ -156,7 +164,7 @@
 
 use strict;
 use vars qw($VERSION @ISA);
-use HeaderDoc::Utilities qw(isKeyword parseTokens stringToFields casecmp emptyHDok complexAvailabilityToArray printHash validTag);
+use HeaderDoc::Utilities qw(isKeyword parseTokens stringToFields doxyTagFilter casecmp emptyHDok complexAvailabilityToArray printHash validTag);
 use HeaderDoc::BlockParse qw(blockParse nspaces);
 use Carp qw(cluck);
 
@@ -169,7 +177,7 @@
 #         In the git repository, contains the number of seconds since
 #         January 1, 1970.
 #  */
-$HeaderDoc::ParseTree::VERSION = '$Revision: 1333668576 $';
+$HeaderDoc::ParseTree::VERSION = '$Revision: 1368570551 $';
 ################ General Constants ###################################
 my $debugging = 0;
 
@@ -1476,7 +1484,7 @@
 
 			# @@@ DAG CHECK ME
 			# $string =~ s/^\s*\*\s*//mg;
-			my $fieldref = stringToFields($string, $self->fullpath, $self->linenum, $xmlmode, $lang, $sublang);
+			my $fieldref = stringToFields(doxyTagFilter($string), $self->fullpath, $self->linenum, $xmlmode, $lang, $sublang);
 			# print STDERR "APIOLIST AT INSERT IS $apiolist\n" if ($localDebug);
 			# foreach my $owner (@{$apiolist}) {
 			    # print STDERR "X POSSOWNER of $self: $owner\n" if ($localDebug);
@@ -1492,7 +1500,9 @@
 				# nested deeper than this is bogus (unless we hit a curly brace).
 				print STDERR "skipochildren -> 1 [1]" if ($localDebug);
 				$skipchildren = 1;
-				$next = $next->skipcurly($parseTokens{lbrace}, $ncurly); # nextTokenNoComments($parseTokens{soc}, $parseTokens{ilc}, $parseTokens{ilc_b}, 0, $enable_javadoc_comments);
+				if ($next) {
+					$next = $next->skipcurly($parseTokens{lbrace}, $ncurly); # nextTokenNoComments($parseTokens{soc}, $parseTokens{ilc}, $parseTokens{ilc_b}, 0, $enable_javadoc_comments);
+				}
 				if ($localDebug) {
 					print STDERR "NEXT IS $next (";
 					if ($next) {print STDERR $next->token(); }
@@ -1530,7 +1540,7 @@
 					}
 					# @@@ DAG CHECKME LEADING STARS
 					# $string =~ s/^\s*\*\s*//mg;
-					my $fieldref = stringToFields($string, $self->fullpath, $self->linenum, $xmlmode, $lang, $sublang);
+					my $fieldref = stringToFields(doxyTagFilter($string), $self->fullpath, $self->linenum, $xmlmode, $lang, $sublang);
 					# foreach my $owner (@{$apiolist}) {
 					    print STDERR "POSSOWNER of $self: $apiOwner\n" if ($localDebug);
 					    if ($apiOwner && $apiOwner->isAPIOwner()) {
@@ -1808,7 +1818,7 @@
 		      if ($string =~ /^\s*\@/o && validTag($tagstring, 0)) { # $string =~ /^\s*\@/o
 			print STDERR "COMMENTSTRING: $string\n" if ($localDebug);
 	
-			my $fieldref = stringToFields($string, $fullpath, $linenum, $xmlmode, $apio->lang(), $apio->sublang());
+			my $fieldref = stringToFields(doxyTagFilter($string), $fullpath, $linenum, $xmlmode, $apio->lang(), $apio->sublang());
 		# print STDERR "APIO: $apio\n";
 			foreach my $owner (@{$apiolist}) {
 			    my $copy = $fieldref;
@@ -1877,7 +1887,7 @@
 			my $fullpath = $apio->fullpath();
 			my $linenum = $apio->linenum();
 
-			my $fieldref = stringToFields($string, $fullpath, $linenum, $xmlmode, $apio->lang(), $apio->sublang());
+			my $fieldref = stringToFields(doxyTagFilter($string), $fullpath, $linenum, $xmlmode, $apio->lang(), $apio->sublang());
 			print STDERR "COMMENTSTRING: $string\n" if ($localDebug);
 			print STDERR "OWNERSTART\n" if ($localDebug);
 			foreach my $owner (@{$apiolist}) {
@@ -1979,7 +1989,7 @@
 			my $fullpath = $apio->fullpath();
 			my $linenum = $apio->linenum();
 
-			my $fieldref = stringToFields($string, $fullpath, $linenum, $xmlmode, $apio->lang(), $apio->sublang());
+			my $fieldref = stringToFields(doxyTagFilter($string), $fullpath, $linenum, $xmlmode, $apio->lang(), $apio->sublang());
 			print STDERR "COMMENTSTRING: $string\n" if ($localDebug);
 			foreach my $owner (@{$apiolist}) {
 				my $copy = $fieldref;
@@ -2011,7 +2021,7 @@
 }
 
 # THIS CODE USED TO PROCESS COMMENTS WHENEVER IT IS TIME.
-	      # my $fieldref = stringToFields($string, $fullpath, $linenum, $xmlmode, $lang, $sublang);
+	      # my $fieldref = stringToFields(doxyTagFilter($string), $fullpath, $linenum, $xmlmode, $lang, $sublang);
 	      # $apio->processComment($fieldref, 1, $self, $parseTokens{soc}, $parseTokens{ilc}, $parseTokens{ilc_b}, $self, $hashtreecur, $hashtreeroot);
 		# $apio->{APIREFSETUPDONE} = 0;
 
@@ -2326,9 +2336,14 @@
         # $typedefname, $varname, $constname, $structisbrace, $parseTokens{macronames});
 
     my $lastnode = undef;
+    my $lastDisplayNode = undef;
     my $parserState = $self->parserState();
     if ($parserState) {
 	$lastnode = $parserState->{lastTreeNode};
+	$lastDisplayNode = $parserState->{lastDisplayNode};
+    }
+    if ((!$lastDisplayNode) && $self->{lastDisplayNode}) {
+	$lastDisplayNode = $self->{lastDisplayNode};
     }
 
     # my ($sotemplate, $eotemplate, $operator, $parseTokens{soc}, $parseTokens{eoc}, $parseTokens{ilc}, $parseTokens{ilc_b}, $sofunction,
@@ -2351,9 +2366,10 @@
 	xmlmode => 1, newlen => 0, breakable => 0, inMacro => 0, inEnum => 0, seenEquals => 0,
 	lastKeyword => "", lastnstoken => "", lastTreeNode => $lastnode, lastTokenType => "",
 	spaceSinceLastToken => 0, inAttribute => 0, inRaises => 0, inTypeOf => 0,
-	drop_pdefine_contents => $drop_pdefine_contents, ASinName => 0);
+	drop_pdefine_contents => $drop_pdefine_contents, ASinName => 0, afteradvisoryspace => 0,
+	lastDisplayNode => $lastDisplayNode);
 
-    my ($retvalref, $junka, $junkb, $junkc, $junkd, $junke, $lastTokenType, $spaceSinceLastToken) = $self->colorTreeSub($ctstate);
+    my ($retvalref, $junka, $junkb, $junkc, $junkd, $junke, $lastTokenType, $spaceSinceLastToken, $junk_afteradvisoryspace) = $self->colorTreeSub($ctstate);
     my $retval = ${$retvalref};
 
     # my $retval = "";
@@ -2439,10 +2455,16 @@
     # colorizer goes here
 
     my $lastnode = undef;
+    my $lastDisplayNode = undef;
     my $parserState = $self->parserState();
     if ($parserState) {
 	$lastnode = $parserState->{lastTreeNode};
+	$lastDisplayNode = $parserState->{lastDisplayNode};
+    }
+    if ((!$lastDisplayNode) && $self->{lastDisplayNode}) {
+	$lastDisplayNode = $self->{lastDisplayNode};
     }
+    # print STDERR "TN: $self LTN: $lastnode LDN: $lastDisplayNode\n";
 
     # if ($lang eq "shell") {
 	# $keep_whitespace = 1;
@@ -2474,9 +2496,10 @@
 	xmlmode => 0, newlen => 0, breakable => 0, inMacro => 0, inEnum => 0, seenEquals => 0,
 	lastKeyword => "", lastnstoken => "", lastTreeNode => $lastnode, lastTokenType => "",
 	spaceSinceLastToken => 0, inAttribute => 0, inRaises => 0, inTypeOf => 0,
-	drop_pdefine_contents => $drop_pdefine_contents, ASinName => 0);
+	drop_pdefine_contents => $drop_pdefine_contents, ASinName => 0, afteradvisoryspace => 0,
+	lastDisplayNode => $lastDisplayNode);
 
-    my ($retvalref, $junka, $junkb, $junkc, $junkd, $junke, $lastTokenType, $spaceSinceLastToken) = $self->colorTreeSub($ctstate);
+    my ($retvalref, $junka, $junkb, $junkc, $junkd, $junke, $lastTokenType, $spaceSinceLastToken, $junk_afteradvisoryspace) = $self->colorTreeSub($ctstate);
     my $retval = ${$retvalref};
 
     # my $retval = "";
@@ -2831,6 +2854,21 @@
 }
 
 # /*!
+#     @abstract Prints the contents of a colorTreeSub state object.
+#  */
+sub dumpCTState
+{
+    my $ctstateref = shift;
+    my %ctstate = %{$ctstateref};
+
+    print STDERR "DUMPING CTSTATE:\n\n";
+    foreach my $key (keys %ctstate) {
+	print "        $key => ".$ctstate{$key}."\n";
+    }
+    print "\n\n";
+}
+
+# /*!
 #     @abstract
 #         Returns an HTML or XML representation of a parse tree/subtree.
 #     @param self
@@ -3013,19 +3051,50 @@
     my $tokenDebug = 0;
     my $codePathDebug = 0;
     my $rubyDebug = 0;
-
-    print STDERR "***** TOKEN: ".$self->{TOKEN}." *****\n" if ($codePathDebug || $localDebug);
-
-# print STDERR "IN COLORTREESUB\n";
+    my $tokenPrintDebug = 0;
+    my $advisorySpaceDebug = 0;
 
     my $continue = 1;
     my %ctstate = %{$ctstateref};
 
+    my $token = $self->{TOKEN};
+    my $ntoken = $self->nextpeek();
+
+    my $tokenname = $token;
+    if ($token eq "\n") { $tokenname = "[NEWLINE]"; }
+    elsif ($token eq "\r") { $tokenname = "[CARRIAGE RETURN]"; }
+    elsif (!length($token)) { $tokenname = "[EMPTY STRING]"; }
+    else { $tokenname = "\"".$tokenname."\""; }
+
+    my $ntokenname = $ntoken;
+    if ($ntoken eq "\n") { $ntokenname = "[NEWLINE]"; }
+    elsif ($ntoken eq "\r") { $ntokenname = "[CARRIAGE RETURN]"; }
+    elsif (!length($ntoken)) { $ntokenname = "[EMPTY STRING]"; }
+    else { $ntokenname = "\"".$ntokenname."\""; }
+
+    my $lastnstokenname = $ctstate{lastnstoken};
+    if ($ctstate{lastnstoken} eq "\n") { $lastnstokenname = "[NEWLINE]"; }
+    elsif ($ctstate{lastnstoken} eq "\r") { $lastnstokenname = "[CARRIAGE RETURN]"; }
+    elsif (!length($ctstate{lastnstoken})) { $lastnstokenname = "[EMPTY STRING]"; }
+    else { $lastnstokenname = "\"".$lastnstokenname."\""; }
+
+    print STDERR "***** TOKEN: ".$tokenname." *****\n" if ($codePathDebug || $localDebug || $tokenDebug || $tokenPrintDebug);
+
+
+
+
+
+# print STDERR "IN COLORTREESUB\n";
+
     if ($self == $ctstate{lastTreeNode}) {
 	print STDERR "Node is last node in tree.  Ending after this node.\n" if ($localDebug || $codePathDebug);
 	$continue = 0;
     }
 
+    dumpCTState(\%ctstate) if ($localDebug);
+
+    print STDERR "NEWLEN: ".$ctstate{newlen}."\n" if ($localDebug);
+
     my %parseTokens = %{$ctstate{parseTokensRef}};
     my %macroList = %{$parseTokens{macronames}};
     my $oldLastBrace = $ctstate{lastBrace};
@@ -3067,11 +3136,11 @@
     my $nextprespace = "";
     my $string = "";
     my $tailstring = "";
-    my $token = $self->{TOKEN};
     my $escapetoken = "";
     my ($case_sensitive, $keywordhashref) = $ctstate{apio}->keywords();
     my $tokennl = 0;
     if ($token =~ /^[\r\n]/o) { $tokennl = 1; }
+
     if (($token eq "\t" || $token =~ /^ +$/) && (!$ctstate{keep_whitespace})) { $token = " "; }
     if ($ctstate{inQuote} == 3) {
 	$keep_all_newlines = 1;
@@ -3081,6 +3150,21 @@
 	$ctstate{prespace} = "";
 	$nextprespace = "";
     }
+
+    if (length($token) && (!$tokennl)) {
+	if ($ctstate{afteradvisoryspace}) {
+		#  Remove a single space if we're after a newline that
+		#  got converted into a space
+		print STDERR "OLD AASTOKEN: \"$token\"\n" if ($localDebug || $advisorySpaceDebug || $codePathDebug);
+		$token =~ s/^ //;
+		$ctstate{afteradvisoryspace} = 0;
+		print STDERR "AASTOKEN NOW: \"$token\"\n" if ($localDebug || $advisorySpaceDebug || $codePathDebug);
+		print STDERR "AAS -> 0\n" if ($localDebug || $advisorySpaceDebug || $codePathDebug);
+	}
+    }
+
+    print "keep_all_newlines: $keep_all_newlines\n" if ($localDebug);
+
     my $tokenIsKeyword = isKeyword($token, $keywordhashref, $case_sensitive);
 
 print STDERR "TIK: $tokenIsKeyword\n" if ($localDebug);
@@ -3092,7 +3176,6 @@
     print STDERR "IQ is ".$ctstate{inQuote}."\n" if ($rubyDebug || $colorDebug);
 
     my $ctoken = $self->childpeeknc($parseTokens{soc}, $parseTokens{ilc}, $parseTokens{ilc_b});
-    my $ntoken = $self->nextpeek();
     my $ntokennc = $self->nextpeeknc($parseTokens{soc}, $parseTokens{ilc}, $parseTokens{ilc_b});
     my $nntokennc = $self->nextnextpeeknc($parseTokens{soc}, $parseTokens{ilc}, $parseTokens{ilc_b});
     my $tokenType = undef;
@@ -3122,21 +3205,7 @@
 	$ctstate{tokenAccum} = "";
     }
 
-    if ($treeDebug || $localDebug || $codePathDebug) {
-    	my $tokenname = $token;
-    	if ($token eq "\n") { $tokenname = "[NEWLINE]"; }
-    	elsif ($token eq "\r") { $tokenname = "[CARRIAGE RETURN]"; }
-
-    	my $ntokenname = $ntoken;
-    	if ($ntoken eq "\n") { $ntokenname = "[NEWLINE]"; }
-    	elsif ($ntoken eq "\r") { $ntokenname = "[CARRIAGE RETURN]"; }
-
-    	my $lastnstokenname = $ctstate{lastnstoken};
-    	if ($ctstate{lastnstoken} eq "\n") { $lastnstokenname = "[NEWLINE]"; }
-    	elsif ($ctstate{lastnstoken} eq "\r") { $lastnstokenname = "[CARRIAGE RETURN]"; }
-
-	print STDERR "TOKEN: $tokenname NTOKEN: $ntokenname LASTNSTOKEN: $lastnstokenname IC: ".$ctstate{inComment}."\n" if ($treeDebug || $localDebug || $codePathDebug);
-    }
+    print STDERR "TOKEN: $tokenname NTOKEN: $ntokenname LASTNSTOKEN: $lastnstokenname IC: ".$ctstate{inComment}."\n" if ($treeDebug || $localDebug || $codePathDebug);
     print STDERR "OCC: ".$ctstate{inObjCMethod}."\n" if ($colorDebug || $localDebug);
     print STDERR "HIDDEN: $hidden\n" if ($localDebug);
 
@@ -3212,7 +3281,7 @@
 print STDERR "oldInMacro: $oldInMacro\noldInComment: $oldInComment\n" if ($localDebug);
 
     # print STDERR "TOKEN: $token\n" if ($localDebug);
-    print STDERR "TOKEN: $token ASINNAME: ".$ctstate{ASinName}."\n" if ($localDebug);
+    print STDERR "TOKEN: $tokenname ASINNAME: ".$ctstate{ASinName}."\n" if ($localDebug);
 
     if ($ctstate{inEnum}) {
 	# If we see this, anything nested below here is clearly not a union.
@@ -3329,9 +3398,14 @@
 		$leavingComment = 1;
 		$ctstate{inComment} = 0;
 	} elsif ($tokennl && ($ntoken !~ /^[\r\n]/o || $ctstate{keep_whitespace} || $keep_all_newlines)) {
+		my $ignored_newline = 1;
+
+		print STDERR "    TOKENNL (KW: ".$ctstate{keep_whitespace}.", KAN: $keep_all_newlines)\n" if ($localDebug || $codePathDebug);
+
 		if ($ctstate{ASinName}) {
 			$ctstate{ASinName} = 0;
 			print STDERR "ASinName -> 0 [4]\n" if ($localDebug);
+			$ignored_newline = 0;
 		}
 		if ($ctstate{inComment} == 2) {
 			print STDERR "    EOL INCOMMENT: END ILCOMMENT [1]\n" if ($localDebug || $codePathDebug);
@@ -3346,21 +3420,27 @@
 			$mustbreak = 1;
 			# $token = "";
 			$drop = 1;
+			$ignored_newline = 0;
 		} elsif ($ctstate{inMacro} || $keep_all_newlines) {
 			print STDERR "    EOL INMACRO\n" if ($localDebug || $codePathDebug);
 			$mustbreak = 1;
 			$ctstate{newlen} = 0;
+			$ignored_newline = 0;
 		} elsif ($ctstate{inComment}) {
 			print STDERR "    EOL INCOMMENT\n" if ($localDebug || $codePathDebug);
 			$mustbreak = 1;
 			$ctstate{newlen} = 0;
 			# $token = "";
 			$drop = 1;
+			$ignored_newline = 0;
+		}
+
+		if (!$ignored_newline) {
+			$ctstate{breakable} = 0;
+			$nextbreakable = 0;
+			# $nextprespace = nspaces(4 * $ctstate{depth});
+			$ctstate{newlen} = 0;
 		}
-		$ctstate{breakable} = 0;
-		$nextbreakable = 0;
-		# $nextprespace = nspaces(4 * $ctstate{depth});
-		$ctstate{newlen} = 0;
 	# } elsif ($ntoken =~ /^[\r\n]/o) {
 		# print STDERR "    NEXT TOKEN IS NLCR\n" if ($localDebug || $codePathDebug);
 		# $ctstate{breakable} = 0;
@@ -3521,6 +3601,7 @@
 		$tokenType = "function";
 	} elsif ($token eq ":" && $ctoken) {
 		# Don't indent Objective-C method parts so far.
+		print STDERR "    COLON AND CTOKEN\n" if ($localDebug || $codePathDebug);
 		$ctstate{depth} = $ctstate{depth} - 1; # We'll change it back before the next token.
 	} elsif ($ntokennc eq "(" && !$ctstate{seenEquals} && !$ctstate{inAttribute} && !$ctstate{inRaises} && !$ctstate{inTypeOf}) {
 		# Upcoming parenthesis handling
@@ -3575,17 +3656,22 @@
 			$nextbreakable = 3;
 		}
 	} elsif (($ctstate{lang} eq "python") && ($token eq "\"\"\"")) {
+		print STDERR "    IRQ STARTEND\n" if ($localDebug || $codePathDebug);
 		if ($ctstate{inQuote}) { $ctstate{inQuote} = 0; }
 		else { $ctstate{inQuote} = 3; }
 	} elsif ($ruby && ($token eq "%{" || $token eq "%Q{")) {
+		print STDERR "    IRQ START[1]\n" if ($localDebug || $codePathDebug);
 		$ctstate{inQuote} = 3; $ctstate{inRubyQuote} = 1;
 	} elsif ($ruby && ($token eq "%/")) {
+		print STDERR "    IRQ PERCENTSLASH\n" if ($localDebug || $codePathDebug);
 		$ctstate{inQuote} = 3; $ctstate{inRubyQuote} = 1;
 	} elsif ($ruby && ($token eq "<<")) {
+		print STDERR "    IRQ START[2]\n" if ($localDebug || $codePathDebug);
 		$ctstate{inQuote} = 3;
 		$ctstate{inRubyQuote} = 2; # quote coloring starts after next token.
 		print STDERR "IRQ -> 2\n" if ($rubyDebug || $colorDebug);
 	} elsif ($ruby && ($ctstate{inRubyQuote} == 2)) {
+		print STDERR "    IRQ\n" if ($localDebug || $codePathDebug);
 		$ctstate{inRubyQuote} = 1;
 		print STDERR "IRQ 2 -> 1\n" if ($rubyDebug || $colorDebug);
 	} elsif ($token =~ /^\"/o && !$ctstate{inRubyQuote}) {
@@ -3642,11 +3728,13 @@
 			}
 		}
 	} elsif ($ctstate{prespace} ne "" && ($token =~ /^\)/o || casecmp($token, $parseTokens{rbrace}, $case_sensitive))) {
+		print "    CPAREN OR RBRACE\n" if ($codePathDebug);
 		print STDERR "PS: ".length($ctstate{prespace})." -> " if ($psDebug);
 		if (!$ctstate{keep_whitespace}) { $ctstate{prespace} = nspaces(4 * ($ctstate{depth}-1)); }
 		print STDERR length($ctstate{prespace})."\n" if ($psDebug);
 		$mustbreak = 2;
 	} elsif (casecmp($token, $parseTokens{rbrace}, $case_sensitive)) {
+		print "    RBRACE\n" if ($codePathDebug);
 		if (!$ctstate{keep_whitespace}) { $ctstate{prespace} = nspaces(4 * ($ctstate{depth}-1)); }
 		print STDERR length($ctstate{prespace})."\n" if ($psDebug);
 		$mustbreak = 2;
@@ -3762,11 +3850,15 @@
 print STDERR "TESTTYPE: $tokenType\n" if ($localDebug);
 
     if ($ctstate{inObjCMethod}) {
+	print STDERR "OCC METHOD OVERRIDE: " if ($localDebug);
 	$nextbreakable = 0;
 	$ctstate{breakable} = 0;
 	$mustbreak = 0;
 	if ($ntoken eq ":" && $tokenType eq "function") {
 		$ctstate{breakable} = 1;
+		print STDERR "BREAKABLE\n" if ($localDebug);
+	} else {
+		print STDERR "NOT BREAKABLE\n" if ($localDebug);
 	}
     }
 
@@ -3790,6 +3882,8 @@
 		print STDERR "dropping newline\n" if ($localDebug);
 		$drop = 1;
 		$string .= " ";
+		$ctstate{afteradvisoryspace} = 1;
+		print STDERR "AAS -> 1 [drop]\n" if ($localDebug || $advisorySpaceDebug || $codePathDebug);
 	} else {
 		$mustbreak = 1;
 	}
@@ -3935,6 +4029,7 @@
     my $newstring = "";
     my $node = $self->{FIRSTCHILD};
     my $newstringref = undef;
+
     if ($node && $continue) {
 	if ($nospaceafter == 1) { $nospaceafter = 0; }
 	print STDERR "BEGIN CHILDREN\n" if ($localDebug || $colorDebug || $treeDebug);
@@ -3942,11 +4037,17 @@
 
 	my $childctstate = newCTState(\%ctstate, depth => $ctstate{depth} + 1, breakable => $nextbreakable);
 
-	($newstringref, $ctstate{newlen}, $nextbreakable, $ctstate{prespace}, $ctstate{lastnstoken}, $continue, $ctstate{lastTokenType}, $ctstate{spaceSinceLastToken}) = $node->colorTreeSub($childctstate);
+	($newstringref, $ctstate{newlen}, $nextbreakable, $ctstate{prespace}, $ctstate{lastnstoken}, $continue, $ctstate{lastTokenType}, $ctstate{spaceSinceLastToken}, $ctstate{afteradvisoryspace}) = $node->colorTreeSub($childctstate);
 
 	$newstring = ${$newstringref};
 	print STDERR "END CHILDREN\n" if ($localDebug || $colorDebug || $treeDebug);
     }
+
+    if ($self == $ctstate{lastDisplayNode} ) {
+	print STDERR "Node is last node in tree (LDN/AS).  Ending after this node.\n" if ($localDebug || $codePathDebug);
+	$continue = 0;
+    }
+
     $string .= $newstring; $newstring = "";
     print STDERR "SET STRING TO $string\n" if ($localDebug);
 
@@ -4002,8 +4103,9 @@
 	}
 	print STDERR "CONTINUING TO NODE \"".$node->token."\".\n" if ($localDebug);
 	if ($node) {
-		my $nextctstate = newCTState(\%ctstate, breakable => $nextbreakable);
-		($newstringref, $ctstate{newlen}, $nextbreakable, $ctstate{prespace}, $ctstate{lastnstoken}, $continue, $ctstate{lastTokenType}, $ctstate{spaceSinceLastToken}) = $node->colorTreeSub($nextctstate);
+		my $nextctstate = newCTState(\%ctstate, breakable => $nextbreakable,
+			afteradvisoryspace => $ctstate{afteradvisoryspace});
+		($newstringref, $ctstate{newlen}, $nextbreakable, $ctstate{prespace}, $ctstate{lastnstoken}, $continue, $ctstate{lastTokenType}, $ctstate{spaceSinceLastToken}, $ctstate{afteradvisoryspace}) = $node->colorTreeSub($nextctstate);
 		$newstring = ${$newstringref};
 	}
     }
@@ -4012,7 +4114,7 @@
 
     # $self->{CTSTRING} = $string;
     # $self->{CTSUB} = ($ctstate{newlen}, $nextbreakable, $ctstate{prespace}, $ctstate{lastnstoken});
-    return (\$string, $ctstate{newlen}, $nextbreakable, $ctstate{prespace}, $ctstate{lastnstoken}, $continue, $ctstate{lastTokenType}, $ctstate{spaceSinceLastToken});
+    return (\$string, $ctstate{newlen}, $nextbreakable, $ctstate{prespace}, $ctstate{lastnstoken}, $continue, $ctstate{lastTokenType}, $ctstate{spaceSinceLastToken}, $ctstate{afteradvisoryspace});
 }
 
 # /*!
@@ -4142,7 +4244,7 @@
 
     if ($self == $lastnode) {
 	my $deb = "";
-	if ($localDebug) { $deb = $lastnode; }
+	if ($localDebug || 1) { $deb = $lastnode; }
 	print STDERR "-=-=-=-=-=-=- EODEC $deb-=-=-=-=-=-=-\n";
     }
 
diff -rNu headerdoc-8.9.14/Modules/HeaderDoc/ParserState.pm headerdoc-8.9.20/Modules/HeaderDoc/ParserState.pm
--- headerdoc-8.9.14/Modules/HeaderDoc/ParserState.pm	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/Modules/HeaderDoc/ParserState.pm	2014-02-19 09:31:19.000000000 -0800
@@ -2,7 +2,7 @@
 #
 # Class name: 	ParserState
 # Synopsis: 	Used by headerDoc2HTML.pl to hold parser state
-# Last Updated: $Date: 2012/04/06 15:56:50 $
+# Last Updated: $Date: 2014/02/18 22:42:50 $
 # 
 # Copyright (c) 1999-2004 Apple Computer, Inc.  All rights reserved.
 #
@@ -490,6 +490,17 @@
 #             Set to the actual <code>of</code> or <code>in</code> token
 #             encountered when parsing AppleScript.  The word token after it is
 #             appended to this variable (delimited by a space).
+#         @var ASINELSE
+#             Set to 1 at an "else" statement.  If the next word token is "if",
+#             we don't treat it as opening a new brace.
+#         @var ASLBRACEPRECURSOR
+#             In an <code>if</code> or <code>tell</code> statement, stores
+#             the <code>if</code> or <code>tell</code> token.  Used to determine
+#             whether to treat the following newline as a brace.
+#         @var ASLBRACEPRECURSORTAG
+#             In an <code>if</code> or <code>tell</code> statement, stores
+#             the <code>then</code> or <code>to</code> token.  Used to determine
+#             whether to treat the following newline as a brace.
 #         @var inUnion
 #             Set to 1 when the union keyword is encountered.  Remains high
 #             until the end of this declaration.
@@ -665,7 +676,7 @@
 #             A nondestructive variant of {@link firstpastnl} that is available to
 #             any programming language (and currently used in TCL).
 #             Set to 2 after a newline, 1 during the first non-space
-#             token, 0 after.
+#             token, 0 after.  Also set to 2 initially.
 #
 #         @var inrbraceargument
 #             Some languages take an additional argument for their equivalent of
@@ -824,6 +835,13 @@
 #             The contents of a function (or, when parsing a switch
 #             statement, the contents of the struct body).
 #
+#         @var lastDisplayNode
+#             The last node in the parse tree rooted at this node that
+#             should be displayed.  Used only in AppleScript, to hide
+#             content nested inside functions while still parsing them
+#             fully.  Unlike lastTreeNode, this node's children
+#             <b>should</b> be included in the output.
+#
 #         @var lastTreeNode
 #             The last node in the parse tree rooted at this node.
 #             This node is marked with EODEC in parse tree dumps.
@@ -1213,7 +1231,7 @@
 #         In the git repository, contains the number of seconds since
 #         January 1, 1970.
 #  */
-$HeaderDoc::ParserState::VERSION = '$Revision: 1333753010 $';
+$HeaderDoc::ParserState::VERSION = '$Revision: 1392792170 $';
 ################ General Constants ###################################
 my $debugging = 0;
 
@@ -1345,6 +1363,8 @@
 				# to a variable.
 	backslashcount => 0,
 
+	afterNL => 2,
+
 	functionReturnsCallback => 0
 
 );
@@ -1799,6 +1819,28 @@
 }
 
 # /*!
+#     @abstract Enables some extra debugging for AppleScript.
+#  */
+$HeaderDoc::AppleScriptDebug = 0;
+
+# /*!
+#     @abstract Clears the left brace precursor token.
+#     @result Returns whether to treat the newline as a brace.
+#  */
+sub clearLeftBracePrecursor
+{
+	my $self = shift;
+
+	my $retval = $self->{ASLBRACEPRECURSOR};
+
+	$self->{ASLBRACEPRECURSOR} = "";
+	$self->{ASLBRACEPRECURSORTAG} = "";
+	print STDERR "Cleared ASLBRACEPRECURSOR\n" if ($HeaderDoc::AppleScriptDebug);
+
+	return $retval;
+}
+
+# /*!
 #     @abstract
 #         Returns whether or not this token should be
 #         treated as a left brace.
@@ -1808,46 +1850,93 @@
 #         The token to check.
 #     @param lang
 #         The programming language.
-#     @param lbrace
+#     @param parseTokensRef
+#         A parse token hash obtained from a call to {@link parseTokens}.
+#     @param case_sensitive
+#         Set to 1 for most languages.  Set to 0 if the
+#         language uses case-insensitive token matching
+#         (e.g. Pascal).
+#     @param curBraceCount
+#         The current brace count.  This is used to prevent
+#         nesting of braces in languages that don't work that way.
+#     @var lbrace
 #         The primary left brace character.
-#     @param lbraceunconditionalre
+#     @var lbraceunconditionalre
 #         A regular expression containing other patterns that
 #         are always considered left braces.  Currently used
 #         for for/if in Python and Ruby, and tell in AppleScript.
-#     @param lbraceconditionalre
+#     @var lbraceconditionalre
 #         In Ruby/Python, a set of tokens that are treated as
 #         left braces unless they are immediately after a
 #         right brace.  Basically, this handles
 #         begin/while/until when used at the end of a line
 #         in Ruby/Python.
-#     @param classisbrace
+#
+#         In AppleScript, this handles tokens that are treated as
+#         braces only if they are at the beginning of a line.
+#     @var lbraceprecursorre
+#         In AppleScript, this handles "then" after an "if"
+#         on the same line or "to" after a "tell" on the
+#         same line.
+#     @var classisbrace
 #         Set to 1 if a class declaration is treated as an
 #         open brace.  (This is <b>not</b> used for ObjC clases;
 #         they are special.)
-#     @param functionisbrace
+#     @var functionisbrace
 #         Set to 1 if a function declaration is treated as an
 #         open brace.
-#     @param case_sensitive
-#         Set to 1 for most languages.  Set to 0 if the
-#         language uses case-insensitive token matching
-#         (e.g. Pascal).
-#     @param curBraceCount
-#         The current brace count.  This is used to prevent
-#         nesting of braces in languages that don't work that way.
 #  */
 sub isLeftBrace
 {
 	my $self = shift;
 	my $part = shift;
 	my $lang = shift;
-	my $lbrace = shift;
-	my $lbraceunconditionalre = shift;
-	my $lbraceconditionalre = shift;
-	my $classisbrace = shift;
-	my $functionisbrace = shift;
+	my $parseTokensRef = shift;
 	my $case_sensitive = shift;
 	my $curBraceCount = shift;
 
+	my $localDebug = 0;
+
+	my %parseTokens = ();
+
+	my $lbrace;
+	my $lbracepreventerre;
+	my $lbraceunconditionalre;
+	my $lbraceconditionalre;
+	my $lbraceprecursorre;
+	my $classisbrace;
+	my $functionisbrace;
+	my $lbraceprecursor;
+
+	# Backwards compatibility hack.
+	if (@_) {
+		warn("The calling pattern for isLeftBrace has changed.  Please update your code.\n");
+
+		$lbrace = $parseTokensRef;
+		$parseTokensRef = undef;
+		$lbraceunconditionalre = $case_sensitive;
+		$lbraceconditionalre = $curBraceCount;
+		$classisbrace = shift;
+		$classisbrace = shift;
+		$case_sensitive = shift;
+		$curBraceCount = shift;
+		$lbraceprecursor = "";
+		$lbraceprecursorre = "";
+		$lbracepreventerre = "";
+	} else {
+		# New-style calling: use the value as a reference.
+		%parseTokens = %{$parseTokensRef};
+
+		$lbrace = $parseTokens{lbrace};
+		$lbraceunconditionalre = $parseTokens{lbraceunconditionalre};
+		$lbraceconditionalre = $parseTokens{lbraceconditionalre};
+		$lbracepreventerre = $parseTokens{lbracepreventerre};
+		$lbraceprecursorre = $parseTokens{lbraceprecursorre};
+		$classisbrace = $parseTokens{classisbrace};
+		$functionisbrace = $parseTokens{functionisbrace};
+		$lbraceprecursor = $parseTokens{lbraceprecursor};
+	}
+
 	# print STDERR "\$self: $self \$part: $part \$lbrace: $lbrace \$lbraceunconditionalre: $lbraceunconditionalre \$lbraceconditionalre: $lbraceconditionalre \$classisbrace: $classisbrace \$functionisbrace: $functionisbrace \$case_sensitive: $case_sensitive\n";
 
 	if ($lang eq "perl" && $self->{inTemplate}) { return 0; }
@@ -1862,14 +1951,80 @@
 		return 1;
 	}
 
-	if ($lbraceunconditionalre && ($part =~ /$lbraceunconditionalre/)) { return 1; }
-	if ($lbraceconditionalre && (!$self->{followingrubyrbrace}) && ($part =~ /$lbraceconditionalre/)) { return 1; }
+	print STDERR "INRBR: ".$self->{inrbraceargument}."\n" if ($localDebug || $HeaderDoc::AppleScriptDebug);
+
+	if ($lbraceunconditionalre && ($part =~ /$lbraceunconditionalre/)) {
+		print STDERR "UNCONDITIONALRE MATCH\n" if ($localDebug || $HeaderDoc::AppleScriptDebug);
+		return 1;
+	}
+
+	if ($lbracepreventerre && ($part =~ /$lbracepreventerre/)) {
+		print STDERR "ASINELSE -> 1\n" if ($localDebug || $HeaderDoc::AppleScriptDebug);
+		$self->{ASINELSE} = 1;
+	} elsif ($self->{ASINELSE} && $part =~ /\w/) {
+		print STDERR "ASINELSE -> 0\n" if ($localDebug || $HeaderDoc::AppleScriptDebug);
+		$self->{ASINELSE} = 0;
+		if ($part eq "if") {
+			print STDERR "IGNORING IF\n" if ($localDebug || $HeaderDoc::AppleScriptDebug);
+			return 0;
+		}
+	}
+
+	if ($lang eq "applescript" && !($self->{inString} || $self->{inComment} || $self->{inInlineComment} || $self->{inLabel} || $self->{inrbraceargument})) {
+		print STDERR "ASPART: \"$part\" PC: ".$self->{ASLBRACEPRECURSOR}." PCTAG: ".$self->{ASLBRACEPRECURSORTAG}."\n" if ($localDebug || $HeaderDoc::AppleScriptDebug);
+
+		# After an if/then or a tell/to, if we see a non-space, non-comment token,
+		# then it is a simple-style "if" or "tell" statement.  Clear the precursor data
+		# so that a subsequent call to {@link clearLeftBracePrecursor} will return
+		# an empty string.
+		if (($self->{ASLBRACEPRECURSORTAG}) && $part =~ /\S/) {
+			print STDERR "Cleared ASLBRACEPRECURSOR (simple statement)\n" if ($localDebug || $HeaderDoc::AppleScriptDebug);
+			$self->{ASLBRACEPRECURSOR} = "";
+			$self->{ASLBRACEPRECURSORTAG} = "";
+		}
+
+		# If we see the "if" or "tell" token, store it away, but be prepared to reverse
+		# that decision later, if it's right after a newline and turns into a conditional
+		# regex match.
+		my $oldprecursor = $self->{ASLBRACEPRECURSOR};
+		if ($lbraceprecursor && $part =~ /$lbraceprecursor/) {
+			$self->{ASLBRACEPRECURSOR} = $part;
+			print STDERR "Set ASLBRACEPRECURSOR to \"$part\"\n" if ($localDebug || $HeaderDoc::AppleScriptDebug);
+		}
+
+		# If we see the "then" or "to" token, store it away.
+		if ($lbraceprecursorre && $part =~ /$lbraceprecursorre/) {
+			print STDERR "AS conditional lbrace: \"$part\"\n" if ($localDebug || $HeaderDoc::AppleScriptDebug);
+			if ($part eq "then" && $self->{ASLBRACEPRECURSOR} eq "if") {
+				print STDERR "IF THEN\n" if ($localDebug || $HeaderDoc::AppleScriptDebug);
+				$self->{ASLBRACEPRECURSORTAG} = $part;
+			}
+			if ($part eq "to" && $self->{ASLBRACEPRECURSOR} eq "tell") {
+				print STDERR "TELL TO\n" if ($localDebug || $HeaderDoc::AppleScriptDebug);
+				$self->{ASLBRACEPRECURSORTAG} = $part;
+			}
+			print STDERR "Nope.\n" if ($localDebug || $HeaderDoc::AppleScriptDebug);
+			return 0;
+		} elsif ($self->{afterNL} && $lbraceconditionalre && $part =~ /$lbraceconditionalre/) {
+			print STDERR "CONDITIONALRE MATCH\n" if ($localDebug || $HeaderDoc::AppleScriptDebug);
+			$self->{ASLBRACEPRECURSOR} = $oldprecursor;
+			return 1;
+		}
+	} elsif ($lang eq "applescript") {
+		return 0;
+	} else {
+		if ($lbraceconditionalre && (!$self->{followingrubyrbrace}) && ($part =~ /$lbraceconditionalre/)) { return 1; }
+	}
 
 	if (!$self->{newlineIsSemi}) {
 		if ($classisbrace && $self->{sodclass} eq "class" && ($self->{inRubyClass} != 2) && $part =~ /[\n\r]/) {
+			print STDERR "Class is a brace.  Returning 1 at newline.\n" if ($localDebug || $HeaderDoc::AppleScriptDebug);
+			return 1;
+		}
+		if ($functionisbrace && $self->{pushedfuncbrace} == 1 && $part =~ /[\n\r]/) {
+			print STDERR "Function is a brace.  Returning 1 at newline.\n" if ($localDebug || $HeaderDoc::AppleScriptDebug);
 			return 1;
 		}
-		if ($functionisbrace && $self->{pushedfuncbrace} == 1 && $part =~ /[\n\r]/) { return 1; }
 	}
 
 	return 0;
@@ -1877,6 +2032,82 @@
 
 # /*!
 #     @abstract
+#         Returns whether or not this token should be
+#         treated as a right brace.
+#     @param self
+#         This object.
+#     @param part
+#         The token to check.
+#     @param lang
+#         The programming language.
+#     @param parseTokensRef
+#         A parse token hash obtained from a call to {@link parseTokens}.
+#     @param case_sensitive
+#         Set to 1 for most languages.  Set to 0 if the
+#         language uses case-insensitive token matching
+#         (e.g. Pascal).
+#     @var rbrace
+#         The primary left brace character.
+#     @var rbraceconditionalre
+#         In AppleScript, this handles "end".
+#  */
+sub isRightBrace
+{
+    my $self = shift;
+
+    my $part = shift;
+    my $lang = shift;
+    my $parseTokensRef = shift;
+    my $case_sensitive = shift;
+
+    my %parseTokens = %{$parseTokensRef};
+
+    my $localDebug = 0;
+
+    if ($lang eq "applescript") {
+	print STDERR "Checking token \"$part\" for rbrace\n" if ($HeaderDoc::AppleScriptDebug || $localDebug);
+
+	print STDERR "afterNL: ".$self->{afterNL}."\n" if ($HeaderDoc::AppleScriptDebug || $localDebug);
+
+	my $rbraceconditionalre = $parseTokens{rbraceconditionalre};
+	if ($self->{afterNL} && $rbraceconditionalre && $part =~ /$rbraceconditionalre/) {
+		print STDERR "Yes.\n" if ($HeaderDoc::AppleScriptDebug || $localDebug);
+		return 1;
+	} else {
+		print STDERR "No.\n" if ($HeaderDoc::AppleScriptDebug || $localDebug);
+		return 0;
+	}
+    }
+    print STDERR "Checking token \"$part\" for non-AppleScript rbrace\n" if ($HeaderDoc::AppleScriptDebug || $localDebug);
+
+    my $retval = casecmp($part, $parseTokens{rbrace}, $case_sensitive);
+
+    print STDERR ($retval ? "Yes\n" : "No\n") if ($HeaderDoc::AppleScriptDebug || $localDebug);
+
+    return $retval;
+}
+
+# /*!
+#     @abstract Returns whether an AppleScript on/to should be treated as a handler or just a normal token.
+#  */
+sub appleScriptFunctionLegalHere
+{
+    my $self = shift;
+    my $braceStackRef = shift;
+
+    my @braceStack = @{$braceStackRef};
+
+    # It's only a handler if it is the first on a line.
+    if (!$self->{afterNL}) { return 0; }
+
+    # It isn't legal inside other stuff, e.g. a try block.
+    if (scalar(@braceStack)-$self->{initbsCount}) { return 0; }
+
+    return 1;
+}
+
+# /*!
+#     @abstract
 #         Pushes a token onto the brace stack.
 #     @param self
 #         This object.
diff -rNu headerdoc-8.9.14/Modules/HeaderDoc/Test.pm headerdoc-8.9.20/Modules/HeaderDoc/Test.pm
--- headerdoc-8.9.14/Modules/HeaderDoc/Test.pm	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/Modules/HeaderDoc/Test.pm	2014-02-14 18:03:01.000000000 -0800
@@ -3,7 +3,7 @@
 # Class name: Test
 # Synopsis: Test Harness
 #
-# Last Updated: $Date: 2012/04/12 13:06:41 $
+# Last Updated: $Date: 2013/08/02 15:22:25 $
 #
 # Copyright (c) 2008 Apple Computer, Inc.  All rights reserved.
 #
@@ -160,7 +160,7 @@
 #         In the git repository, contains the number of seconds since
 #         January 1, 1970.
 #  */
-$HeaderDoc::Test::VERSION = '$Revision: 1334261201 $';
+$HeaderDoc::Test::VERSION = '$Revision: 1375482145 $';
 
 # /*!
 #     @abstract
@@ -564,6 +564,9 @@
 	my $objcAccessControlState = "private:"; # the default in Objective C
 	my $functionGroup = "default_function_group";
 
+	if ($HeaderDoc::sublang eq "IDL") {
+		$cppAccessControlState = "public:"; # IDLs have no notion of protection, typically.
+	}
 
 	my @codeLines = split(/\n/, $self->{CODE});
 	map(s/$/\n/gm, @codeLines);
@@ -615,7 +618,7 @@
 	$results .= "-=: BLOCKPARSE PARSER STATE KEYS :=-\n";
 	my @pskeys = sort keys %{$parserState};
 	foreach my $key (@pskeys) {
-		if ($key !~ /(pplStack|hollow|lastTreeNode|freezeStack|parsedParamList|braceStack|treeStack|endOfTripleQuoteToken|rollbackState|availabilityNodesArray|parsedParamAtBrace|parsedParamStateAtBrace)/) {
+		if ($key !~ /(pplStack|hollow|lastDisplayNode|lastTreeNode|freezeStack|parsedParamList|braceStack|treeStack|endOfTripleQuoteToken|rollbackState|availabilityNodesArray|parsedParamAtBrace|parsedParamStateAtBrace)/) {
 			$results .= "\$parserState->{$key} => ".$parserState->{$key}."\n";
 		} else {
 			my $temp = $parserState->{$key};
diff -rNu headerdoc-8.9.14/Modules/HeaderDoc/TypeHelper.pm headerdoc-8.9.20/Modules/HeaderDoc/TypeHelper.pm
--- headerdoc-8.9.14/Modules/HeaderDoc/TypeHelper.pm	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/Modules/HeaderDoc/TypeHelper.pm	2014-02-14 18:03:01.000000000 -0800
@@ -3,7 +3,7 @@
 # Class name: TypeHelper
 # Synopsis: Helper code for block parser data type returns
 #
-# Last Updated: $Date: 2011/02/18 19:02:59 $
+# Last Updated: $Date: 2014/02/14 17:55:29 $
 # 
 # Copyright (c) 2006 Apple Computer, Inc.  All rights reserved.
 #
@@ -100,7 +100,6 @@
     }
 }
 use HeaderDoc::HeaderElement;
-use HeaderDoc::DBLookup;
 use HeaderDoc::Utilities qw(findRelativePath safeName printArray printHash sanitize);
 use File::Basename;
 use Cwd;
@@ -116,7 +115,7 @@
 #         In the git repository, contains the number of seconds since
 #         January 1, 1970.
 #  */
-$HeaderDoc::TypeHelper::VERSION = '$Revision: 1298084579 $';
+$HeaderDoc::TypeHelper::VERSION = '$Revision: 1392429329 $';
 
 # Inheritance
 # @ISA = qw(HeaderDoc::HeaderElement);
diff -rNu headerdoc-8.9.14/Modules/HeaderDoc/Utilities.pm headerdoc-8.9.20/Modules/HeaderDoc/Utilities.pm
--- headerdoc-8.9.14/Modules/HeaderDoc/Utilities.pm	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/Modules/HeaderDoc/Utilities.pm	2014-02-19 09:31:19.000000000 -0800
@@ -2,7 +2,7 @@
 # Utilities.pm
 # 
 # Common subroutines
-# Last Updated: $Date: 2012/04/12 13:06:41 $
+# Last Updated: $Date: 2014/02/18 22:39:15 $
 # 
 # Copyright (c) 1999-2004 Apple Computer, Inc.  All rights reserved.
 #
@@ -75,12 +75,12 @@
 #         In the git repository, contains the number of seconds since
 #         January 1, 1970.
 #  */
-$HeaderDoc::Utilities::VERSION = '$Revision: 1334261201 $';
+$HeaderDoc::Utilities::VERSION = '$Revision: 1392791955 $';
 @ISA = qw(Exporter);
 @EXPORT = qw(findRelativePath safeName safeNameNoCollide linesFromFile makeAbsolutePath
              printHash printArray fileNameFromPath folderPathForFile 
              updateHashFromConfigFiles getHashFromConfigFile getVarNameAndDisc
-             getAPINameAndDisc 
+             getAPINameAndDisc doxyTagFilter
              registerUID resolveLink parseTokens isKeyword html2xhtml
              resolveLinks stringToFields sanitize warnHDComment
              classTypeFromFieldAndBPinfo casecmp unregisterUID
@@ -1345,6 +1345,9 @@
 #         Set to 1 if a class declaration is treated as an
 #         open brace.  (This is <b>not</b> used for ObjC clases;
 #         they are special.)
+#     @var functionisapiowner
+#         Set to 1 if a function can usefully contain classes and other
+#         API elements.
 #     @var structisbrace
 #         Set to 1 if a struct declaration is treated as an
 #         open brace.
@@ -1665,12 +1668,25 @@
 	$parseTokens{ilc} = "--";
 	$parseTokens{ilc_b} = "#";
 	# $parseTokens{lbrace} = "{";
-	$parseTokens{lbraceunconditionalre} = "^(tell)";
-	$parseTokens{rbrace} = "end";
+
+	# These always start a block ending in "end"
+	# $parseTokens{lbraceunconditionalre} = "^(repeat|try)\$";
+
+	# These might, if they aren't followed by the corresponding simple token.
+	$parseTokens{lbraceprecursor} = "^(if|tell)\$";
+	$parseTokens{lbraceprecursorre} = "^(then|to)\$";
+	# If this is followed by an "if", ignore the "if".
+	$parseTokens{lbracepreventerre} = "^(else)\$";
+	# These do if they're after a newline.
+	$parseTokens{lbraceconditionalre} = "^(considering|ignoring|repeat|tell|try|using|with)\$";
+
+	# $parseTokens{rbrace} = "end";
+	$parseTokens{rbraceconditionalre} = "^(end)\$";
 	$parseTokens{rbracetakesargument} = 1;
 	$parseTokens{varname} = "property";
 	# $parseTokens{constname} = "const";
 	$parseTokens{structisbrace} = 0;
+	$parseTokens{functionisapiowner} = 1;
 	$parseTokens{functionisbrace} = 1;
 	$parseTokens{classisbrace} = 1;
 	$parseTokens{assignmentwithcolon} = 1;
@@ -2234,7 +2250,7 @@
             ($field =~ s/^meta(\s+|$)//sio) && do { return $include_second_tier; };
             ($field =~ s/^method(\s+|$)//sio) && do { return $include_first_tier; };
             ($field =~ s/^methodgroup(\s+|$)//sio) && do { return $include_first_tier; };
-            ($field =~ s/^name(\s+|$)//sio) && do { return $include_second_tier; };
+            ($field =~ s/^name(\s+|$)//sio) && do { return $include_first_tier; };
             ($field =~ s/^namespace(\s+|$)//sio) && do { return $include_second_tier; };
             ($field =~ s/^note(\s+|$)//sio) && do { return -$include_second_tier; }; 
             ($field =~ s/^noParse(\s+|$)//sio) && do { return $include_second_tier; };
@@ -4781,14 +4797,15 @@
 				    }
 				    # print "LINKLINE: $line\n";
 				    # if ($lang eq "java" || $HeaderDoc::parse_javadoc) {
-					$line =~ s/\@ref\s+(\w+)\s*(\(\))?/<code>\@link $1\@\/link<\/code>/sgio;
-					$line =~ s/\{\s*\@linkdoc\s+(.*?)\}/<i>\@link $1\@\/link<\/i>/sgio;
-					$line =~ s/\{\s*\@linkplain\s+(.*?)\}/\@link $1\@\/link/sgio;
-					$line =~ s/\{\s*\@link\s+(.*?)\}/<code>\@link $1\@\/link<\/code>/sgio;
-					$line =~ s/\{\s*\@docroot\s*\}/\\\@\\\@docroot/sgio;
-					# if ($line =~ /value/o) { warn "line was: $line\n"; }
-					$line =~ s/\{\@value\}/\@value/sgio;
-					$line =~ s/\{\@inheritDoc\}/\@inheritDoc/sgio;
+					### $line =~ s/\@ref\s+(\w+)\s*(\(\))?/<code>\@link $1\@\/link<\/code>/sgio;
+					### $line =~ s/\{\s*\@linkdoc\s+(.*?)\}/<i>\@link $1\@\/link<\/i>/sgio;
+					### $line =~ s/\{\s*\@linkplain\s+(.*?)\}/\@link $1\@\/link/sgio;
+					### $line =~ s/\{\s*\@link\s+(.*?)\}/<code>\@link $1\@\/link<\/code>/sgio;
+					### $line =~ s/\{\s*\@docroot\s*\}/\\\@\\\@docroot/sgio;
+					### # if ($line =~ /value/o) { warn "line was: $line\n"; }
+					### $line =~ s/\{\@value\}/\@value/sgio;
+					### $line =~ s/\{\@inheritDoc\}/\@inheritDoc/sgio;
+					$line = doxyTagFilter($line);
 					# if ($line =~ /value/o) { warn "line now: $line\n"; }
 				    # }
 				    $line =~ s/([^\\])\@docroot/$1\\\@\\\@docroot/sgi;
@@ -4824,14 +4841,15 @@
 				    $line =~ s/^[ \t]*#//s;
 				}
 				# print "LINKLINE2: $line\n";
-				$line =~ s/\{\s*\@linkdoc\s+(.*?)\}/<i>\@link $1\@\/link<\/i>/sgio;
-				$line =~ s/\{\s*\@linkplain\s+(.*?)\}/\@link $1\@\/link/sgio;
-				$line =~ s/\{\s*\@link\s+(.*?)\}/<code>\@link $1\@\/link<\/code>/sgio;
-				# $line =~ s/\{\s*\@docroot\s*\}/\\\@\\\@docroot/sgio;
-				# if ($line =~ /value/so) { warn "line was: $line\n"; }
-				$line =~ s/\{\@value\}/\@value/sgio;
-				$line =~ s/\{\@inheritDoc\}/\@inheritDoc/sgio;
-				$line =~ s/\{\s*\@docroot\s*\}/\\\@\\\@docroot/sgo;
+				### $line =~ s/\{\s*\@linkdoc\s+(.*?)\}/<i>\@link $1\@\/link<\/i>/sgio;
+				### $line =~ s/\{\s*\@linkplain\s+(.*?)\}/\@link $1\@\/link/sgio;
+				### $line =~ s/\{\s*\@link\s+(.*?)\}/<code>\@link $1\@\/link<\/code>/sgio;
+				### # $line =~ s/\{\s*\@docroot\s*\}/\\\@\\\@docroot/sgio;
+				### # if ($line =~ /value/so) { warn "line was: $line\n"; }
+				### $line =~ s/\{\@value\}/\@value/sgio;
+				### $line =~ s/\{\@inheritDoc\}/\@inheritDoc/sgio;
+				### $line =~ s/\{\s*\@docroot\s*\}/\\\@\\\@docroot/sgo;
+				$line = doxyTagFilter($line);
 
 				my %lineentry = ();
 				$lineentry{INTEXTBLOCK} = $in_textblock;
@@ -5835,6 +5853,26 @@
     return $depth;
 }
 
+# /*! @abstract
+#         Performs conversion of certain Doxygen and JavaDoc tags.
+#  */
+sub doxyTagFilter
+{
+    my $line = shift;
+
+    $line =~ s/\@ref\s+(\w+)\s*(\(\))?/<code>\@link $1\@\/link<\/code>/sgio;
+    $line =~ s/\{\s*\@linkdoc\s+(.*?)\}/<i>\@link $1\@\/link<\/i>/sgio;
+    $line =~ s/\{\s*\@linkplain\s+(.*?)\}/\@link $1\@\/link/sgio;
+    $line =~ s/\{\s*\@link\s+(.*?)\}/<code>\@link $1\@\/link<\/code>/sgio;
+    # $line =~ s/\{\s*\@docroot\s*\}/\\\@\\\@docroot/sgio;
+    # if ($line =~ /value/so) { warn "line was: $line\n"; }
+    $line =~ s/\{\@value\}/\@value/sgio;
+    $line =~ s/\{\@inheritDoc\}/\@inheritDoc/sgio;
+    $line =~ s/\{\s*\@docroot\s*\}/\\\@\\\@docroot/sgo;
+
+    return $line;
+}
+
 
 1;
 
diff -rNu headerdoc-8.9.14/apicoverage.sh headerdoc-8.9.20/apicoverage.sh
--- headerdoc-8.9.14/apicoverage.sh	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/apicoverage.sh	2014-02-14 17:42:07.000000000 -0800
@@ -8,7 +8,7 @@
 echo "Checking function coverage:"
 echo
 
-for i in headerDoc2HTML.pl gatherHeaderDoc.pl headerwalk.pl headerdoc_tp/tp_webkit_tools/filtermacros.pl Modules/HeaderDoc/*.pm ; do
+for i in headerDoc2HTML.pl gatherHeaderDoc.pl headerwalk.pl perl2c.pl headerdoc_tp/tp_webkit_tools/filtermacros.pl Modules/HeaderDoc/*.pm ; do
     if [ -f "$i" ] ; then
 	COMMENTS="$(grep -B 1 '^[ 	]*sub[ 	]' "$i" | grep -v '^[ 	]*sub[ 	]' | grep -v '^--' | grep -c '[ 	]*#[^#]*\*\/')"
 	SUBS="$(grep -c '^[ 	]*sub[ 	]' "$i")";
@@ -139,7 +139,7 @@
     ALLKEYS_SCRIPT="$ALLKEYS_SCRIPT "'    }'
     ALLKEYS_SCRIPT="$ALLKEYS_SCRIPT "'}'
 
-    for i in headerDoc2HTML.pl gatherHeaderDoc.pl headerwalk.pl Modules/HeaderDoc/*.pm ; do
+    for i in headerDoc2HTML.pl gatherHeaderDoc.pl headerwalk.pl perl2c.pl Modules/HeaderDoc/*.pm ; do
 	KEYS="$KEYS $(cat "$i" | grep -v '^[[:space:]]*\#' | perl -e "$ALLKEYS_SCRIPT")"
     done
 
@@ -181,7 +181,7 @@
     DOCKEYS_SCRIPT="$DOCKEYS_SCRIPT "'    }'
     DOCKEYS_SCRIPT="$DOCKEYS_SCRIPT "'}'
 
-    for i in headerDoc2HTML.pl gatherHeaderDoc.pl headerwalk.pl Modules/HeaderDoc/*.pm ; do
+    for i in headerDoc2HTML.pl gatherHeaderDoc.pl headerwalk.pl perl2c.pl Modules/HeaderDoc/*.pm ; do
 	DOCUMENTED_KEYS="$DOCUMENTED_KEYS $(cat "$i" | perl -e "$DOCKEYS_SCRIPT")"
     done
 
@@ -242,7 +242,7 @@
 	CODE="$CODE"' }'
 
 	DATA="$(
-		for i in headerDoc2HTML.pl gatherHeaderDoc.pl headerwalk.pl Modules/HeaderDoc/*.pm ; do
+		for i in headerDoc2HTML.pl gatherHeaderDoc.pl headerwalk.pl perl2c.pl Modules/HeaderDoc/*.pm ; do
 			sed 's/#.*$//' "$i" | grep -v '^[[:space:]]*use' | grep -v '^[[:space:]]*require' | perl -e "$CODE" | grep '^HeaderDoc::'
 
 		done | sort -u
diff -rNu headerdoc-8.9.14/gatherHeaderDoc.pl headerdoc-8.9.20/gatherHeaderDoc.pl
--- headerdoc-8.9.14/gatherHeaderDoc.pl	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/gatherHeaderDoc.pl	2013-05-14 12:34:46.000000000 -0700
@@ -4,7 +4,7 @@
 # Synopsis: 	Finds all HeaderDoc generated docs in an input
 #		folder and creates a top-level HTML page to them
 #
-# Last Updated: $Date: 2012/05/14 11:32:11 $
+# Last Updated: $Date: 2012/10/11 16:16:46 $
 # 
 # Copyright (c) 1999-2004 Apple Computer, Inc.  All rights reserved.
 #
@@ -27,7 +27,7 @@
 #
 # @APPLE_LICENSE_HEADER_END@
 #
-# $Revision: 1337020331 $
+# $Revision: 1349997406 $
 ######################################################################
 
 # /*!
@@ -322,6 +322,18 @@
 my $externalAPIUIDPrefixes = "";
 my %usedInTemplate = ();
 
+# /*!
+#     @abstract
+#         Controls whether to add the [Top] link above the TOC
+#         when in frame-style or iframe-style TOC mode.
+#     @discussion
+#         This value is set based on the <code>addTopLink</code>
+#         line in the configuration file, or 1 by default.
+#  */
+$HeaderDoc::addTopLink = 1;
+if (defined $config{"addTopLink"}) {
+	$HeaderDoc::addTopLink = $config{"addTopLink"};
+}
 if (defined $config{"dateFormat"}) {
     $HeaderDoc::datefmt = $config{"dateFormat"};
     if ($HeaderDoc::datefmt !~ /\S/) {
@@ -493,7 +505,7 @@
 		$TOCTemplate = default_template();
 	} else {
 		print STDERR "Searching for $file\n";
-		my @templateFiles = ($devtoolsPreferencesPath.$pathSeparator.$file, $usrPreferencesPath, $systemPreferencesPath.$pathSeparator.$file, $usersPreferencesPath.$pathSeparator.$file, $Bin.$pathSeparator.$file, $file);
+		my @templateFiles = ($devtoolsPreferencesPath.$pathSeparator.$file, $usrPreferencesPath.$pathSeparator.$file, $systemPreferencesPath.$pathSeparator.$file, $usersPreferencesPath.$pathSeparator.$file, $Bin.$pathSeparator.$file, $file);
 
 		foreach my $filename (@templateFiles) {
 			if (open(TOCFILE, "<$filename")) {
@@ -1018,6 +1030,10 @@
 		print STDERR "Header Path: $frameworkpath\n";
 		print STDERR "Related: $frameworkrelated\n";
 	    }
+	} elsif ($tmpType eq "abstract") {
+		print STDERR "Ignored abstract\n" if ($localDebug);
+	} elsif ($tmpType eq "discussion") {
+		print STDERR "Ignored discussion\n" if ($localDebug);
 	} elsif ($tmpType eq "inheritedContent") {
 		print STDERR "Inherited content: ".$docRef->name()."\n" if ($localDebug);
         } elsif ($tmpType eq "econst") {
@@ -2234,36 +2250,40 @@
 	    $HeaderDoc::newTOC = $newTOC;
 
             my $relPathToMasterTOC = &findRelativePath($tocFile, $masterTOC);
+	    my $breadcrumb_added = 0;
 	    if ($fileString =~ /<!-- HeaderDoc TOC framework link begin -->.*<!-- HeaderDoc TOC framework link end -->/s) {
                 my $breadcrumb = "";
+		$breadcrumb_added = 1;
 
 		if ($newTOC) {
 			# In a class, so the heading is already there.
 			# $breadcrumb .= HeaderDoc::APIOwner->tocSeparator("Other Reference", $newTOC);
-			$breadcrumb .= HeaderDoc::APIOwner->tocEntry("$relPathToMasterTOC", "$framework", "$linktarget");
+			$breadcrumb .= HeaderDoc::APIOwner->tocEntry("$relPathToMasterTOC", "$framework", "_top");
 		} else {
 			# In a class, so the heading is already there.
 			# $breadcrumb .= "<br><h4>Other Reference</h4><hr class=\"TOCSeparator\">\n";
-			$breadcrumb .= "<nobr>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"$relPathToMasterTOC\" target=\"$linktarget\">$framework</a></nobr><br>\n";
+			$breadcrumb .= "<nobr>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"$relPathToMasterTOC\" target=\"_top\">$framework</a></nobr><br>\n";
 		}
 
 		$fileString =~ s/<!-- HeaderDoc TOC framework link begin -->.*<!-- HeaderDoc TOC framework link end -->/<!-- HeaderDoc TOC framework link begin -->$breadcrumb<!-- HeaderDoc TOC framework link end -->/s;
 	    } elsif ($fileString =~ /<!-- HeaderDoc TOC framework link block begin -->.*<!-- HeaderDoc TOC framework link block end -->/s) {
                 my $breadcrumb = "";
+		$breadcrumb_added = 1;
 
 		if ($newTOC) {
 			$breadcrumb .= HeaderDoc::APIOwner->tocSeparator("Other Reference", $newTOC);
-			$breadcrumb .= HeaderDoc::APIOwner->tocEntry("$relPathToMasterTOC", "$framework", "$linktarget");
+			$breadcrumb .= HeaderDoc::APIOwner->tocEntry("$relPathToMasterTOC", "$framework", "_top");
 		} else {
 			$breadcrumb .= "<br><h4>Other Reference</h4><hr class=\"TOCSeparator\">\n";
-			$breadcrumb .= "<nobr>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"$relPathToMasterTOC\" target=\"$linktarget\">$framework</a></nobr><br>\n";
+			$breadcrumb .= "<nobr>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"$relPathToMasterTOC\" target=\"_top\">$framework</a></nobr><br>\n";
 		}
 
 		$fileString =~ s/<!-- HeaderDoc TOC framework link block begin -->.*<!-- HeaderDoc TOC framework link block end -->/<!-- HeaderDoc TOC framework link block begin -->$breadcrumb<!-- HeaderDoc TOC framework link block end -->/s;
-	    } elsif (!$useBreadcrumbs) {
+	    }
+	    if ((($HeaderDoc::addTopLink && !$newTOC) || (!$breadcrumb_added)) && (!$useBreadcrumbs)) {
 		if ($fileString !~ /$uniqueMarker/) { # we haven't been here before
                     my $relPathToMasterTOC = &findRelativePath($tocFile, $masterTOC);
-                    my $topLink = "\n<font size=\"-2\"><a href=\"$relPathToMasterTOC\" $linktarget $uniqueMarker>[Top]</a></font><br/>\n";
+                    my $topLink = "\n<font size=\"-2\"><a href=\"$relPathToMasterTOC\" target=\"_top\" $uniqueMarker>[Top]</a></font><br/>\n";
                     
                     $fileString =~ s/(<body[^>]*>)/$1$topLink/i;
                 }
diff -rNu headerdoc-8.9.14/generateAPIDocs.sh headerdoc-8.9.20/generateAPIDocs.sh
--- headerdoc-8.9.14/generateAPIDocs.sh	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/generateAPIDocs.sh	2014-02-14 17:42:33.000000000 -0800
@@ -9,9 +9,9 @@
 rm -rf Documentation/hdapi
 ./headerDoc2HTML.pl -H -O -j -Q -n -p -o Documentation/hdapi Documentation/HeaderDoc.hdoc
 if [ -d headerdoc_tp ] ; then
-	./headerDoc2HTML.pl -H -O -j -Q -n -p -o Documentation/hdapi headerwalk.pl headerDoc2HTML.pl gatherHeaderDoc.pl headerdoc_tp/*.pl headerdoc_tp/tp_webkit_tools/filtermacros.pl Modules/HeaderDoc/*.pm xmlman/*.c xmlman/*.h
+	./headerDoc2HTML.pl -H -O -j -Q -n -p -o Documentation/hdapi headerwalk.pl headerDoc2HTML.pl gatherHeaderDoc.pl perl2c.pl headerdoc_tp/*.pl headerdoc_tp/tp_webkit_tools/filtermacros.pl Modules/HeaderDoc/*.pm xmlman/*.c xmlman/*.h
 else
-	./headerDoc2HTML.pl -H -O -j -Q -n -p -o Documentation/hdapi headerwalk.pl headerDoc2HTML.pl gatherHeaderDoc.pl Modules/HeaderDoc/*.pm xmlman/*.c xmlman/*.h
+	./headerDoc2HTML.pl -H -O -j -Q -n -p -o Documentation/hdapi headerwalk.pl headerDoc2HTML.pl gatherHeaderDoc.pl perl2c.pl Modules/HeaderDoc/*.pm xmlman/*.c xmlman/*.h
 fi
 
 ./gatherHeaderDoc.pl -N Documentation/hdapi index.html
diff -rNu headerdoc-8.9.14/headerDoc2HTML.config headerdoc-8.9.20/headerDoc2HTML.config
--- headerdoc-8.9.14/headerDoc2HTML.config	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/headerDoc2HTML.config	2014-02-21 10:06:04.000000000 -0800
@@ -41,6 +41,11 @@
 #     iframes: Use the old-style iframes (equivalent to HeaderDoc in 10.6).
 TOCFormat => default
 
+# Sets whether to include the [Top] link in frame-style and iframe-style
+# TOC modes in addition to the links under "Other Reference".  Ignored
+# in the default (JavaScript) TOC mode.
+addTopLink => 1
+
 # Tells HeaderDoc to strip the .h off of the ends of header names in the
 # master TOC generated by gatherHeaderDoc.
 stripDotH => 1
@@ -81,9 +86,9 @@
 groupHierLimit => 100
 groupHierSubgroupLimit => 30
 
-# To use a different C compiler other than GCC for calculating values
+# To use a different C compiler other than cc for calculating values
 # of #define macro chains, specify the alternative compiler here.
-cCompiler => /usr/bin/gcc
+cCompiler => /usr/bin/cc
 
 # HeaderDoc converts unknown HTML tags into text as part of its
 # input sanitization process.  If you are using any custom HTML tags
diff -rNu headerdoc-8.9.14/headerDoc2HTML.config-installed headerdoc-8.9.20/headerDoc2HTML.config-installed
--- headerdoc-8.9.14/headerDoc2HTML.config-installed	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/headerDoc2HTML.config-installed	2012-10-11 16:19:12.000000000 -0700
@@ -1,5 +1,5 @@
 # Configuration file for HeaderDoc
-# $Revision: 1328743283 $
+# $Revision: 1348608411 $
 ###########################################################
 
 # These options set various parameters used in content generation.
@@ -81,9 +81,9 @@
 groupHierLimit => 100
 groupHierSubgroupLimit => 30
 
-# To use a different C compiler other than GCC for calculating values
+# To use a different C compiler other than the stock cc for calculating values
 # of #define macro chains, specify the alternative compiler here.
-cCompiler => /usr/bin/gcc
+cCompiler => /usr/bin/cc
 
 # HeaderDoc converts unknown HTML tags into text as part of its
 # input sanitization process.  If you are using any custom HTML tags
diff -rNu headerdoc-8.9.14/headerDoc2HTML.config-standard headerdoc-8.9.20/headerDoc2HTML.config-standard
--- headerdoc-8.9.14/headerDoc2HTML.config-standard	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/headerDoc2HTML.config-standard	2012-10-11 16:19:12.000000000 -0700
@@ -1,5 +1,5 @@
 # Configuration file for HeaderDoc
-# $Revision: 1.5 $
+# $Revision: 1348608411 $
 ###########################################################
 copyrightOwner =>
 defaultFrameName => index.html
@@ -33,5 +33,5 @@
 paramStyle => 
 varStyle => 
 templateStyle => 
-cCompiler => /usr/bin/gcc
+cCompiler => /usr/bin/cc
 
diff -rNu headerdoc-8.9.14/headerDoc2HTML.config-uglyblink headerdoc-8.9.20/headerDoc2HTML.config-uglyblink
--- headerdoc-8.9.14/headerDoc2HTML.config-uglyblink	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/headerDoc2HTML.config-uglyblink	2012-10-11 16:19:12.000000000 -0700
@@ -1,5 +1,5 @@
 # Configuration file for HeaderDoc
-# $Revision: 1.5 $
+# $Revision: 1348608411 $
 ###########################################################
 copyrightOwner =>
 defaultFrameName => index.html
@@ -26,5 +26,5 @@
 paramStyle => background:#808080; color:#00ff00; text-decoration:blink;
 varStyle => background:#ffffff; color:#ff0000; text-decoration:blink;
 templateStyle => background:#ccccff; color:#008000; font-family: sand, comic sans ms, comic sans, script; font-weight: bold; text-decoration: underline;
-cCompiler => /usr/bin/gcc
+cCompiler => /usr/bin/cc
 
diff -rNu headerdoc-8.9.14/headerDoc2HTML.config-uglycolors headerdoc-8.9.20/headerDoc2HTML.config-uglycolors
--- headerdoc-8.9.14/headerDoc2HTML.config-uglycolors	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/headerDoc2HTML.config-uglycolors	2012-10-11 16:19:12.000000000 -0700
@@ -1,5 +1,5 @@
 # Configuration file for HeaderDoc
-# $Revision: 1.5 $
+# $Revision: 1348608411 $
 ###########################################################
 copyrightOwner =>
 defaultFrameName => index.html
@@ -26,5 +26,5 @@
 paramStyle => background:#808080; color:#00ff00;
 varStyle => background:#ffffff; color:#ff0000;
 templateStyle => background:#ccccff; color:#008000; font-family: sand, comic sans ms, comic sans, script; font-weight: bold; text-decoration: underline;
-cCompiler => /usr/bin/gcc
+cCompiler => /usr/bin/cc
 
diff -rNu headerdoc-8.9.14/headerDoc2HTML.config-xcodecolors headerdoc-8.9.20/headerDoc2HTML.config-xcodecolors
--- headerdoc-8.9.14/headerDoc2HTML.config-xcodecolors	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/headerDoc2HTML.config-xcodecolors	2012-10-11 16:19:12.000000000 -0700
@@ -1,5 +1,5 @@
 # Configuration file for HeaderDoc
-# $Revision: 1328743283 $
+# $Revision: 1348608411 $
 ###########################################################
 
 # These options set various parameters used in content generation.
@@ -81,7 +81,7 @@
 groupHierLimit => 100
 groupHierSubgroupLimit => 30
 
-# To use a different C compiler other than GCC for calculating values
+# To use a different C compiler other than the stock cc for calculating values
 # of #define macro chains, specify the alternative compiler here.
-cCompiler => /usr/bin/gcc
+cCompiler => /usr/bin/cc
 
diff -rNu headerdoc-8.9.14/headerDoc2HTML.pl headerdoc-8.9.20/headerDoc2HTML.pl
--- headerdoc-8.9.14/headerDoc2HTML.pl	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/headerDoc2HTML.pl	2014-02-14 18:03:01.000000000 -0800
@@ -4,7 +4,7 @@
 # Synopsis: Scans a file for headerDoc comments and generates an HTML
 #           file from the comments it finds.
 #
-# Last Updated: $Date: 2012/04/12 13:06:41 $
+# Last Updated: $Date: 2014/02/14 17:55:29 $
 #
 # ObjC additions by SKoT McDonald <skot@tomandandy.com> Aug 2001 
 #
@@ -29,7 +29,7 @@
 #
 # @APPLE_LICENSE_HEADER_END@
 #
-# $Revision: 1334261201 $
+# $Revision: 1392429329 $
 #####################################################################
 
 
@@ -61,7 +61,7 @@
 #         In the git repository, contains the number of seconds since
 #         January 1, 1970.
 #  */
-my $VERSION = '$Revision: 1334261201 $';
+my $VERSION = '$Revision: 1392429329 $';
 
 # /*!
 #     @abstract
@@ -103,6 +103,22 @@
 #  */
 $HeaderDoc::nameFromAPIRefReturnsOnlyName = 0;
 
+# /*! @abstract
+#         The version of the test suite that matches this version
+#         of HeaderDoc.
+#     @discussion
+#         Do not change this value.  The actual value is automatically
+#         populated by the Makefile during installation based on the
+#         contents of the file
+#
+#         [source_directory]/testsuite/version
+#
+#         When the test suite changes in an incompatible way, the
+#         version number in that file should be bumped before the
+#         next version of HeaderDoc ships.
+#  */
+$HeaderDoc::testsuite_version="0";
+
 
 ################ General Constants ###################################
 # /*! @abstract
@@ -374,11 +390,11 @@
 #     @abstract
 #         The default C compiler.
 #     @discussion
-#         By default, HeaderDoc uses <code>/usr/bin/gcc</code> to calculate
+#         By default, HeaderDoc uses <code>/usr/bin/cc</code> to calculate
 #         the values of complex #define macros.  This can be overridden with
 #         the <code>cCompiler</code> field in the HeaderDoc config file.
 #  */
-$HeaderDoc::c_compiler = "/usr/bin/gcc";
+$HeaderDoc::c_compiler = "/usr/bin/cc";
 
 # /*!
 #     @abstract
@@ -1117,6 +1133,7 @@
 	$options{H} = 1;
 	$options{j} = 1;
 	$options{n} = 1;
+	$options{N} = 1;
 	$options{p} = 1;
 	$options{O} = 1;
 	$options{Q} = 1;
@@ -1595,7 +1612,6 @@
 # use Devel::Peek;
 
 # Classes and other modules specific to HeaderDoc
-# use HeaderDoc::DBLookup;
 use HeaderDoc::Utilities qw(linesFromFile emptyHDok addAvailabilityMacro);
 use HeaderDoc::Utilities qw(findRelativePath safeName
                             printArray linesFromFile printHash
@@ -1657,7 +1673,16 @@
 #         <code>/usr/share/headerdoc/testsuite</code>
 #  */
 $HeaderDoc::testdir = $HeaderDoc::modulesPath."/../../testsuite";
+
+
+# /*! @abstract
+#         Tells whether the test suite is being run from a checked-out
+#         copy of the HeaderDoc sources or not.
+#  */
+$HeaderDoc::local_tests = 1;
+
 if ( ! -d $HeaderDoc::testdir ) {
+	$HeaderDoc::local_tests = 0;
 	$HeaderDoc::testdir = "/usr/share/headerdoc/testsuite";
 }
 
@@ -1782,7 +1807,7 @@
     introductionName => "Introduction",
     superclassName => "Superclass",
     IDLLanguage => "idl",
-    cCompiler => "/usr/bin/gcc"
+    cCompiler => "/usr/bin/cc"
 );
 
 # print "CONFIG FILES: @{[ @configFiles ]}\n";
@@ -2057,11 +2082,6 @@
 }
 
 
-# ################ Exporting ##############################
-# if ($export || $testingExport) {
-	# HeaderDoc::DBLookup->loadUsingFolderAndFiles($lookupTableDir, $functionFilename, $typesFilename, $enumsFilename);
-# }
-
 ################### States ###########################################
 my $inHeader        = 0;
 my $inJavaSource    = 0;
@@ -2255,6 +2275,10 @@
     print STDERR "Top Level Point 200\n" if ($tlhangDebug);
     ($rootFileName, $lang, $sublang) = getLangAndSubLangFromFilename($filename);
 
+    if ($sublang eq "IDL") {
+	$cppAccessControlState = "public:"; # IDLs have no notion of protection, typically.
+    }
+
     $HeaderDoc::OptionalOrRequired = "";
 
     my $rootOutputDir;
@@ -2433,6 +2457,11 @@
 
 	$cppAccessControlState = "protected:"; # the default in C++
 	$objcAccessControlState = "private:"; # the default in Objective C
+
+	if ($sublang eq "IDL") {
+		$cppAccessControlState = "public:"; # IDLs have no notion of protection, typically.
+	}
+
 	$HeaderDoc::AccessControlState = "";
 
 	print STDERR "Top Level Point 705\n" if ($tlhangDebug);
@@ -4463,9 +4492,27 @@
 	$force = 1;
     }
 
+    my $testdir = $HeaderDoc::testdir;
+    my ($encoding, $linesref) = linesFromFile($testdir.$pathSeparator."version", 0);
+    my $installedversion = "";
+    if ($linesref) {
+	my @lines = @{$linesref};
+	$installedversion = $lines[0];
+    }
+    $installedversion =~ s/^\s*//sg;
+    $installedversion =~ s/\s*$//sg;
+    if (!$HeaderDoc::local_tests) {
+	if ($installedversion ne $HeaderDoc::testsuite_version) {
+		print STDERR "Test suite not up-to-date.  Please install the test suite that matches this\n".
+			"version of HeaderDoc by downloading the source tarball from opensource.apple.com\n".
+			"and running 'make realinstall' or 'make installsource'.\n";
+		$HeaderDoc::exitstatus = 1;
+		return (0, 1);
+	}
+    }
 
     my %config = (
-	cCompiler => "/usr/bin/gcc"
+	cCompiler => "/usr/bin/cc"
     );
 
     my $localConfigFileName = "headerDoc2HTML.config";
@@ -4558,7 +4605,7 @@
 
     print "\e[39m\n";
 
-    if ($fail_count) { $HeaderDoc::exitstatus = -1; }
+    if ($fail_count) { $HeaderDoc::exitstatus = 1; }
 }
 
 # /*!
diff -rNu headerdoc-8.9.14/perl2c.pl headerdoc-8.9.20/perl2c.pl
--- headerdoc-8.9.14/perl2c.pl	1969-12-31 16:00:00.000000000 -0800
+++ headerdoc-8.9.20/perl2c.pl	2014-02-14 17:39:53.000000000 -0800
@@ -0,0 +1,105 @@
+#!/usr/bin/perl
+#
+# Script name:  headerwalk.pl
+# Synopsis: 	Walks a header and creates some simple text content.
+#
+# Last Updated: $Date: 2012/01/16 16:25:31 $
+#
+# Copyright (c) 1999-2004 Apple Computer, Inc.  All rights reserved.
+#
+# @APPLE_LICENSE_HEADER_START@
+#
+# This file contains Original Code and/or Modifications of Original Code
+# as defined in and that are subject to the Apple Public Source License
+# Version 2.0 (the 'License'). You may not use this file except in
+# compliance with the License. Please obtain a copy of the License at
+# http://www.opensource.apple.com/apsl/ and read it before using this
+# file.
+#
+# The Original Code and all software distributed under the License are
+# distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+# EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+# INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+# Please see the License for the specific language governing rights and
+# limitations under the License.
+#
+# @APPLE_LICENSE_HEADER_END@
+#
+# $Revision: 1326759931 $
+######################################################################
+
+# /*!
+#     @header
+#         The headerwalk tool walks a header and generates a
+#         bunch of very simple text content.  This is mostly
+#         just a fun example of using the block parser in a
+#         different way than it was intended.  This experiment
+#         led to changes that eventually resulted in the -E
+#         flag to headerDoc2HTML.pl (headerdoc2html).
+#
+#         This document provides API-level documentation
+#         on the tool's internals.  This tool is not installed
+#         and no user-level documentation is provided because
+#         it is intended solely as demonstration code.
+#     @indexgroup HeaderDoc Tools
+#  */
+
+use lib "./Modules";
+use HeaderDoc::Utilities qw(linesFromFile);
+use HeaderDoc::BlockParse qw(blockParse);
+use HeaderDoc::ParserState;
+use HeaderDoc::ParseTree;
+use HeaderDoc::APIOwner;
+use File::Basename qw(basename);
+use strict;
+
+%HeaderDoc::ignorePrefixes = ();
+%HeaderDoc::perHeaderIgnorePrefixes = ();
+%HeaderDoc::perHeaderIgnoreFuncMacros = ();
+
+$HeaderDoc::includeFunctionContents = 1;
+
+# $HeaderDoc::parseIfElse = 1;
+
+my $lang = "perl";
+my $sublang = $lang;
+
+my $debug = 0;
+
+my $headerObj = HeaderDoc::APIOwner->new("lang" => $lang, "sublang" => $sublang);
+
+my ($case_sensitive, $keywordhashref) = $headerObj->keywords();
+$HeaderDoc::headerObject = $headerObj;
+
+foreach my $header (@ARGV) {
+	print "HEADER $header\n" if ($debug);
+
+	my @inputLines = ();
+	my ($encoding, $linesref) = linesFromFile($header);
+
+	@inputLines = @{$linesref};
+
+	my $inputCounter = 0;
+	my $nlines = $#inputLines;
+	while ($inputCounter <= $nlines) {
+		my ($newInputCounter, $dec, $type, $name, $pt, $value, $pplref, $returntype, $pridec, $parseTree, $simpleTDcontents, $bpavail, $blockOffset, $conformsToList, $functionContents, $returnedParserState, $nameObjectsRef, $extendsClass, $implementsClass, $propertyAttributes, $memberOfClass, $lang, $newsublang) = &blockParse($header, 0, \@inputLines, $inputCounter, 0, \%HeaderDoc::ignorePrefixes, \%HeaderDoc::perHeaderIgnorePrefixes, \%HeaderDoc::perHeaderIgnoreFuncMacros, $keywordhashref, $case_sensitive, $lang, $sublang);
+
+		$inputCounter = $newInputCounter;
+		$sublang = $newsublang;
+
+		# $parseTree->dbprint();
+
+		# print "GOT DEC:\n";
+		print "BEFORE: ".$parseTree->textTree()."\n" if ($debug);
+
+		$parseTree->translateTree();
+
+		print "AFTER: " if ($debug);
+
+		print $parseTree->textTree();
+
+		print "\nEND DEC.\n\n" if ($debug);
+	}
+
+}
diff -rNu headerdoc-8.9.14/testsuite/c_preprocessor_tests/cpp_test1.test headerdoc-8.9.20/testsuite/c_preprocessor_tests/cpp_test1.test
--- headerdoc-8.9.14/testsuite/c_preprocessor_tests/cpp_test1.test	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/testsuite/c_preprocessor_tests/cpp_test1.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,13 +1,16 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$22|void *FOO(BAZ(x, y));
 $0|$49|#define FOO bar
 #define BAZ(a, b) int a, char *b
-$3294|-=: CPP MACROS PARSED :=-
+$3402|-=: CPP MACROS PARSED :=-
 PARSED: FOO
 PARSED: BAZ
 
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/cpp_test1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -121,13 +124,16 @@
 $CPP_HASH{BAZ} => int a, char *b
 $CPP_HASH{FOO} => bar
 $CPP_ARG_HASH{BAZ} => a, b
-$3294|-=: CPP MACROS PARSED :=-
+$3402|-=: CPP MACROS PARSED :=-
 PARSED: FOO
 PARSED: BAZ
 
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/cpp_test1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/c_preprocessor_tests/define_numerical_value_1.test headerdoc-8.9.20/testsuite/c_preprocessor_tests/define_numerical_value_1.test
--- headerdoc-8.9.14/testsuite/c_preprocessor_tests/define_numerical_value_1.test	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/testsuite/c_preprocessor_tests/define_numerical_value_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,11 +1,14 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$24|#define test2 (test(7))
 $0|$24|#define test(a) (a + 3)
-$3154|-=: CPP MACROS PARSED :=-
+$3262|-=: CPP MACROS PARSED :=-
 PARSED: test
 
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_numerical_value_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -111,12 +114,15 @@
 $CPP_HASH{test} => (a + 3)
 $CPP_HASH{test2} => ( (7 + 3))
 $CPP_ARG_HASH{test} => a
-$3154|-=: CPP MACROS PARSED :=-
+$3262|-=: CPP MACROS PARSED :=-
 PARSED: test
 
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_numerical_value_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/c_preprocessor_tests/headerdoc_markup_in_define.test headerdoc-8.9.20/testsuite/c_preprocessor_tests/headerdoc_markup_in_define.test
--- headerdoc-8.9.14/testsuite/c_preprocessor_tests/headerdoc_markup_in_define.test	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/testsuite/c_preprocessor_tests/headerdoc_markup_in_define.test	2013-05-14 15:12:53.000000000 -0700
@@ -7,12 +7,15 @@
 	int bar; \
 	/*! @var foo */ \
 	int foo;
-$3746|-=: CPP MACROS PARSED :=-
+$3854|-=: CPP MACROS PARSED :=-
 PARSED: GUTS
 
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/headerdoc_markup_in_define.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -150,12 +153,15 @@
         int bar; 
 /*! @var foo */ 
         int foo;
-$3746|-=: CPP MACROS PARSED :=-
+$3854|-=: CPP MACROS PARSED :=-
 PARSED: GUTS
 
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/headerdoc_markup_in_define.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/c_preprocessor_tests/string_concatenation.test headerdoc-8.9.20/testsuite/c_preprocessor_tests/string_concatenation.test
--- headerdoc-8.9.14/testsuite/c_preprocessor_tests/string_concatenation.test	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/testsuite/c_preprocessor_tests/string_concatenation.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,11 +1,14 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$50|char *TEST_MACRO_8734723487_CAT(my,cat) = "meow";
 $0|$44|#define TEST_MACRO_8734723487_CAT(a,b) a##b
-$3225|-=: CPP MACROS PARSED :=-
+$3333|-=: CPP MACROS PARSED :=-
 PARSED: TEST_MACRO_8734723487_CAT
 
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/string_concatenation.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -110,12 +113,15 @@
 -=: CPP CHANGES :=-
 $CPP_HASH{TEST_MACRO_8734723487_CAT} => a##b
 $CPP_ARG_HASH{TEST_MACRO_8734723487_CAT} => a,b
-$3225|-=: CPP MACROS PARSED :=-
+$3333|-=: CPP MACROS PARSED :=-
 PARSED: TEST_MACRO_8734723487_CAT
 
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/string_concatenation.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/c_preprocessor_tests/stringify.test headerdoc-8.9.20/testsuite/c_preprocessor_tests/stringify.test
--- headerdoc-8.9.14/testsuite/c_preprocessor_tests/stringify.test	2014-02-21 13:49:17.000000000 -0800
+++ headerdoc-8.9.20/testsuite/c_preprocessor_tests/stringify.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,11 +1,14 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$51|TEST_MACRO_342347862387_FOO(char *mytype,myvalue);
 $0|$48|#define TEST_MACRO_342347862387_FOO(a,b) a = #b
-$3236|-=: CPP MACROS PARSED :=-
+$3344|-=: CPP MACROS PARSED :=-
 PARSED: TEST_MACRO_342347862387_FOO
 
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/stringify.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -110,12 +113,15 @@
 -=: CPP CHANGES :=-
 $CPP_HASH{TEST_MACRO_342347862387_FOO} => a = #b
 $CPP_ARG_HASH{TEST_MACRO_342347862387_FOO} => a,b
-$3236|-=: CPP MACROS PARSED :=-
+$3344|-=: CPP MACROS PARSED :=-
 PARSED: TEST_MACRO_342347862387_FOO
 
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/stringify.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/API_UID_override.test headerdoc-8.9.20/testsuite/parser_tests/API_UID_override.test
--- headerdoc-8.9.14/testsuite/parser_tests/API_UID_override.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/API_UID_override.test	2013-05-14 15:12:53.000000000 -0700
@@ -3,7 +3,7 @@
     @indexgroup Module A
     @apiuid //apple_ref/doc/header/myheader.h_module_A
  */
-$0|$3998|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$4106|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/API_UID_override.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/API_UID_override.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -165,7 +168,7 @@
 
 -=: HTML OUTPUT OF PARSE TREES :=-
 
-$3998|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$4106|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -193,8 +196,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/API_UID_override.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/API_UID_override.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/AppleScript_class_1.test headerdoc-8.9.20/testsuite/parser_tests/AppleScript_class_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/AppleScript_class_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/AppleScript_class_1.test	2014-02-21 10:06:00.000000000 -0800
@@ -10,7 +10,7 @@
 $79|            (*! MyObject class
                doesn't do much.
              *)
-$0|$15174|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$14720|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -38,9 +38,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/AppleScript_class_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/AppleScript_class_1.test
-$parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -66,7 +68,7 @@
 $parserState->{inMacroLine} => 0
 $parserState->{inOperator} => 0
 $parserState->{inPrivateParamTypes} => 0
-$parserState->{inRubyClass} => 2
+$parserState->{inRubyClass} => 1
 $parserState->{inString} => 0
 $parserState->{inTemplate} => 0
 $parserState->{initbsCount} => 0
@@ -74,6 +76,7 @@
 $parserState->{kr_c_function} => 0
 $parserState->{kr_c_name} => 
 $parserState->{lang} => applescript
+$parserState->{lastDisplayNode} => HeaderDoc::ParseTree=HASH(OBJID)
 $parserState->{lastTreeNode} => HeaderDoc::ParseTree=HASH(OBJID)
 $parserState->{lastsymbol} => 
 $parserState->{macroNoTrunc} => 1
@@ -100,7 +103,7 @@
 $parserState->{seenTilde} => 0
 $parserState->{simpleTDcontents} => 
 $parserState->{simpleTypedef} => 0
-$parserState->{sodclass} => class
+$parserState->{sodclass} => script
 $parserState->{sodname} => MyObject
 $parserState->{sodtype} => 
 $parserState->{sodtypeclasstoken} => script
@@ -168,6 +171,16 @@
 |   |   +--- 
 |   |   +---y
 |   |   +---)
+|   +---                    
+|   +-*-display (HAS STATE)
+|   +--- 
+|   +---dialog
+|   +--- 
+|   +---myNumber
+|   +---[ NEWLINE ]
+|   +---                
+|   +---end
+|   +--- 
 |   +---[ NEWLINE ]
 |   +---            
 |   +---end
@@ -480,6 +493,16 @@
 |   |   +--- 
 |   |   +---y
 |   |   +---)
+|   +---                    
+|   +-*-display (HAS STATE)
+|   +--- 
+|   +---dialog
+|   +--- 
+|   +---myNumber
+|   +---[ NEWLINE ]
+|   +---                
+|   +---end
+|   +--- 
 |   +---[ NEWLINE ]
 |   +---            
 |   +---end
@@ -503,6 +526,16 @@
 |   +--- 
 |   +---y
 |   +---)
++---                    
++-*-display (HAS STATE)
++--- 
++---dialog
++--- 
++---myNumber
++---[ NEWLINE ]
++---                
++---end
++--- 
 -=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
 +---[ NEWLINE ]
 +---            
@@ -537,6 +570,16 @@
 |   +--- 
 |   +---y
 |   +---)
++---                    
++-*-display (HAS STATE)
++--- 
++---dialog
++--- 
++---myNumber
++---[ NEWLINE ]
++---                
++---end
++--- 
 +---[ NEWLINE ]
 +---            
 +---end
@@ -548,13 +591,7 @@
 
 -=: HTML OUTPUT OF PARSE TREES :=-
 OBJECT: MyObject (HeaderDoc::CPPClass)
-	<span class="keyword">script</span> <!-- a logicalPath="//test_ref/applescript/econst/MyObject //test_ref/applescript/data/MyObject //test_ref/applescript/clconst/MyObject " machineGenerated="true" --><span class="var">MyObject</span><!-- /a --> <span class="comment">-- MyScript has a single property, myNumber</span> 
-	    <span class="comment">(*! Property myNumber with value 0 *)</span>
-	    <span class="keyword">property</span> <!-- a logicalPath="//test_ref/applescript/econst/myNumber //test_ref/applescript/data/myNumber //test_ref/applescript/clconst/myNumber " machineGenerated="true" --><span class="var">myNumber</span><!-- /a --> : <span class="number">0</span> <span class="comment">(*! Function ReportMyNumber *)</span>
-	    <span class="keyword">on</span> <!-- a logicalPath="//test_ref/applescript/instm/ReportMyNumber //test_ref/applescript/clm/ReportMyNumber //test_ref/applescript/intfcm/ReportMyNumber //test_ref/applescript/intfm/ReportMyNumber //test_ref/applescript/func/ReportMyNumber //test_ref/applescript/ftmplt/ReportMyNumber //test_ref/applescript/defn/ReportMyNumber //test_ref/applescript/macro/ReportMyNumber //test_ref/doc/anysymbol/ReportMyNumber" machineGenerated="true" --><span class="function">ReportMyNumber</span><!-- /a -->(
-	        <span class="param">x</span>,
-	        <span class="param">y</span>) 
-	<span class="keyword">end</span> <span class="keyword">script</span> <span class="comment">-- MyObject</span> 
+	<span class="keyword">script</span> <!-- a logicalPath="//test_ref/applescript/econst/MyObject //test_ref/applescript/data/MyObject //test_ref/applescript/clconst/MyObject " machineGenerated="true" --><span class="var">MyObject</span><!-- /a --> 
 END OF OBJECT
 
 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/AppleScript_class_2.test headerdoc-8.9.20/testsuite/parser_tests/AppleScript_class_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/AppleScript_class_2.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/AppleScript_class_2.test	2014-02-21 10:06:00.000000000 -0800
@@ -8,7 +8,7 @@
 	end bar
 end script
 $40|(*! This is a comment about MyScript *)
-$0|$15823|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$15034|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -36,9 +36,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/AppleScript_class_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/AppleScript_class_2.test
-$parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -64,7 +66,7 @@
 $parserState->{inMacroLine} => 0
 $parserState->{inOperator} => 0
 $parserState->{inPrivateParamTypes} => 0
-$parserState->{inRubyClass} => 2
+$parserState->{inRubyClass} => 1
 $parserState->{inString} => 0
 $parserState->{inTemplate} => 0
 $parserState->{initbsCount} => 0
@@ -72,6 +74,7 @@
 $parserState->{kr_c_function} => 0
 $parserState->{kr_c_name} => 
 $parserState->{lang} => applescript
+$parserState->{lastDisplayNode} => HeaderDoc::ParseTree=HASH(OBJID)
 $parserState->{lastTreeNode} => HeaderDoc::ParseTree=HASH(OBJID)
 $parserState->{lastsymbol} => 
 $parserState->{macroNoTrunc} => 1
@@ -98,7 +101,7 @@
 $parserState->{seenTilde} => 0
 $parserState->{simpleTDcontents} => 
 $parserState->{simpleTypedef} => 0
-$parserState->{sodclass} => class
+$parserState->{sodclass} => script
 $parserState->{sodname} => MyScript
 $parserState->{sodtype} => 
 $parserState->{sodtypeclasstoken} => script
@@ -145,6 +148,9 @@
 |   |   +--- 
 |   |   +---y
 |   |   +---)
+|   +---        
+|   +---end
+|   +--- 
 -=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
 |   +---[ NEWLINE ]
 |   +---[ NEWLINE ]
@@ -160,6 +166,9 @@
 |   +---(
 |   |   +---z
 |   |   +---)
+|   +---        
+|   +---end
+|   +--- 
 |   +---[ NEWLINE ]
 |   +---end
 |   +--- 
@@ -487,6 +496,9 @@
 |   |   +--- 
 |   |   +---y
 |   |   +---)
+|   +---        
+|   +---end
+|   +--- 
 -=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
 |   +---[ NEWLINE ]
 |   +---[ NEWLINE ]
@@ -502,6 +514,9 @@
 |   +---(
 |   |   +---z
 |   |   +---)
+|   +---        
+|   +---end
+|   +--- 
 |   +---[ NEWLINE ]
 |   +---end
 |   +--- 
@@ -520,6 +535,9 @@
 |   +--- 
 |   +---y
 |   +---)
++---        
++---end
++--- 
 -=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
 +---[ NEWLINE ]
 +---[ NEWLINE ]
@@ -535,6 +553,9 @@
 +---(
 |   +---z
 |   +---)
++---        
++---end
++--- 
 +---[ NEWLINE ]
 +---end
 +--- 
@@ -549,6 +570,9 @@
 +---(
 |   +---z
 |   +---)
++---        
++---end
++--- 
 -=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
 +---[ NEWLINE ]
 +---end
@@ -560,13 +584,7 @@
 
 -=: HTML OUTPUT OF PARSE TREES :=-
 OBJECT: MyScript (HeaderDoc::CPPClass)
-	<span class="keyword">script</span> <!-- a logicalPath="//test_ref/applescript/econst/MyScript //test_ref/applescript/data/MyScript //test_ref/applescript/clconst/MyScript " machineGenerated="true" --><span class="var">MyScript</span><!-- /a --> <span class="comment">(*! This is a comment about foo *)</span>
-	    <span class="keyword">on</span> <!-- a logicalPath="//test_ref/applescript/instm/foo //test_ref/applescript/clm/foo //test_ref/applescript/intfcm/foo //test_ref/applescript/intfm/foo //test_ref/applescript/func/foo //test_ref/applescript/ftmplt/foo //test_ref/applescript/defn/foo //test_ref/applescript/macro/foo //test_ref/doc/anysymbol/foo" machineGenerated="true" --><span class="function">foo</span><!-- /a -->(
-	        <span class="param">x</span>,
-	        <span class="param">y</span>)  <span class="comment">(*! This is a comment about bar *)</span>
-	    <span class="keyword">on</span> <!-- a logicalPath="//test_ref/applescript/instm/bar //test_ref/applescript/clm/bar //test_ref/applescript/intfcm/bar //test_ref/applescript/intfm/bar //test_ref/applescript/func/bar //test_ref/applescript/ftmplt/bar //test_ref/applescript/defn/bar //test_ref/applescript/macro/bar //test_ref/doc/anysymbol/bar" machineGenerated="true" --><span class="function">bar</span><!-- /a -->(
-	        <span class="param">z</span>) 
-	<span class="keyword">end</span> <span class="keyword">script</span> 
+	<span class="keyword">script</span> <!-- a logicalPath="//test_ref/applescript/econst/MyScript //test_ref/applescript/data/MyScript //test_ref/applescript/clconst/MyScript " machineGenerated="true" --><span class="var">MyScript</span><!-- /a --> 
 END OF OBJECT
 
 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/AppleScript_function_1.test headerdoc-8.9.20/testsuite/parser_tests/AppleScript_function_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/AppleScript_function_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/AppleScript_function_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -13,7 +13,7 @@
     display dialog myNumber
 end ReportMyNumber
 $19|(*! Function 1. *)
-$0|$8535|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8932|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -41,8 +41,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/AppleScript_function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/AppleScript_function_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -56,8 +59,7 @@
 $parserState->{freezereturn} => 1
 $parserState->{frozensodname} => ReportMyNumber
 $parserState->{functionContents} => 
-    display dialog myNumber
-end ReportMyNumber
+ReportMyNumber
 
 $parserState->{functionReturnsCallback} => 0
 $parserState->{hollow} => HeaderDoc::ParseTree=HASH(OBJID)
@@ -77,10 +79,10 @@
 $parserState->{inTemplate} => 0
 $parserState->{initbsCount} => 0
 $parserState->{inputCounter} => 3
-$parserState->{inrbraceargument} => 0
 $parserState->{kr_c_function} => 0
 $parserState->{kr_c_name} => 
 $parserState->{lang} => applescript
+$parserState->{lastDisplayNode} => HeaderDoc::ParseTree=HASH(OBJID)
 $parserState->{lastTreeNode} => HeaderDoc::ParseTree=HASH(OBJID)
 $parserState->{lastsymbol} => 
 $parserState->{macroNoTrunc} => 1
@@ -114,6 +116,9 @@
 $parserState->{sodtype} => 
 $parserState->{stackFrozen} => 1
 $parserState->{startOfDec} => 0
+$parserState->{storeDec} =>  on ReportMyNumber(
+    x,
+
 $parserState->{sublang} => applescript
 $parserState->{treePopTwo} => 0
 $parserState->{typestring} => function
@@ -123,7 +128,7 @@
 newcount: 3
 typelist: function
 namelist: ReportMyNumber
-posstypes: function method
+posstypes: function method 
 value: 
 returntype: 
 pridec: 
@@ -132,8 +137,7 @@
 blockOffset: 0
 conformsToList: 
 functionContents: 
-    display dialog myNumber
-end ReportMyNumber
+ReportMyNumber
 
 extendsClass: 
 implementsClass: 
@@ -149,6 +153,16 @@
 |   +---,
 |   +---y
 |   +---)
++---    
++-*-display (HAS STATE)
++--- 
++---dialog
++--- 
++---myNumber
++---[ NEWLINE ]
++---end
++--- 
+-=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
 -=: COMPUTED VALUE :=-
 SUCCESS: 0
 VALUE: 0
@@ -334,6 +348,16 @@
 |   +---,
 |   +---y
 |   +---)
++---    
++-*-display (HAS STATE)
++--- 
++---dialog
++--- 
++---myNumber
++---[ NEWLINE ]
++---end
++--- 
+-=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
 END OF OBJECT
 
 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/AppleScript_function_2.test headerdoc-8.9.20/testsuite/parser_tests/AppleScript_function_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/AppleScript_function_2.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/AppleScript_function_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -5,7 +5,7 @@
     display dialog myNumber
 end ReportMyNumber
 $19|(*! Function 3. *)
-$0|$12196|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$12623|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,10 +33,13 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/AppleScript_function_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{ASlabel} => from bar
 $parserState->{FULLPATH} => /test_suite_bogus_path/AppleScript_function_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
 $parserState->{OfIn} => of foo
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -47,11 +50,10 @@
 $parserState->{categoryClass} => 
 $parserState->{classtype} => 
 $parserState->{freezeStack} => ARRAY(OBJID)
-$parserState->{freezereturn} => 0
+$parserState->{freezereturn} => 1
 $parserState->{frozensodname} => Multi Word Function 2
 $parserState->{functionContents} => 
-        display dialog myNumber
-end Multi Word Function 2
+Multi Word Function 2
 
 $parserState->{functionReturnsCallback} => 0
 $parserState->{hollow} => HeaderDoc::ParseTree=HASH(OBJID)
@@ -71,12 +73,12 @@
 $parserState->{inTemplate} => 0
 $parserState->{initbsCount} => 0
 $parserState->{inputCounter} => 3
-$parserState->{inrbraceargument} => 0
 $parserState->{kr_c_function} => 0
 $parserState->{kr_c_name} => 
 $parserState->{lang} => applescript
+$parserState->{lastDisplayNode} => HeaderDoc::ParseTree=HASH(OBJID)
 $parserState->{lastTreeNode} => HeaderDoc::ParseTree=HASH(OBJID)
-$parserState->{lastsymbol} => 2
+$parserState->{lastsymbol} => 
 $parserState->{macroNoTrunc} => 1
 $parserState->{name} => Multi
 $parserState->{namePending} => 0
@@ -109,6 +111,8 @@
 $parserState->{sodtype} =>  Multi Word Function
 $parserState->{stackFrozen} => 1
 $parserState->{startOfDec} => 0
+$parserState->{storeDec} =>  on Multi Word Function 2 of foo from bar given baz: bat,
+
 $parserState->{sublang} => applescript
 $parserState->{treePopTwo} => 0
 $parserState->{typestring} => function
@@ -118,7 +122,7 @@
 newcount: 3
 typelist: function
 namelist: Multi Word Function 2
-posstypes: function method
+posstypes: function method 
 value: 
 returntype: 
 pridec: 
@@ -127,8 +131,7 @@
 blockOffset: 0
 conformsToList: 
 functionContents: 
-        display dialog myNumber
-end Multi Word Function 2
+Multi Word Function 2
 
 extendsClass: 
 implementsClass: 
@@ -167,6 +170,16 @@
 +---bag
 +---:
 +---ban
++---        
++-*-display (HAS STATE)
++--- 
++---dialog
++--- 
++---myNumber
++---[ NEWLINE ]
++---end
++--- 
+-=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
 -=: COMPUTED VALUE :=-
 SUCCESS: 0
 VALUE: 0
@@ -457,6 +470,16 @@
 +---bag
 +---:
 +---ban
++---        
++-*-display (HAS STATE)
++--- 
++---dialog
++--- 
++---myNumber
++---[ NEWLINE ]
++---end
++--- 
+-=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
 END OF OBJECT
 
 
@@ -469,4 +492,4 @@
 
 
 
-__$50|testsuite/parser_tests/AppleScript_function_2.test$11|applescript$22|AppleScript function 2$11|applescript$6|parser
\ No newline at end of file
+__$104|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/AppleScript_function_2.test$11|applescript$22|AppleScript function 2$11|applescript$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/AppleScript_function_3.test headerdoc-8.9.20/testsuite/parser_tests/AppleScript_function_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/AppleScript_function_3.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/AppleScript_function_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$30|on preposition_in_name(x)
 end
 $18|(*! A handler. *)
-$0|$7360|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7458|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,6 +31,7 @@
 -=: BLOCKPARSE PARSER STATE KEYS :=-
 $parserState->{FULLPATH} => /test_suite_bogus_path/AppleScript_function_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -44,8 +45,6 @@
 $parserState->{freezereturn} => 1
 $parserState->{frozensodname} => preposition_in_name
 $parserState->{functionContents} => 
-end
-
 
 $parserState->{functionReturnsCallback} => 0
 $parserState->{hollow} => HeaderDoc::ParseTree=HASH(OBJID)
@@ -53,22 +52,19 @@
 $parserState->{inChar} => 0
 $parserState->{inClass} => 0
 $parserState->{inComment} => 0
-$parserState->{inGiven} => 0
 $parserState->{inInlineComment} => 0
-$parserState->{inLabel} => 0
 $parserState->{inMacro} => 0
 $parserState->{inMacroLine} => 0
-$parserState->{inOfIn} => 0
 $parserState->{inOperator} => 0
 $parserState->{inPrivateParamTypes} => 0
 $parserState->{inString} => 0
 $parserState->{inTemplate} => 0
 $parserState->{initbsCount} => 0
 $parserState->{inputCounter} => 3
-$parserState->{inrbraceargument} => 1
 $parserState->{kr_c_function} => 0
 $parserState->{kr_c_name} => 
 $parserState->{lang} => applescript
+$parserState->{lastDisplayNode} => HeaderDoc::ParseTree=HASH(OBJID)
 $parserState->{lastTreeNode} => HeaderDoc::ParseTree=HASH(OBJID)
 $parserState->{lastsymbol} => 
 $parserState->{macroNoTrunc} => 1
@@ -102,6 +98,8 @@
 $parserState->{sodtype} => 
 $parserState->{stackFrozen} => 1
 $parserState->{startOfDec} => 0
+$parserState->{storeDec} =>  on preposition_in_name(
+
 $parserState->{sublang} => applescript
 $parserState->{typestring} => function
 $parserState->{value} => 
@@ -110,7 +108,7 @@
 newcount: 3
 typelist: function
 namelist: preposition_in_name
-posstypes: function method
+posstypes: function method 
 value: 
 returntype: 
 pridec: 
@@ -119,8 +117,6 @@
 blockOffset: 0
 conformsToList: 
 functionContents: 
-end
-
 
 extendsClass: 
 implementsClass: 
@@ -133,6 +129,9 @@
 +---(
 |   +---x
 |   +---)
++---end
++---[ NEWLINE ]
++---[ NEWLINE ]
 -=: COMPUTED VALUE :=-
 SUCCESS: 0
 VALUE: 0
@@ -274,6 +273,9 @@
 +---(
 |   +---x
 |   +---)
++---end
++---[ NEWLINE ]
++---[ NEWLINE ]
 END OF OBJECT
 
 
@@ -286,4 +288,4 @@
 
 
 
-__$50|testsuite/parser_tests/AppleScript_function_3.test$11|applescript$22|AppleScript function 3$11|applescript$6|parser
\ No newline at end of file
+__$104|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/AppleScript_function_3.test$11|applescript$22|AppleScript function 3$11|applescript$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/AppleScript_identifier_1.test headerdoc-8.9.20/testsuite/parser_tests/AppleScript_identifier_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/AppleScript_identifier_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/AppleScript_identifier_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -3,7 +3,7 @@
 end try
 end
 $18|(*! A handler. *)
-$0|$6744|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6940|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,6 +33,7 @@
 -=: BLOCKPARSE PARSER STATE KEYS :=-
 $parserState->{FULLPATH} => /test_suite_bogus_path/AppleScript_identifier_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -46,8 +47,6 @@
 $parserState->{freezereturn} => 1
 $parserState->{frozensodname} => |#foo|
 $parserState->{functionContents} => 
-try
-end try
 
 $parserState->{functionReturnsCallback} => 0
 $parserState->{hollow} => HeaderDoc::ParseTree=HASH(OBJID)
@@ -55,22 +54,19 @@
 $parserState->{inChar} => 0
 $parserState->{inClass} => 0
 $parserState->{inComment} => 0
-$parserState->{inGiven} => 0
 $parserState->{inInlineComment} => 0
-$parserState->{inLabel} => 0
 $parserState->{inMacro} => 0
 $parserState->{inMacroLine} => 0
-$parserState->{inOfIn} => 0
 $parserState->{inOperator} => 0
 $parserState->{inPrivateParamTypes} => 0
 $parserState->{inString} => 0
 $parserState->{inTemplate} => 0
 $parserState->{initbsCount} => 0
-$parserState->{inputCounter} => 3
-$parserState->{inrbraceargument} => 0
+$parserState->{inputCounter} => 5
 $parserState->{kr_c_function} => 0
 $parserState->{kr_c_name} => 
 $parserState->{lang} => applescript
+$parserState->{lastDisplayNode} => HeaderDoc::ParseTree=HASH(OBJID)
 $parserState->{lastTreeNode} => HeaderDoc::ParseTree=HASH(OBJID)
 $parserState->{lastsymbol} => 
 $parserState->{macroNoTrunc} => 1
@@ -79,11 +75,11 @@
 $parserState->{noInsert} => 0
 $parserState->{occmethod} => 0
 $parserState->{occmethodname} => 
-$parserState->{occparmlabelfound} => 3
+$parserState->{occparmlabelfound} => 2
 $parserState->{onlyComments} => 0
 $parserState->{parsedParamAtBrace} => ARRAY(OBJID)
 $parserState->{parsedParamList} => ARRAY(OBJID)
-$parserState->{parsedParamParse} => 0
+$parserState->{parsedParamParse} => 1
 $parserState->{parsedParamStateAtBrace} => ARRAY(OBJID)
 $parserState->{posstypes} => 
 $parserState->{posstypesPending} => 0
@@ -104,16 +100,17 @@
 $parserState->{sodtype} => 
 $parserState->{stackFrozen} => 1
 $parserState->{startOfDec} => 0
+$parserState->{storeDec} =>  on |#foo| (
+
 $parserState->{sublang} => applescript
-$parserState->{treePopTwo} => 0
 $parserState->{typestring} => function
 $parserState->{value} => 
 $parserState->{valuepending} => 0
 -=: BLOCKPARSE RETURN VALUES :=-
-newcount: 3
+newcount: 5
 typelist: function
 namelist: |#foo|
-posstypes: function method
+posstypes: function method 
 value: 
 returntype: 
 pridec: 
@@ -122,8 +119,6 @@
 blockOffset: 0
 conformsToList: 
 functionContents: 
-try
-end try
 
 extendsClass: 
 implementsClass: 
@@ -136,6 +131,15 @@
 +---(
 |   +---x
 |   +---)
++---try
+|   +---[ NEWLINE ]
+|   +---end
+|   +--- 
+|   +---try
++---[ NEWLINE ]
++---end
++---[ NEWLINE ]
++---[ NEWLINE ]
 -=: COMPUTED VALUE :=-
 SUCCESS: 0
 VALUE: 0
@@ -277,6 +281,15 @@
 +---(
 |   +---x
 |   +---)
++---try
+|   +---[ NEWLINE ]
+|   +---end
+|   +--- 
+|   +---try
++---[ NEWLINE ]
++---end
++---[ NEWLINE ]
++---[ NEWLINE ]
 END OF OBJECT
 
 
@@ -289,4 +302,4 @@
 
 
 
-__$52|testsuite/parser_tests/AppleScript_identifier_1.test$11|applescript$24|AppleScript identifier 1$11|applescript$6|parser
\ No newline at end of file
+__$106|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/AppleScript_identifier_1.test$11|applescript$24|AppleScript identifier 1$11|applescript$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/AppleScript_if_1.test headerdoc-8.9.20/testsuite/parser_tests/AppleScript_if_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/AppleScript_if_1.test	1969-12-31 16:00:00.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/AppleScript_if_1.test	2014-02-19 09:31:19.000000000 -0800
@@ -0,0 +1,596 @@
+FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$361|on applescript_if_1(data)
+	local mylen
+	set mylen to the length of the data
+	if mylen = 0 then return "(No data)"
+	if mylen > 0 then
+		local retval
+		set retval to "Data elements: " & item 1 of data
+		repeat with i from 2 to mylen
+			set retval to retval & linefeed & "               " & item 2 of data
+		end repeat
+		return retval
+	end if
+end applescript_if_1
+$42|(*! Testing AppleScript if statements. *)
+$0|$10693|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+inHeader: 0
+inClass: 0
+inInterface: 0
+inCPPHeader: 0
+inOCCHeader: 0
+inPerlScript: 0
+inShellScript: 0
+inPHPScript: 0
+inJavaSource: 0
+inFunctionGroup: 0
+inGroup: 0
+inFunction: 0
+inPDefine: 0
+inTypedef: 0
+inUnion: 0
+inStruct: 0
+inConstant: 0
+inVar: 0
+inEnum: 0
+inMethod: 0
+inAvailabilityMacro: 0
+inUnknown: 1
+classType: unknown
+inputCounter: 0
+blockOffset: 0
+fullpath: /test_suite_bogus_path/AppleScript_if_1.test
+-=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
+$parserState->{FULLPATH} => /test_suite_bogus_path/AppleScript_if_1.test
+$parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
+$parserState->{availability} => 
+$parserState->{backslashcount} => 0
+$parserState->{basetype} => 
+$parserState->{bracePending} => 0
+$parserState->{callbackIsTypedef} => 0
+$parserState->{callbackName} => 
+$parserState->{callbackNamePending} => -1
+$parserState->{categoryClass} => 
+$parserState->{classtype} => 
+$parserState->{freezeStack} => ARRAY(OBJID)
+$parserState->{freezereturn} => 1
+$parserState->{frozensodname} => applescript_if_1
+$parserState->{functionContents} => 
+applescript_if_1
+
+$parserState->{functionReturnsCallback} => 0
+$parserState->{hollow} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{inBrackets} => 0
+$parserState->{inChar} => 0
+$parserState->{inClass} => 0
+$parserState->{inComment} => 0
+$parserState->{inGiven} => 0
+$parserState->{inInlineComment} => 0
+$parserState->{inLabel} => 0
+$parserState->{inMacro} => 0
+$parserState->{inMacroLine} => 0
+$parserState->{inOfIn} => 0
+$parserState->{inOperator} => 0
+$parserState->{inPrivateParamTypes} => 0
+$parserState->{inString} => 0
+$parserState->{inTemplate} => 0
+$parserState->{initbsCount} => 0
+$parserState->{inputCounter} => 13
+$parserState->{kr_c_function} => 0
+$parserState->{kr_c_name} => 
+$parserState->{lang} => applescript
+$parserState->{lastDisplayNode} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{lastTreeNode} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{lastsymbol} => 
+$parserState->{macroNoTrunc} => 1
+$parserState->{name} => applescript_if_1
+$parserState->{namePending} => 0
+$parserState->{noInsert} => 0
+$parserState->{occmethod} => 0
+$parserState->{occmethodname} => 
+$parserState->{occparmlabelfound} => 3
+$parserState->{onlyComments} => 0
+$parserState->{parsedParamAtBrace} => ARRAY(OBJID)
+$parserState->{parsedParamList} => ARRAY(OBJID)
+$parserState->{parsedParamParse} => 0
+$parserState->{parsedParamStateAtBrace} => ARRAY(OBJID)
+$parserState->{posstypes} => 
+$parserState->{posstypesPending} => 0
+$parserState->{pplStack} => ARRAY(OBJID)
+$parserState->{preEqualsSymbol} => 
+$parserState->{preTemplateSymbol} => 
+$parserState->{prekeywordsodname} => 
+$parserState->{prekeywordsodtype} => 
+$parserState->{pushedfuncbrace} => 2
+$parserState->{returntype} => on
+$parserState->{seenBraces} => 1
+$parserState->{seenMacroPart} => 0
+$parserState->{seenTilde} => 0
+$parserState->{simpleTDcontents} => 
+$parserState->{simpleTypedef} => 0
+$parserState->{sodclass} => function
+$parserState->{sodname} => applescript_if_1
+$parserState->{sodtype} => 
+$parserState->{stackFrozen} => 1
+$parserState->{startOfDec} => 0
+$parserState->{storeDec} =>  on applescript_if_1(
+
+$parserState->{sublang} => applescript
+$parserState->{treePopTwo} => 0
+$parserState->{typestring} => function
+$parserState->{value} => 
+$parserState->{valuepending} => 0
+-=: BLOCKPARSE RETURN VALUES :=-
+newcount: 13
+typelist: function
+namelist: applescript_if_1
+posstypes: function method 
+value: 
+returntype: 
+pridec: 
+simpleTDcontents: 
+bpavail: 
+blockOffset: 0
+conformsToList: 
+functionContents: 
+applescript_if_1
+
+extendsClass: 
+implementsClass: 
+-=: LIST OF PARSED PARAMETERS :=-
+Parsed Param 0 => data
+-=: DUMP OF PARSE TREE :=-
++---on
++--- 
++---applescript_if_1
++---(
+|   +---data
+|   +---)
++---        
++-*-local (HAS STATE)
++--- 
++---mylen
++---[ NEWLINE ]
++---        
++---set
++--- 
++---mylen
++--- 
++---to
++--- 
++---the
++--- 
++---length
++--- 
++---of
++--- 
++---the
++--- 
++---data
++---[ NEWLINE ]
++---        
++---if
++--- 
++---mylen
++--- 
++---=
++--- 
++---0
++--- 
++---then
++--- 
++---return
++--- 
++---"
+|   +---(
+|   +---No
+|   +--- 
+|   +---data
+|   +---)
+|   +---"
++---[ NEWLINE ]
++---        
++---if
++--- 
++---mylen
++--- 
++--->
++--- 
++---0
++--- 
++---then
++---[ NEWLINE ]
++---                
++---local
++--- 
++---retval
++---[ NEWLINE ]
++---                
++---set
++--- 
++---retval
++--- 
++---to
++--- 
++---"
+|   +---Data
+|   +--- 
+|   +---elements
+|   +---:
+|   +--- 
+|   +---"
++--- 
++---&
++--- 
++---item
++--- 
++---1
++--- 
++---of
++--- 
++---data
++---[ NEWLINE ]
++---                
++---repeat
+|   +--- 
+|   +---with
+|   +--- 
+|   +---i
+|   +--- 
+|   +---from
+|   +--- 
+|   +---2
+|   +--- 
+|   +---to
+|   +--- 
+|   +---mylen
+|   +---[ NEWLINE ]
+|   +---                        
+|   +---set
+|   +--- 
+|   +---retval
+|   +--- 
+|   +---to
+|   +--- 
+|   +---retval
+|   +--- 
+|   +---&
+|   +--- 
+|   +---linefeed
+|   +--- 
+|   +---&
+|   +--- 
+|   +---"
+|   |   +---               
+|   |   +---"
+|   +--- 
+|   +---&
+|   +--- 
+|   +---item
+|   +--- 
+|   +---2
+|   +--- 
+|   +---of
+|   +--- 
+|   +---data
+|   +---[ NEWLINE ]
+|   +---                
+|   +---end
+|   +--- 
+|   +---repeat
++---[ NEWLINE ]
++---                
++---return
++--- 
++---retval
++---[ NEWLINE ]
++---        
++---end
++--- 
++---if
++---[ NEWLINE ]
++---end
++--- 
+-=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
+-=: COMPUTED VALUE :=-
+SUCCESS: 0
+VALUE: 0
+-=: CPP CHANGES :=-
+NO CPP CHANGES
+-=: FOUND MATCH :=-
+1
+-=: NAMED OBJECTS :=-
+TREE COUNT: 0
+INDEX GROUP: 
+IS BLOCK: 
+OBJECT TYPE: HeaderDoc::Header
+NAME: AppleScript if 1
+APIUID: //test_ref/doc/header/AppleScript_if_1.test
+ABSTRACT: ""
+DISCUSSION: "<p></p>"
+UPDATED: ""
+COPYRIGHT: ""
+HTMLMETA: ""
+PRIVATEDECLARATION: ""
+GROUP: ""
+INDEXGROUP: ""
+THROWS: ""
+XMLTHROWS: ""
+UPDATED: ""
+LINKAGESTATE: ""
+ACCESSCONTROL: ""
+AVAILABILITY: ""
+LINKUID: ""
+ORIGCLASS: ""
+ISDEFINE: ""
+ISTEMPLATE: ""
+VALUE: "UNKNOWN"
+RETURNTYPE: ""
+LINENUM: ""
+CLASS: "HeaderDoc::Header"
+MASTERENUM: ""
+APIREFSETUPDONE: "1"
+TPCDONE: ""
+NOREGISTERUID: ""
+SUPPRESSCHILDREN: ""
+NAMELINE_DISCUSSION: ""
+HIDEDOC: ""
+HIDESINGLETONS: ""
+HIDECONTENTS: ""
+MAINOBJECT: ""
+LIST ATTRIBUTES: 
+SHORT ATTRIBUTES: 
+LONG ATTRIBUTES: 
+    TREE COUNT: 1
+    INDEX GROUP: 
+    IS BLOCK: 
+    OBJECT TYPE: HeaderDoc::Function
+    NAME: applescript_if_1
+    APIUID: //test_ref/applescript/func/applescript_if_1
+    ABSTRACT: ""
+    DISCUSSION: "<p>Testing AppleScript if statements."
+    UPDATED: ""
+    COPYRIGHT: ""
+    HTMLMETA: ""
+    PRIVATEDECLARATION: ""
+    GROUP: "default_function_group"
+    INDEXGROUP: ""
+    THROWS: ""
+    XMLTHROWS: ""
+    UPDATED: ""
+    LINKAGESTATE: ""
+    ACCESSCONTROL: ""
+    AVAILABILITY: ""
+    LINKUID: ""
+    ORIGCLASS: ""
+    ISDEFINE: ""
+    ISTEMPLATE: ""
+    VALUE: "UNKNOWN"
+    RETURNTYPE: ""
+    LINENUM: ""
+    CLASS: "HeaderDoc::Function"
+    MASTERENUM: ""
+    APIREFSETUPDONE: "1"
+    TPCDONE: ""
+    NOREGISTERUID: ""
+    SUPPRESSCHILDREN: "0"
+    NAMELINE_DISCUSSION: ""
+    HIDEDOC: ""
+    HIDESINGLETONS: ""
+    HIDECONTENTS: ""
+    MAINOBJECT: ""
+    LIST ATTRIBUTES: 
+    SHORT ATTRIBUTES: 
+    LONG ATTRIBUTES: 
+    PARSED PARAMETERS:
+        TREE COUNT: 0
+        INDEX GROUP: 
+        IS BLOCK: 
+        OBJECT TYPE: HeaderDoc::MinorAPIElement
+        NAME: 
+        TYPE:  data
+        APIUID: //test_ref/applescript/internal_temporary_object/
+        ABSTRACT: ""
+        DISCUSSION: "<p></p>"
+        UPDATED: ""
+        COPYRIGHT: ""
+        HTMLMETA: ""
+        PRIVATEDECLARATION: ""
+        GROUP: ""
+        INDEXGROUP: ""
+        THROWS: ""
+        XMLTHROWS: ""
+        UPDATED: ""
+        LINKAGESTATE: ""
+        ACCESSCONTROL: ""
+        AVAILABILITY: ""
+        LINKUID: ""
+        ORIGCLASS: ""
+        ISDEFINE: ""
+        ISTEMPLATE: ""
+        VALUE: "UNKNOWN"
+        RETURNTYPE: ""
+        LINENUM: ""
+        CLASS: "HeaderDoc::MinorAPIElement"
+        MASTERENUM: ""
+        APIREFSETUPDONE: "1"
+        TPCDONE: ""
+        NOREGISTERUID: ""
+        SUPPRESSCHILDREN: ""
+        NAMELINE_DISCUSSION: ""
+        HIDEDOC: ""
+        HIDESINGLETONS: ""
+        HIDECONTENTS: ""
+        MAINOBJECT: ""
+        LIST ATTRIBUTES: 
+        SHORT ATTRIBUTES: 
+        LONG ATTRIBUTES: 
+-=: NAMED OBJECT PARSE TREES :=-
+OBJECT: applescript_if_1 (HeaderDoc::Function)
++---on
++--- 
++---applescript_if_1
++---(
+|   +---data
+|   +---)
++---        
++-*-local (HAS STATE)
++--- 
++---mylen
++---[ NEWLINE ]
++---        
++---set
++--- 
++---mylen
++--- 
++---to
++--- 
++---the
++--- 
++---length
++--- 
++---of
++--- 
++---the
++--- 
++---data
++---[ NEWLINE ]
++---        
++---if
++--- 
++---mylen
++--- 
++---=
++--- 
++---0
++--- 
++---then
++--- 
++---return
++--- 
++---"
+|   +---(
+|   +---No
+|   +--- 
+|   +---data
+|   +---)
+|   +---"
++---[ NEWLINE ]
++---        
++---if
++--- 
++---mylen
++--- 
++--->
++--- 
++---0
++--- 
++---then
++---[ NEWLINE ]
++---                
++---local
++--- 
++---retval
++---[ NEWLINE ]
++---                
++---set
++--- 
++---retval
++--- 
++---to
++--- 
++---"
+|   +---Data
+|   +--- 
+|   +---elements
+|   +---:
+|   +--- 
+|   +---"
++--- 
++---&
++--- 
++---item
++--- 
++---1
++--- 
++---of
++--- 
++---data
++---[ NEWLINE ]
++---                
++---repeat
+|   +--- 
+|   +---with
+|   +--- 
+|   +---i
+|   +--- 
+|   +---from
+|   +--- 
+|   +---2
+|   +--- 
+|   +---to
+|   +--- 
+|   +---mylen
+|   +---[ NEWLINE ]
+|   +---                        
+|   +---set
+|   +--- 
+|   +---retval
+|   +--- 
+|   +---to
+|   +--- 
+|   +---retval
+|   +--- 
+|   +---&
+|   +--- 
+|   +---linefeed
+|   +--- 
+|   +---&
+|   +--- 
+|   +---"
+|   |   +---               
+|   |   +---"
+|   +--- 
+|   +---&
+|   +--- 
+|   +---item
+|   +--- 
+|   +---2
+|   +--- 
+|   +---of
+|   +--- 
+|   +---data
+|   +---[ NEWLINE ]
+|   +---                
+|   +---end
+|   +--- 
+|   +---repeat
++---[ NEWLINE ]
++---                
++---return
++--- 
++---retval
++---[ NEWLINE ]
++---        
++---end
++--- 
++---if
++---[ NEWLINE ]
++---end
++--- 
+-=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
+END OF OBJECT
+
+
+
+-=: HTML OUTPUT OF PARSE TREES :=-
+OBJECT: applescript_if_1 (HeaderDoc::Function)
+	<span class="keyword">on</span> <!-- a logicalPath="//test_ref/applescript/instm/applescript_if_1 //test_ref/applescript/clm/applescript_if_1 //test_ref/applescript/intfcm/applescript_if_1 //test_ref/applescript/intfm/applescript_if_1 //test_ref/applescript/func/applescript_if_1 //test_ref/applescript/ftmplt/applescript_if_1 //test_ref/applescript/defn/applescript_if_1 //test_ref/applescript/macro/applescript_if_1 //test_ref/doc/anysymbol/applescript_if_1" machineGenerated="true" --><span class="function">applescript_if_1</span><!-- /a -->(
+	    <span class="param">data</span>)
+END OF OBJECT
+
+
+
+__$21|AppleScript_if_1.test$11|applescript$16|AppleScript if 1$11|applescript$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/AppleScript_if_2.test headerdoc-8.9.20/testsuite/parser_tests/AppleScript_if_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/AppleScript_if_2.test	1969-12-31 16:00:00.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/AppleScript_if_2.test	2014-02-19 09:31:19.000000000 -0800
@@ -0,0 +1,450 @@
+FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$168|on applescript_if_2(s)
+	if s is "value" then
+		"value"
+	else if s is "foo" then
+		"foo"
+	else if s is "bar" then
+		"bar"
+	else
+		"unknown"
+	end if
+end applescript_if_2
+$41|(*! Testing "else if" in AppleScript. *)
+$0|$9099|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+inHeader: 0
+inClass: 0
+inInterface: 0
+inCPPHeader: 0
+inOCCHeader: 0
+inPerlScript: 0
+inShellScript: 0
+inPHPScript: 0
+inJavaSource: 0
+inFunctionGroup: 0
+inGroup: 0
+inFunction: 0
+inPDefine: 0
+inTypedef: 0
+inUnion: 0
+inStruct: 0
+inConstant: 0
+inVar: 0
+inEnum: 0
+inMethod: 0
+inAvailabilityMacro: 0
+inUnknown: 1
+classType: unknown
+inputCounter: 0
+blockOffset: 0
+fullpath: /test_suite_bogus_path/AppleScript_if_2.test
+-=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
+$parserState->{FULLPATH} => /test_suite_bogus_path/AppleScript_if_2.test
+$parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
+$parserState->{availability} => 
+$parserState->{backslashcount} => 0
+$parserState->{basetype} => 
+$parserState->{bracePending} => 0
+$parserState->{callbackIsTypedef} => 0
+$parserState->{callbackName} => 
+$parserState->{callbackNamePending} => -1
+$parserState->{categoryClass} => 
+$parserState->{classtype} => 
+$parserState->{freezeStack} => ARRAY(OBJID)
+$parserState->{freezereturn} => 1
+$parserState->{frozensodname} => applescript_if_2
+$parserState->{functionContents} => 
+applescript_if_2
+
+$parserState->{functionReturnsCallback} => 0
+$parserState->{hollow} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{inBrackets} => 0
+$parserState->{inChar} => 0
+$parserState->{inClass} => 0
+$parserState->{inComment} => 0
+$parserState->{inGiven} => 0
+$parserState->{inInlineComment} => 0
+$parserState->{inLabel} => 0
+$parserState->{inMacro} => 0
+$parserState->{inMacroLine} => 0
+$parserState->{inOfIn} => 0
+$parserState->{inOperator} => 0
+$parserState->{inPrivateParamTypes} => 0
+$parserState->{inString} => 0
+$parserState->{inTemplate} => 0
+$parserState->{initbsCount} => 0
+$parserState->{inputCounter} => 11
+$parserState->{kr_c_function} => 0
+$parserState->{kr_c_name} => 
+$parserState->{lang} => applescript
+$parserState->{lastDisplayNode} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{lastTreeNode} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{lastsymbol} => 
+$parserState->{macroNoTrunc} => 1
+$parserState->{name} => applescript_if_2
+$parserState->{namePending} => 0
+$parserState->{noInsert} => 0
+$parserState->{occmethod} => 0
+$parserState->{occmethodname} => 
+$parserState->{occparmlabelfound} => 3
+$parserState->{onlyComments} => 0
+$parserState->{parsedParamAtBrace} => ARRAY(OBJID)
+$parserState->{parsedParamList} => ARRAY(OBJID)
+$parserState->{parsedParamParse} => 0
+$parserState->{parsedParamStateAtBrace} => ARRAY(OBJID)
+$parserState->{posstypes} => 
+$parserState->{posstypesPending} => 0
+$parserState->{pplStack} => ARRAY(OBJID)
+$parserState->{preEqualsSymbol} => 
+$parserState->{preTemplateSymbol} => 
+$parserState->{prekeywordsodname} => 
+$parserState->{prekeywordsodtype} => 
+$parserState->{pushedfuncbrace} => 2
+$parserState->{returntype} => on
+$parserState->{seenBraces} => 1
+$parserState->{seenMacroPart} => 0
+$parserState->{seenTilde} => 0
+$parserState->{simpleTDcontents} => 
+$parserState->{simpleTypedef} => 0
+$parserState->{sodclass} => function
+$parserState->{sodname} => applescript_if_2
+$parserState->{sodtype} => 
+$parserState->{stackFrozen} => 1
+$parserState->{startOfDec} => 0
+$parserState->{storeDec} =>  on applescript_if_2(
+
+$parserState->{sublang} => applescript
+$parserState->{treePopTwo} => 0
+$parserState->{typestring} => function
+$parserState->{value} => 
+$parserState->{valuepending} => 0
+-=: BLOCKPARSE RETURN VALUES :=-
+newcount: 11
+typelist: function
+namelist: applescript_if_2
+posstypes: function method 
+value: 
+returntype: 
+pridec: 
+simpleTDcontents: 
+bpavail: 
+blockOffset: 0
+conformsToList: 
+functionContents: 
+applescript_if_2
+
+extendsClass: 
+implementsClass: 
+-=: LIST OF PARSED PARAMETERS :=-
+Parsed Param 0 => s
+-=: DUMP OF PARSE TREE :=-
++---on
++--- 
++---applescript_if_2
++---(
+|   +---s
+|   +---)
++---        
++-*-if (HAS STATE)
++--- 
++---s
++--- 
++---is
++--- 
++---"
+|   +---value
+|   +---"
++--- 
++---then
++---[ NEWLINE ]
++---                
++---"
+|   +---value
+|   +---"
++---[ NEWLINE ]
++---        
++---else
++--- 
++---if
++--- 
++---s
++--- 
++---is
++--- 
++---"
+|   +---foo
+|   +---"
++--- 
++---then
++---[ NEWLINE ]
++---                
++---"
+|   +---foo
+|   +---"
++---[ NEWLINE ]
++---        
++---else
++--- 
++---if
++--- 
++---s
++--- 
++---is
++--- 
++---"
+|   +---bar
+|   +---"
++--- 
++---then
++---[ NEWLINE ]
++---                
++---"
+|   +---bar
+|   +---"
++---[ NEWLINE ]
++---        
++---else
++---[ NEWLINE ]
++---                
++---"
+|   +---unknown
+|   +---"
++---[ NEWLINE ]
++---        
++---end
++--- 
++---if
++---[ NEWLINE ]
++---end
++--- 
+-=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
+-=: COMPUTED VALUE :=-
+SUCCESS: 0
+VALUE: 0
+-=: CPP CHANGES :=-
+NO CPP CHANGES
+-=: FOUND MATCH :=-
+1
+-=: NAMED OBJECTS :=-
+TREE COUNT: 0
+INDEX GROUP: 
+IS BLOCK: 
+OBJECT TYPE: HeaderDoc::Header
+NAME: AppleScript if 2
+APIUID: //test_ref/doc/header/AppleScript_if_2.test
+ABSTRACT: ""
+DISCUSSION: "<p></p>"
+UPDATED: ""
+COPYRIGHT: ""
+HTMLMETA: ""
+PRIVATEDECLARATION: ""
+GROUP: ""
+INDEXGROUP: ""
+THROWS: ""
+XMLTHROWS: ""
+UPDATED: ""
+LINKAGESTATE: ""
+ACCESSCONTROL: ""
+AVAILABILITY: ""
+LINKUID: ""
+ORIGCLASS: ""
+ISDEFINE: ""
+ISTEMPLATE: ""
+VALUE: "UNKNOWN"
+RETURNTYPE: ""
+LINENUM: ""
+CLASS: "HeaderDoc::Header"
+MASTERENUM: ""
+APIREFSETUPDONE: "1"
+TPCDONE: ""
+NOREGISTERUID: ""
+SUPPRESSCHILDREN: ""
+NAMELINE_DISCUSSION: ""
+HIDEDOC: ""
+HIDESINGLETONS: ""
+HIDECONTENTS: ""
+MAINOBJECT: ""
+LIST ATTRIBUTES: 
+SHORT ATTRIBUTES: 
+LONG ATTRIBUTES: 
+    TREE COUNT: 1
+    INDEX GROUP: 
+    IS BLOCK: 
+    OBJECT TYPE: HeaderDoc::Function
+    NAME: applescript_if_2
+    APIUID: //test_ref/applescript/func/applescript_if_2
+    ABSTRACT: ""
+    DISCUSSION: "<p>Testing "else if" in AppleScript."
+    UPDATED: ""
+    COPYRIGHT: ""
+    HTMLMETA: ""
+    PRIVATEDECLARATION: ""
+    GROUP: "default_function_group"
+    INDEXGROUP: ""
+    THROWS: ""
+    XMLTHROWS: ""
+    UPDATED: ""
+    LINKAGESTATE: ""
+    ACCESSCONTROL: ""
+    AVAILABILITY: ""
+    LINKUID: ""
+    ORIGCLASS: ""
+    ISDEFINE: ""
+    ISTEMPLATE: ""
+    VALUE: "UNKNOWN"
+    RETURNTYPE: ""
+    LINENUM: ""
+    CLASS: "HeaderDoc::Function"
+    MASTERENUM: ""
+    APIREFSETUPDONE: "1"
+    TPCDONE: ""
+    NOREGISTERUID: ""
+    SUPPRESSCHILDREN: "0"
+    NAMELINE_DISCUSSION: ""
+    HIDEDOC: ""
+    HIDESINGLETONS: ""
+    HIDECONTENTS: ""
+    MAINOBJECT: ""
+    LIST ATTRIBUTES: 
+    SHORT ATTRIBUTES: 
+    LONG ATTRIBUTES: 
+    PARSED PARAMETERS:
+        TREE COUNT: 0
+        INDEX GROUP: 
+        IS BLOCK: 
+        OBJECT TYPE: HeaderDoc::MinorAPIElement
+        NAME: 
+        TYPE:  s
+        APIUID: //test_ref/applescript/internal_temporary_object/
+        ABSTRACT: ""
+        DISCUSSION: "<p></p>"
+        UPDATED: ""
+        COPYRIGHT: ""
+        HTMLMETA: ""
+        PRIVATEDECLARATION: ""
+        GROUP: ""
+        INDEXGROUP: ""
+        THROWS: ""
+        XMLTHROWS: ""
+        UPDATED: ""
+        LINKAGESTATE: ""
+        ACCESSCONTROL: ""
+        AVAILABILITY: ""
+        LINKUID: ""
+        ORIGCLASS: ""
+        ISDEFINE: ""
+        ISTEMPLATE: ""
+        VALUE: "UNKNOWN"
+        RETURNTYPE: ""
+        LINENUM: ""
+        CLASS: "HeaderDoc::MinorAPIElement"
+        MASTERENUM: ""
+        APIREFSETUPDONE: "1"
+        TPCDONE: ""
+        NOREGISTERUID: ""
+        SUPPRESSCHILDREN: ""
+        NAMELINE_DISCUSSION: ""
+        HIDEDOC: ""
+        HIDESINGLETONS: ""
+        HIDECONTENTS: ""
+        MAINOBJECT: ""
+        LIST ATTRIBUTES: 
+        SHORT ATTRIBUTES: 
+        LONG ATTRIBUTES: 
+-=: NAMED OBJECT PARSE TREES :=-
+OBJECT: applescript_if_2 (HeaderDoc::Function)
++---on
++--- 
++---applescript_if_2
++---(
+|   +---s
+|   +---)
++---        
++-*-if (HAS STATE)
++--- 
++---s
++--- 
++---is
++--- 
++---"
+|   +---value
+|   +---"
++--- 
++---then
++---[ NEWLINE ]
++---                
++---"
+|   +---value
+|   +---"
++---[ NEWLINE ]
++---        
++---else
++--- 
++---if
++--- 
++---s
++--- 
++---is
++--- 
++---"
+|   +---foo
+|   +---"
++--- 
++---then
++---[ NEWLINE ]
++---                
++---"
+|   +---foo
+|   +---"
++---[ NEWLINE ]
++---        
++---else
++--- 
++---if
++--- 
++---s
++--- 
++---is
++--- 
++---"
+|   +---bar
+|   +---"
++--- 
++---then
++---[ NEWLINE ]
++---                
++---"
+|   +---bar
+|   +---"
++---[ NEWLINE ]
++---        
++---else
++---[ NEWLINE ]
++---                
++---"
+|   +---unknown
+|   +---"
++---[ NEWLINE ]
++---        
++---end
++--- 
++---if
++---[ NEWLINE ]
++---end
++--- 
+-=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
+END OF OBJECT
+
+
+
+-=: HTML OUTPUT OF PARSE TREES :=-
+OBJECT: applescript_if_2 (HeaderDoc::Function)
+	<span class="keyword">on</span> <!-- a logicalPath="//test_ref/applescript/instm/applescript_if_2 //test_ref/applescript/clm/applescript_if_2 //test_ref/applescript/intfcm/applescript_if_2 //test_ref/applescript/intfm/applescript_if_2 //test_ref/applescript/func/applescript_if_2 //test_ref/applescript/ftmplt/applescript_if_2 //test_ref/applescript/defn/applescript_if_2 //test_ref/applescript/macro/applescript_if_2 //test_ref/doc/anysymbol/applescript_if_2" machineGenerated="true" --><span class="function">applescript_if_2</span><!-- /a -->(
+	    <span class="param">s</span>)
+END OF OBJECT
+
+
+
+__$21|AppleScript_if_2.test$11|applescript$16|AppleScript if 2$11|applescript$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/AppleScript_tell_1.test headerdoc-8.9.20/testsuite/parser_tests/AppleScript_tell_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/AppleScript_tell_1.test	1969-12-31 16:00:00.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/AppleScript_tell_1.test	2014-02-21 10:06:00.000000000 -0800
@@ -0,0 +1,608 @@
+FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$373|script tellScript
+        property _foo : missing value
+
+        (*! @abstract tests tell. *)
+        on tellFoo()
+                tell my _foo
+                        set bar to "baz"
+                        set baz to "bar" & "baz"
+                end tell
+        end tellFoo
+
+        (*! @abstract After *)
+        on afterTellFoo()
+        end afterTellFoo
+end script
+$38|(*! script to test "tell" parsing. *)
+$0|$13506|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+inHeader: 0
+inClass: 0
+inInterface: 0
+inCPPHeader: 0
+inOCCHeader: 0
+inPerlScript: 0
+inShellScript: 0
+inPHPScript: 0
+inJavaSource: 0
+inFunctionGroup: 0
+inGroup: 0
+inFunction: 0
+inPDefine: 0
+inTypedef: 0
+inUnion: 0
+inStruct: 0
+inConstant: 0
+inVar: 0
+inEnum: 0
+inMethod: 0
+inAvailabilityMacro: 0
+inUnknown: 1
+classType: unknown
+inputCounter: 0
+blockOffset: 0
+fullpath: /test_suite_bogus_path/AppleScript_tell_1.test
+-=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
+$parserState->{FULLPATH} => /test_suite_bogus_path/AppleScript_tell_1.test
+$parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
+$parserState->{availability} => 
+$parserState->{backslashcount} => 0
+$parserState->{basetype} => 
+$parserState->{bracePending} => 0
+$parserState->{callbackIsTypedef} => 0
+$parserState->{callbackName} => 
+$parserState->{callbackNamePending} => -1
+$parserState->{categoryClass} => 
+$parserState->{classNameFound} => 1
+$parserState->{classtype} => script
+$parserState->{forceClassDone} => 1
+$parserState->{freezeStack} => ARRAY(OBJID)
+$parserState->{freezereturn} => 1
+$parserState->{frozensodname} => 
+$parserState->{functionReturnsCallback} => 0
+$parserState->{hollow} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{inBrackets} => 0
+$parserState->{inChar} => 0
+$parserState->{inClass} => 1
+$parserState->{inComment} => 0
+$parserState->{inInlineComment} => 0
+$parserState->{inMacro} => 0
+$parserState->{inMacroLine} => 0
+$parserState->{inOperator} => 0
+$parserState->{inPrivateParamTypes} => 0
+$parserState->{inRubyClass} => 1
+$parserState->{inString} => 0
+$parserState->{inTemplate} => 0
+$parserState->{initbsCount} => 0
+$parserState->{inputCounter} => 15
+$parserState->{kr_c_function} => 0
+$parserState->{kr_c_name} => 
+$parserState->{lang} => applescript
+$parserState->{lastDisplayNode} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{lastTreeNode} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{lastsymbol} => 
+$parserState->{macroNoTrunc} => 1
+$parserState->{name} => 
+$parserState->{namePending} => 0
+$parserState->{noInsert} => 0
+$parserState->{occmethod} => 0
+$parserState->{occmethodname} => 
+$parserState->{occparmlabelfound} => 3
+$parserState->{onlyComments} => 0
+$parserState->{parsedParamAtBrace} => ARRAY(OBJID)
+$parserState->{parsedParamList} => ARRAY(OBJID)
+$parserState->{parsedParamParse} => 0
+$parserState->{parsedParamStateAtBrace} => ARRAY(OBJID)
+$parserState->{posstypes} => 
+$parserState->{posstypesPending} => 0
+$parserState->{pplStack} => ARRAY(OBJID)
+$parserState->{preEqualsSymbol} => 
+$parserState->{preTemplateSymbol} => 
+$parserState->{preclasssodtype} => script
+$parserState->{returntype} => script tellScript 
+$parserState->{seenBraces} => 0
+$parserState->{seenMacroPart} => 0
+$parserState->{seenTilde} => 0
+$parserState->{simpleTDcontents} => 
+$parserState->{simpleTypedef} => 0
+$parserState->{sodclass} => script
+$parserState->{sodname} => tellScript
+$parserState->{sodtype} => 
+$parserState->{sodtypeclasstoken} => script
+$parserState->{stackFrozen} => 0
+$parserState->{startOfDec} => 0
+$parserState->{storeDec} =>  script tellScript 
+
+$parserState->{sublang} => applescript
+$parserState->{value} => 
+$parserState->{valuepending} => 0
+-=: BLOCKPARSE RETURN VALUES :=-
+newcount: 15
+typelist: script
+namelist: tellScript
+posstypes: 
+value: 
+returntype: 
+pridec: 
+simpleTDcontents: 
+bpavail: 
+blockOffset: 0
+conformsToList: 
+functionContents: 
+extendsClass: 
+implementsClass: 
+-=: LIST OF PARSED PARAMETERS :=-
+-=: DUMP OF PARSE TREE :=-
++---script
++--- 
++---tellScript
++---[ NEWLINE ]
+|   +---        
+|   +-*-property (HAS STATE)
+|   +--- 
+|   +---_foo
+|   +--- 
+|   +---:
+|   +--- 
+|   +---missing
+|   +--- 
+|   +---value
+|   +---[ NEWLINE ]
+-=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
+|   +---[ NEWLINE ]
+|   +---(*
+|   |   +---!
+|   |   +--- @abstract tests tell. 
+|   |   +---*)
+|   +---[ NEWLINE ]
+|   +---        
+|   +-*-on (HAS STATE)
+|   +--- 
+|   +---tellFoo
+|   +---(
+|   |   +---)
+|   +---                
+|   +---tell
+|   |   +--- 
+|   |   +---my
+|   |   +--- 
+|   |   +---_foo
+|   |   +---[ NEWLINE ]
+|   |   +---                        
+|   |   +---set
+|   |   +--- 
+|   |   +---bar
+|   |   +--- 
+|   |   +---to
+|   |   +--- 
+|   |   +---"
+|   |   |   +---baz
+|   |   |   +---"
+|   |   +---[ NEWLINE ]
+|   |   +---                        
+|   |   +---set
+|   |   +--- 
+|   |   +---baz
+|   |   +--- 
+|   |   +---to
+|   |   +--- 
+|   |   +---"
+|   |   |   +---bar
+|   |   |   +---"
+|   |   +--- 
+|   |   +---&
+|   |   +--- 
+|   |   +---"
+|   |   |   +---baz
+|   |   |   +---"
+|   |   +---[ NEWLINE ]
+|   |   +---                
+|   |   +---end
+|   |   +--- 
+|   |   +---tell
+|   +---[ NEWLINE ]
+|   +---        
+|   +---end
+|   +--- 
+|   +---[ NEWLINE ]
+|   +---[ NEWLINE ]
+|   +---(*
+|   |   +---!
+|   |   +--- @abstract After 
+|   |   +---*)
+|   +---[ NEWLINE ]
+|   +---        
+|   +-*-on (HAS STATE)
+|   +--- 
+|   +---afterTellFoo
+|   +---(
+|   |   +---)
+|   +---        
+|   +---end
+|   +--- 
+|   +---[ NEWLINE ]
+|   +---end
+|   +--- 
+|   +---script
++---[ NEWLINE ]
+-=: COMPUTED VALUE :=-
+SUCCESS: 0
+VALUE: 0
+-=: CPP CHANGES :=-
+NO CPP CHANGES
+-=: FOUND MATCH :=-
+1
+-=: NAMED OBJECTS :=-
+TREE COUNT: 0
+INDEX GROUP: 
+IS BLOCK: 
+OBJECT TYPE: HeaderDoc::Header
+NAME: AppleScript tell 1
+APIUID: //test_ref/doc/header/AppleScript_tell_1.test
+ABSTRACT: ""
+DISCUSSION: "<p></p>"
+UPDATED: ""
+COPYRIGHT: ""
+HTMLMETA: ""
+PRIVATEDECLARATION: ""
+GROUP: ""
+INDEXGROUP: ""
+THROWS: ""
+XMLTHROWS: ""
+UPDATED: ""
+LINKAGESTATE: ""
+ACCESSCONTROL: ""
+AVAILABILITY: ""
+LINKUID: ""
+ORIGCLASS: ""
+ISDEFINE: ""
+ISTEMPLATE: ""
+VALUE: "UNKNOWN"
+RETURNTYPE: ""
+LINENUM: ""
+CLASS: "HeaderDoc::Header"
+MASTERENUM: ""
+APIREFSETUPDONE: "1"
+TPCDONE: ""
+NOREGISTERUID: ""
+SUPPRESSCHILDREN: ""
+NAMELINE_DISCUSSION: ""
+HIDEDOC: ""
+HIDESINGLETONS: ""
+HIDECONTENTS: ""
+MAINOBJECT: ""
+LIST ATTRIBUTES: 
+SHORT ATTRIBUTES: 
+LONG ATTRIBUTES: 
+    TREE COUNT: 1
+    INDEX GROUP: 
+    IS BLOCK: 
+    OBJECT TYPE: HeaderDoc::CPPClass
+    NAME: tellScript
+    APIUID: //test_ref/applescript/cl/tellScript
+    ABSTRACT: ""
+    DISCUSSION: "<p>script to test "tell" parsing."
+    UPDATED: ""
+    COPYRIGHT: ""
+    HTMLMETA: ""
+    PRIVATEDECLARATION: ""
+    GROUP: ""
+    INDEXGROUP: ""
+    THROWS: ""
+    XMLTHROWS: ""
+    UPDATED: ""
+    LINKAGESTATE: ""
+    ACCESSCONTROL: ""
+    AVAILABILITY: ""
+    LINKUID: ""
+    ORIGCLASS: ""
+    ISDEFINE: ""
+    ISTEMPLATE: ""
+    VALUE: "UNKNOWN"
+    RETURNTYPE: ""
+    LINENUM: ""
+    CLASS: "HeaderDoc::CPPClass"
+    MASTERENUM: ""
+    APIREFSETUPDONE: "1"
+    TPCDONE: ""
+    NOREGISTERUID: ""
+    SUPPRESSCHILDREN: "0"
+    NAMELINE_DISCUSSION: ""
+    HIDEDOC: ""
+    HIDESINGLETONS: ""
+    HIDECONTENTS: ""
+    MAINOBJECT: ""
+    LIST ATTRIBUTES: 
+    SHORT ATTRIBUTES: <p><b>Declared In</b></p><p><a href="../../index.html" logicalPath="//test_ref/doc/header/AppleScript_tell_1.test" target="_top" machineGenerated="true">AppleScript tell 1</a></p>
+
+    LONG ATTRIBUTES: 
+        TREE COUNT: 1
+        INDEX GROUP: 
+        IS BLOCK: 
+        OBJECT TYPE: HeaderDoc::Function
+        NAME: tellFoo
+        APIUID: //test_ref/applescript/instm/tellScript/tellFoo//()
+        ABSTRACT: "<p>tests tell. "
+        DISCUSSION: "<p></p>"
+        UPDATED: ""
+        COPYRIGHT: ""
+        HTMLMETA: ""
+        PRIVATEDECLARATION: ""
+        GROUP: ""
+        INDEXGROUP: ""
+        THROWS: ""
+        XMLTHROWS: ""
+        UPDATED: ""
+        LINKAGESTATE: ""
+        ACCESSCONTROL: ""
+        AVAILABILITY: ""
+        LINKUID: ""
+        ORIGCLASS: ""
+        ISDEFINE: ""
+        ISTEMPLATE: ""
+        VALUE: "UNKNOWN"
+        RETURNTYPE: ""
+        LINENUM: ""
+        CLASS: "HeaderDoc::Function"
+        MASTERENUM: ""
+        APIREFSETUPDONE: "1"
+        TPCDONE: ""
+        NOREGISTERUID: ""
+        SUPPRESSCHILDREN: "0"
+        NAMELINE_DISCUSSION: ""
+        HIDEDOC: ""
+        HIDESINGLETONS: ""
+        HIDECONTENTS: ""
+        MAINOBJECT: ""
+        LIST ATTRIBUTES: 
+        SHORT ATTRIBUTES: 
+        LONG ATTRIBUTES: 
+        TREE COUNT: 1
+        INDEX GROUP: 
+        IS BLOCK: 
+        OBJECT TYPE: HeaderDoc::Function
+        NAME: afterTellFoo
+        APIUID: //test_ref/applescript/instm/tellScript/afterTellFoo//()
+        ABSTRACT: "<p>After "
+        DISCUSSION: "<p></p>"
+        UPDATED: ""
+        COPYRIGHT: ""
+        HTMLMETA: ""
+        PRIVATEDECLARATION: ""
+        GROUP: ""
+        INDEXGROUP: ""
+        THROWS: ""
+        XMLTHROWS: ""
+        UPDATED: ""
+        LINKAGESTATE: ""
+        ACCESSCONTROL: ""
+        AVAILABILITY: ""
+        LINKUID: ""
+        ORIGCLASS: ""
+        ISDEFINE: ""
+        ISTEMPLATE: ""
+        VALUE: "UNKNOWN"
+        RETURNTYPE: ""
+        LINENUM: ""
+        CLASS: "HeaderDoc::Function"
+        MASTERENUM: ""
+        APIREFSETUPDONE: "1"
+        TPCDONE: ""
+        NOREGISTERUID: ""
+        SUPPRESSCHILDREN: "0"
+        NAMELINE_DISCUSSION: ""
+        HIDEDOC: ""
+        HIDESINGLETONS: ""
+        HIDECONTENTS: ""
+        MAINOBJECT: ""
+        LIST ATTRIBUTES: 
+        SHORT ATTRIBUTES: 
+        LONG ATTRIBUTES: 
+-=: NAMED OBJECT PARSE TREES :=-
+OBJECT: tellScript (HeaderDoc::CPPClass)
++---script
++--- 
++---tellScript
++---[ NEWLINE ]
+|   +---        
+|   +-*-property (HAS STATE)
+|   +--- 
+|   +---_foo
+|   +--- 
+|   +---:
+|   +--- 
+|   +---missing
+|   +--- 
+|   +---value
+|   +---[ NEWLINE ]
+-=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
+|   +---[ NEWLINE ]
+|   +---(*
+|   |   +---!
+|   |   +--- @abstract tests tell. 
+|   |   +---*)
+|   +---[ NEWLINE ]
+|   +---        
+|   +-*-on (HAS STATE)
+|   +--- 
+|   +---tellFoo
+|   +---(
+|   |   +---)
+|   +---                
+|   +---tell
+|   |   +--- 
+|   |   +---my
+|   |   +--- 
+|   |   +---_foo
+|   |   +---[ NEWLINE ]
+|   |   +---                        
+|   |   +---set
+|   |   +--- 
+|   |   +---bar
+|   |   +--- 
+|   |   +---to
+|   |   +--- 
+|   |   +---"
+|   |   |   +---baz
+|   |   |   +---"
+|   |   +---[ NEWLINE ]
+|   |   +---                        
+|   |   +---set
+|   |   +--- 
+|   |   +---baz
+|   |   +--- 
+|   |   +---to
+|   |   +--- 
+|   |   +---"
+|   |   |   +---bar
+|   |   |   +---"
+|   |   +--- 
+|   |   +---&
+|   |   +--- 
+|   |   +---"
+|   |   |   +---baz
+|   |   |   +---"
+|   |   +---[ NEWLINE ]
+|   |   +---                
+|   |   +---end
+|   |   +--- 
+|   |   +---tell
+|   +---[ NEWLINE ]
+|   +---        
+|   +---end
+|   +--- 
+|   +---[ NEWLINE ]
+|   +---[ NEWLINE ]
+|   +---(*
+|   |   +---!
+|   |   +--- @abstract After 
+|   |   +---*)
+|   +---[ NEWLINE ]
+|   +---        
+|   +-*-on (HAS STATE)
+|   +--- 
+|   +---afterTellFoo
+|   +---(
+|   |   +---)
+|   +---        
+|   +---end
+|   +--- 
+|   +---[ NEWLINE ]
+|   +---end
+|   +--- 
+|   +---script
++---[ NEWLINE ]
+END OF OBJECT
+
+
+OBJECT: tellFoo (HeaderDoc::Function)
++-*-on (HAS STATE)
++--- 
++---tellFoo
++---(
+|   +---)
++---                
++---tell
+|   +--- 
+|   +---my
+|   +--- 
+|   +---_foo
+|   +---[ NEWLINE ]
+|   +---                        
+|   +---set
+|   +--- 
+|   +---bar
+|   +--- 
+|   +---to
+|   +--- 
+|   +---"
+|   |   +---baz
+|   |   +---"
+|   +---[ NEWLINE ]
+|   +---                        
+|   +---set
+|   +--- 
+|   +---baz
+|   +--- 
+|   +---to
+|   +--- 
+|   +---"
+|   |   +---bar
+|   |   +---"
+|   +--- 
+|   +---&
+|   +--- 
+|   +---"
+|   |   +---baz
+|   |   +---"
+|   +---[ NEWLINE ]
+|   +---                
+|   +---end
+|   +--- 
+|   +---tell
++---[ NEWLINE ]
++---        
++---end
++--- 
+-=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
++---[ NEWLINE ]
++---[ NEWLINE ]
++---(*
+|   +---!
+|   +--- @abstract After 
+|   +---*)
++---[ NEWLINE ]
++---        
++-*-on (HAS STATE)
++--- 
++---afterTellFoo
++---(
+|   +---)
++---        
++---end
++--- 
++---[ NEWLINE ]
++---end
++--- 
++---script
+END OF OBJECT
+
+
+OBJECT: afterTellFoo (HeaderDoc::Function)
++-*-on (HAS STATE)
++--- 
++---afterTellFoo
++---(
+|   +---)
++---        
++---end
++--- 
+-=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
++---[ NEWLINE ]
++---end
++--- 
++---script
+END OF OBJECT
+
+
+
+-=: HTML OUTPUT OF PARSE TREES :=-
+OBJECT: tellScript (HeaderDoc::CPPClass)
+	<span class="keyword">script</span> <!-- a logicalPath="//test_ref/applescript/econst/tellScript //test_ref/applescript/data/tellScript //test_ref/applescript/clconst/tellScript " machineGenerated="true" --><span class="var">tellScript</span><!-- /a --> 
+END OF OBJECT
+
+
+OBJECT: tellFoo (HeaderDoc::Function)
+	<span class="keyword">on</span> <!-- a logicalPath="//test_ref/applescript/instm/tellScript/tellFoo //test_ref/applescript/clm/tellScript/tellFoo //test_ref/applescript/intfcm/tellScript/tellFoo //test_ref/applescript/intfm/tellScript/tellFoo //test_ref/applescript/func/tellFoo //test_ref/applescript/ftmplt/tellScript/tellFoo //test_ref/applescript/defn/tellFoo //test_ref/applescript/macro/tellFoo //test_ref/doc/anysymbol/tellFoo" machineGenerated="true" --><span class="function">tellFoo</span><!-- /a -->()
+END OF OBJECT
+
+
+OBJECT: afterTellFoo (HeaderDoc::Function)
+	<span class="keyword">on</span> <!-- a logicalPath="//test_ref/applescript/instm/tellScript/afterTellFoo //test_ref/applescript/clm/tellScript/afterTellFoo //test_ref/applescript/intfcm/tellScript/afterTellFoo //test_ref/applescript/intfm/tellScript/afterTellFoo //test_ref/applescript/func/afterTellFoo //test_ref/applescript/ftmplt/tellScript/afterTellFoo //test_ref/applescript/defn/afterTellFoo //test_ref/applescript/macro/afterTellFoo //test_ref/doc/anysymbol/afterTellFoo" machineGenerated="true" --><span class="function">afterTellFoo</span><!-- /a -->()
+END OF OBJECT
+
+
+
+__$100|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/AppleScript_tell_1.test$11|applescript$18|AppleScript tell 1$11|applescript$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/AppleScript_try_1.test headerdoc-8.9.20/testsuite/parser_tests/AppleScript_try_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/AppleScript_try_1.test	1969-12-31 16:00:00.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/AppleScript_try_1.test	2014-02-19 09:31:19.000000000 -0800
@@ -0,0 +1,447 @@
+FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$304|on applescript_try_1(s)
+        if s ends with linefeed or s ends with return then
+                try
+                        text 1 thru -2 of s
+                on error -- Bare NL/CR
+                        ""
+                end try
+        else
+                s
+        end if
+end applescript_if_1
+$38|(*! Testing AppleScript try blocks *)
+$0|$9365|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+inHeader: 0
+inClass: 0
+inInterface: 0
+inCPPHeader: 0
+inOCCHeader: 0
+inPerlScript: 0
+inShellScript: 0
+inPHPScript: 0
+inJavaSource: 0
+inFunctionGroup: 0
+inGroup: 0
+inFunction: 0
+inPDefine: 0
+inTypedef: 0
+inUnion: 0
+inStruct: 0
+inConstant: 0
+inVar: 0
+inEnum: 0
+inMethod: 0
+inAvailabilityMacro: 0
+inUnknown: 1
+classType: unknown
+inputCounter: 0
+blockOffset: 0
+fullpath: /test_suite_bogus_path/AppleScript_try_1.test
+-=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
+$parserState->{FULLPATH} => /test_suite_bogus_path/AppleScript_try_1.test
+$parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
+$parserState->{availability} => 
+$parserState->{backslashcount} => 0
+$parserState->{basetype} => 
+$parserState->{bracePending} => 0
+$parserState->{callbackIsTypedef} => 0
+$parserState->{callbackName} => 
+$parserState->{callbackNamePending} => -1
+$parserState->{categoryClass} => 
+$parserState->{classtype} => 
+$parserState->{freezeStack} => ARRAY(OBJID)
+$parserState->{freezereturn} => 1
+$parserState->{frozensodname} => applescript_try_1
+$parserState->{functionContents} => 
+applescript_if_1
+
+$parserState->{functionReturnsCallback} => 0
+$parserState->{hollow} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{inBrackets} => 0
+$parserState->{inChar} => 0
+$parserState->{inClass} => 0
+$parserState->{inComment} => 0
+$parserState->{inGiven} => 0
+$parserState->{inInlineComment} => 0
+$parserState->{inLabel} => 0
+$parserState->{inMacro} => 0
+$parserState->{inMacroLine} => 0
+$parserState->{inOfIn} => 0
+$parserState->{inOperator} => 0
+$parserState->{inPrivateParamTypes} => 0
+$parserState->{inString} => 0
+$parserState->{inTemplate} => 0
+$parserState->{initbsCount} => 0
+$parserState->{inputCounter} => 11
+$parserState->{kr_c_function} => 0
+$parserState->{kr_c_name} => 
+$parserState->{lang} => applescript
+$parserState->{lastDisplayNode} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{lastTreeNode} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{lastsymbol} => 
+$parserState->{macroNoTrunc} => 1
+$parserState->{name} => applescript_try_1
+$parserState->{namePending} => 0
+$parserState->{noInsert} => 0
+$parserState->{occmethod} => 0
+$parserState->{occmethodname} => 
+$parserState->{occparmlabelfound} => 3
+$parserState->{onlyComments} => 0
+$parserState->{parsedParamAtBrace} => ARRAY(OBJID)
+$parserState->{parsedParamList} => ARRAY(OBJID)
+$parserState->{parsedParamParse} => 0
+$parserState->{parsedParamStateAtBrace} => ARRAY(OBJID)
+$parserState->{posstypes} => 
+$parserState->{posstypesPending} => 0
+$parserState->{pplStack} => ARRAY(OBJID)
+$parserState->{preEqualsSymbol} => 
+$parserState->{preTemplateSymbol} => 
+$parserState->{prekeywordsodname} => 
+$parserState->{prekeywordsodtype} => 
+$parserState->{pushedfuncbrace} => 2
+$parserState->{returntype} => on
+$parserState->{seenBraces} => 1
+$parserState->{seenMacroPart} => 0
+$parserState->{seenTilde} => 0
+$parserState->{simpleTDcontents} => 
+$parserState->{simpleTypedef} => 0
+$parserState->{sodclass} => function
+$parserState->{sodname} => applescript_try_1
+$parserState->{sodtype} => 
+$parserState->{stackFrozen} => 1
+$parserState->{startOfDec} => 0
+$parserState->{storeDec} =>  on applescript_try_1(
+
+$parserState->{sublang} => applescript
+$parserState->{treePopTwo} => 0
+$parserState->{typestring} => function
+$parserState->{value} => 
+$parserState->{valuepending} => 0
+-=: BLOCKPARSE RETURN VALUES :=-
+newcount: 11
+typelist: function
+namelist: applescript_try_1
+posstypes: function method 
+value: 
+returntype: 
+pridec: 
+simpleTDcontents: 
+bpavail: 
+blockOffset: 0
+conformsToList: 
+functionContents: 
+applescript_if_1
+
+extendsClass: 
+implementsClass: 
+-=: LIST OF PARSED PARAMETERS :=-
+Parsed Param 0 => s
+-=: DUMP OF PARSE TREE :=-
++---on
++--- 
++---applescript_try_1
++---(
+|   +---s
+|   +---)
++---        
++-*-if (HAS STATE)
++--- 
++---s
++--- 
++---ends
++--- 
++---with
++--- 
++---linefeed
++--- 
++---or
++--- 
++---s
++--- 
++---ends
++--- 
++---with
++--- 
++---return
++--- 
++---then
++---[ NEWLINE ]
++---                
++---try
+|   +---[ NEWLINE ]
+|   +---                        
+|   +---text
+|   +--- 
+|   +---1
+|   +--- 
+|   +---thru
+|   +--- 
+|   +----
+|   +---2
+|   +--- 
+|   +---of
+|   +--- 
+|   +---s
+|   +---[ NEWLINE ]
+|   +---                
+|   +---on
+|   +--- 
+|   +---error
+|   +--- 
+|   +-----
+|   |   +--- 
+|   |   +---Bare NL/CR
+|   |   +---[ NEWLINE ]
+|   +---                        
+|   +---"
+|   |   +---"
+|   +---[ NEWLINE ]
+|   +---                
+|   +---end
+|   +--- 
+|   +---try
++---[ NEWLINE ]
++---        
++---else
++---[ NEWLINE ]
++---                
++---s
++---[ NEWLINE ]
++---        
++---end
++--- 
++---if
++---[ NEWLINE ]
++---end
++--- 
+-=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
+-=: COMPUTED VALUE :=-
+SUCCESS: 0
+VALUE: 0
+-=: CPP CHANGES :=-
+NO CPP CHANGES
+-=: FOUND MATCH :=-
+1
+-=: NAMED OBJECTS :=-
+TREE COUNT: 0
+INDEX GROUP: 
+IS BLOCK: 
+OBJECT TYPE: HeaderDoc::Header
+NAME: AppleScript try 1
+APIUID: //test_ref/doc/header/AppleScript_try_1.test
+ABSTRACT: ""
+DISCUSSION: "<p></p>"
+UPDATED: ""
+COPYRIGHT: ""
+HTMLMETA: ""
+PRIVATEDECLARATION: ""
+GROUP: ""
+INDEXGROUP: ""
+THROWS: ""
+XMLTHROWS: ""
+UPDATED: ""
+LINKAGESTATE: ""
+ACCESSCONTROL: ""
+AVAILABILITY: ""
+LINKUID: ""
+ORIGCLASS: ""
+ISDEFINE: ""
+ISTEMPLATE: ""
+VALUE: "UNKNOWN"
+RETURNTYPE: ""
+LINENUM: ""
+CLASS: "HeaderDoc::Header"
+MASTERENUM: ""
+APIREFSETUPDONE: "1"
+TPCDONE: ""
+NOREGISTERUID: ""
+SUPPRESSCHILDREN: ""
+NAMELINE_DISCUSSION: ""
+HIDEDOC: ""
+HIDESINGLETONS: ""
+HIDECONTENTS: ""
+MAINOBJECT: ""
+LIST ATTRIBUTES: 
+SHORT ATTRIBUTES: 
+LONG ATTRIBUTES: 
+    TREE COUNT: 1
+    INDEX GROUP: 
+    IS BLOCK: 
+    OBJECT TYPE: HeaderDoc::Function
+    NAME: applescript_try_1
+    APIUID: //test_ref/applescript/func/applescript_try_1
+    ABSTRACT: ""
+    DISCUSSION: "<p>Testing AppleScript try blocks"
+    UPDATED: ""
+    COPYRIGHT: ""
+    HTMLMETA: ""
+    PRIVATEDECLARATION: ""
+    GROUP: "default_function_group"
+    INDEXGROUP: ""
+    THROWS: ""
+    XMLTHROWS: ""
+    UPDATED: ""
+    LINKAGESTATE: ""
+    ACCESSCONTROL: ""
+    AVAILABILITY: ""
+    LINKUID: ""
+    ORIGCLASS: ""
+    ISDEFINE: ""
+    ISTEMPLATE: ""
+    VALUE: "UNKNOWN"
+    RETURNTYPE: ""
+    LINENUM: ""
+    CLASS: "HeaderDoc::Function"
+    MASTERENUM: ""
+    APIREFSETUPDONE: "1"
+    TPCDONE: ""
+    NOREGISTERUID: ""
+    SUPPRESSCHILDREN: "0"
+    NAMELINE_DISCUSSION: ""
+    HIDEDOC: ""
+    HIDESINGLETONS: ""
+    HIDECONTENTS: ""
+    MAINOBJECT: ""
+    LIST ATTRIBUTES: 
+    SHORT ATTRIBUTES: 
+    LONG ATTRIBUTES: 
+    PARSED PARAMETERS:
+        TREE COUNT: 0
+        INDEX GROUP: 
+        IS BLOCK: 
+        OBJECT TYPE: HeaderDoc::MinorAPIElement
+        NAME: 
+        TYPE:  s
+        APIUID: //test_ref/applescript/internal_temporary_object/
+        ABSTRACT: ""
+        DISCUSSION: "<p></p>"
+        UPDATED: ""
+        COPYRIGHT: ""
+        HTMLMETA: ""
+        PRIVATEDECLARATION: ""
+        GROUP: ""
+        INDEXGROUP: ""
+        THROWS: ""
+        XMLTHROWS: ""
+        UPDATED: ""
+        LINKAGESTATE: ""
+        ACCESSCONTROL: ""
+        AVAILABILITY: ""
+        LINKUID: ""
+        ORIGCLASS: ""
+        ISDEFINE: ""
+        ISTEMPLATE: ""
+        VALUE: "UNKNOWN"
+        RETURNTYPE: ""
+        LINENUM: ""
+        CLASS: "HeaderDoc::MinorAPIElement"
+        MASTERENUM: ""
+        APIREFSETUPDONE: "1"
+        TPCDONE: ""
+        NOREGISTERUID: ""
+        SUPPRESSCHILDREN: ""
+        NAMELINE_DISCUSSION: ""
+        HIDEDOC: ""
+        HIDESINGLETONS: ""
+        HIDECONTENTS: ""
+        MAINOBJECT: ""
+        LIST ATTRIBUTES: 
+        SHORT ATTRIBUTES: 
+        LONG ATTRIBUTES: 
+-=: NAMED OBJECT PARSE TREES :=-
+OBJECT: applescript_try_1 (HeaderDoc::Function)
++---on
++--- 
++---applescript_try_1
++---(
+|   +---s
+|   +---)
++---        
++-*-if (HAS STATE)
++--- 
++---s
++--- 
++---ends
++--- 
++---with
++--- 
++---linefeed
++--- 
++---or
++--- 
++---s
++--- 
++---ends
++--- 
++---with
++--- 
++---return
++--- 
++---then
++---[ NEWLINE ]
++---                
++---try
+|   +---[ NEWLINE ]
+|   +---                        
+|   +---text
+|   +--- 
+|   +---1
+|   +--- 
+|   +---thru
+|   +--- 
+|   +----
+|   +---2
+|   +--- 
+|   +---of
+|   +--- 
+|   +---s
+|   +---[ NEWLINE ]
+|   +---                
+|   +---on
+|   +--- 
+|   +---error
+|   +--- 
+|   +-----
+|   |   +--- 
+|   |   +---Bare NL/CR
+|   |   +---[ NEWLINE ]
+|   +---                        
+|   +---"
+|   |   +---"
+|   +---[ NEWLINE ]
+|   +---                
+|   +---end
+|   +--- 
+|   +---try
++---[ NEWLINE ]
++---        
++---else
++---[ NEWLINE ]
++---                
++---s
++---[ NEWLINE ]
++---        
++---end
++--- 
++---if
++---[ NEWLINE ]
++---end
++--- 
+-=-=-=-=-=-=- EODEC -=-=-=-=-=-=-
+END OF OBJECT
+
+
+
+-=: HTML OUTPUT OF PARSE TREES :=-
+OBJECT: applescript_try_1 (HeaderDoc::Function)
+	<span class="keyword">on</span> <!-- a logicalPath="//test_ref/applescript/instm/applescript_try_1 //test_ref/applescript/clm/applescript_try_1 //test_ref/applescript/intfcm/applescript_try_1 //test_ref/applescript/intfm/applescript_try_1 //test_ref/applescript/func/applescript_try_1 //test_ref/applescript/ftmplt/applescript_try_1 //test_ref/applescript/defn/applescript_try_1 //test_ref/applescript/macro/applescript_try_1 //test_ref/doc/anysymbol/applescript_try_1" machineGenerated="true" --><span class="function">applescript_try_1</span><!-- /a -->(
+	    <span class="param">s</span>)
+END OF OBJECT
+
+
+
+_$16|Tests "end try"
+$22|AppleScript_try_1.test$11|applescript$17|AppleScript try 1$11|applescript$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/COM_interface_1.test headerdoc-8.9.20/testsuite/parser_tests/COM_interface_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/COM_interface_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/COM_interface_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -930,7 +930,7 @@
 	</ul>
 
 */
-$0|$1967333|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$1967441|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 1
@@ -958,8 +958,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/COM_interface_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/COM_interface_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -46723,7 +46726,7 @@
 
 
 
-$1967333|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$1967441|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 1
@@ -46751,8 +46754,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/COM_interface_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/COM_interface_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/C_shell_variable_1.test headerdoc-8.9.20/testsuite/parser_tests/C_shell_variable_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/C_shell_variable_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/C_shell_variable_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -2,7 +2,7 @@
 CSH_VAR6="foo"
 # this should not be part of the block.
 $20|# /*! Variable 1 */
-$0|$5992|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6100|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/C_shell_variable_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/C_shell_variable_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{afterSemi} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/C_shell_variable_2.test headerdoc-8.9.20/testsuite/parser_tests/C_shell_variable_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/C_shell_variable_2.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/C_shell_variable_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$57|set CSH_VAR2='\'
 # this should not be part of the block.
 $20|# /*! Variable 2 */
-$0|$5545|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5653|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/C_shell_variable_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/C_shell_variable_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{afterSemi} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/C_shell_variable_3.test headerdoc-8.9.20/testsuite/parser_tests/C_shell_variable_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/C_shell_variable_3.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/C_shell_variable_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$62|set CSH_VAR3="TEST"\"
 # this should not be part of the block.
 $20|# /*! Variable 3 */
-$0|$5628|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5736|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/C_shell_variable_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/C_shell_variable_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{afterSemi} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/C_shell_variable_4.test headerdoc-8.9.20/testsuite/parser_tests/C_shell_variable_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/C_shell_variable_4.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/C_shell_variable_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$62|set CSH_VAR4='TEST'\'
 # this should not be part of the block.
 $20|# /*! Variable 4 */
-$0|$5626|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5734|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/C_shell_variable_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/C_shell_variable_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{afterSemi} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/C_shell_variable_5.test headerdoc-8.9.20/testsuite/parser_tests/C_shell_variable_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/C_shell_variable_5.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/C_shell_variable_5.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$70|setenv CSH_VAR5 "We made it!"
 # this should not be part of the block.
 $20|# /*! Variable 5 */
-$0|$6185|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6293|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/C_shell_variable_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/C_shell_variable_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{afterSemi} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/C_shell_variable_6.test headerdoc-8.9.20/testsuite/parser_tests/C_shell_variable_6.test
--- headerdoc-8.9.14/testsuite/parser_tests/C_shell_variable_6.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/C_shell_variable_6.test	2013-05-14 15:12:53.000000000 -0700
@@ -2,7 +2,7 @@
 Last"
 C_SHELL_VAR_ACROSS_NL_NOT_PART="blah"
 $40|# /*! This extends across a newline. */
-$0|$5770|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5878|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/C_shell_variable_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/C_shell_variable_6.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{afterSemi} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/C_shell_variable_7.test headerdoc-8.9.20/testsuite/parser_tests/C_shell_variable_7.test
--- headerdoc-8.9.14/testsuite/parser_tests/C_shell_variable_7.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/C_shell_variable_7.test	2013-05-14 15:12:53.000000000 -0700
@@ -2,7 +2,7 @@
 Last'
 C_SHELL_VAR_ACROSS_NL_B_NOT_PART="blah"
 $40|# /*! This extends across a newline. */
-$0|$5794|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5902|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/C_shell_variable_7.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/C_shell_variable_7.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{afterSemi} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/C_source_1.test headerdoc-8.9.20/testsuite/parser_tests/C_source_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/C_source_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/C_source_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -2,7 +2,7 @@
 $75|/*! @function ansifunc
     @discussion test of ANSI C and K&R C mixed.
  */
-$0|$8748|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8856|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/C_source_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/C_source_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -341,7 +344,7 @@
 
 
 
-$8748|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8856|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -369,8 +372,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/C_source_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/C_source_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/C_source_2.test headerdoc-8.9.20/testsuite/parser_tests/C_source_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/C_source_2.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/C_source_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -12,7 +12,7 @@
 $54|/*! @function main
     @discussion doesn't do much
 */
-$0|$10987|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$11095|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -40,8 +40,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/C_source_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/C_source_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -463,7 +466,7 @@
 
 
 
-$10987|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$11095|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -491,8 +494,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/C_source_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/C_source_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/JavaScript_function_1.test headerdoc-8.9.20/testsuite/parser_tests/JavaScript_function_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/JavaScript_function_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/JavaScript_function_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -27,7 +27,7 @@
  * Returns a string containing value of specified cookie,
  *   or null if cookie does not exist.
  */
-$0|$8031|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8145|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -55,8 +55,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/JavaScript_function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/JavaScript_function_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -149,7 +152,7 @@
 newcount: 21
 typelist: function
 namelist: getCookie
-posstypes: function method
+posstypes: function method class
 value: 
 returntype:  function
 pridec: 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/JavaScript_function_2.test headerdoc-8.9.20/testsuite/parser_tests/JavaScript_function_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/JavaScript_function_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/JavaScript_function_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -9,7 +9,7 @@
 $96|/*! Passes clicks through the "Do not save" image to the link of
     the image behind it. 
  */ 
-$0|$7504|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7618|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -37,8 +37,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/JavaScript_function_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/JavaScript_function_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -119,7 +122,7 @@
 newcount: 8
 typelist: function
 namelist: clickthru
-posstypes: function method
+posstypes: function method class
 value: 
 returntype:  function
 pridec: 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/JavaScript_function_3.test headerdoc-8.9.20/testsuite/parser_tests/JavaScript_function_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/JavaScript_function_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/JavaScript_function_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -6,7 +6,7 @@
         
 }       
 $47|/*! Logs something in the FireFox console.  */
-$0|$7553|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7667|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,8 +34,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/JavaScript_function_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/JavaScript_function_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -114,7 +117,7 @@
 newcount: 7
 typelist: function
 namelist: ff_consolelog
-posstypes: function method
+posstypes: function method class
 value: 
 returntype:  function
 pridec: 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/JavaScript_not_a_regexp.test headerdoc-8.9.20/testsuite/parser_tests/JavaScript_not_a_regexp.test
--- headerdoc-8.9.14/testsuite/parser_tests/JavaScript_not_a_regexp.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/JavaScript_not_a_regexp.test	2013-05-14 15:12:53.000000000 -0700
@@ -6,7 +6,7 @@
 $22|/**
         Class
  */
-$0|$6243|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6357|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,8 +34,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/JavaScript_not_a_regexp.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/JavaScript_not_a_regexp.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -115,7 +118,7 @@
 newcount: 5
 typelist: function
 namelist: not_a_regexp.nare_Class
-posstypes: function method
+posstypes: function method class
 value: 
 returntype: 
 pridec: 
@@ -250,4 +253,4 @@
 
 _$65|This should be parsed as a comment, not
 as a regular expression.
-$28|JavaScript_not_a_regexp.test$4|java$23|JavaScript not a regexp$10|javascript$6|parser
\ No newline at end of file
+$105|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/JavaScript_not_a_regexp.test$4|java$23|JavaScript not a regexp$10|javascript$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/JavaScript_regex_1.test headerdoc-8.9.20/testsuite/parser_tests/JavaScript_regex_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/JavaScript_regex_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/JavaScript_regex_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -7,7 +7,7 @@
 $22|/*!
     jsRegExp 
  */
-$0|$8179|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8293|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -35,8 +35,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/JavaScript_regex_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/JavaScript_regex_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -113,7 +116,7 @@
 newcount: 6
 typelist: function
 namelist: jsRegExp
-posstypes: function method
+posstypes: function method class
 value: 
 returntype:  function
 pridec: 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/JavaScript_variable_1.test headerdoc-8.9.20/testsuite/parser_tests/JavaScript_variable_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/JavaScript_variable_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/JavaScript_variable_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$27|var global_dragobj = null;
 $53|/*! An object used for the drag and drop handler. */
-$0|$5763|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5871|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/JavaScript_variable_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/JavaScript_variable_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/JavaScript_variable_2.test headerdoc-8.9.20/testsuite/parser_tests/JavaScript_variable_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/JavaScript_variable_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/JavaScript_variable_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$9|foo = 3;
 $44|/*! A test case without the var keyword. */
-$0|$5426|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5534|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/JavaScript_variable_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/JavaScript_variable_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Java_class_1.test headerdoc-8.9.20/testsuite/parser_tests/Java_class_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Java_class_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Java_class_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -3,7 +3,7 @@
      void foo() {...}
 } 
 $28|/** Java class example 1 */
-$0|$10447|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10555|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,9 +31,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_class_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_class_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -348,7 +351,7 @@
 
 
 
-$10447|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10555|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -376,9 +379,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_class_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_class_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Java_class_2.test headerdoc-8.9.20/testsuite/parser_tests/Java_class_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Java_class_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Java_class_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -5,7 +5,7 @@
      void bar();
 }
 $28|/** Java class example 2 */
-$0|$15870|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$15978|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,9 +33,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_class_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_class_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -476,7 +479,7 @@
 
 
 
-$15870|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$15978|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -504,9 +507,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_class_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_class_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Java_class_3.test headerdoc-8.9.20/testsuite/parser_tests/Java_class_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/Java_class_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Java_class_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -5,7 +5,7 @@
      void bar();
 }
 $28|/** Java class example 3 */
-$0|$12220|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$12328|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,9 +33,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_class_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_class_3.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -442,7 +445,7 @@
 
 
 
-$12220|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$12328|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -470,9 +473,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_class_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_class_3.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Java_class_4.test headerdoc-8.9.20/testsuite/parser_tests/Java_class_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/Java_class_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Java_class_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -5,7 +5,7 @@
      void bar();
 }
 $28|/** Java class example 4 */
-$0|$12205|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$12313|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,9 +33,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_class_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_class_4.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -442,7 +445,7 @@
 
 
 
-$12205|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$12313|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -470,9 +473,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_class_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_class_4.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Java_class_5.test headerdoc-8.9.20/testsuite/parser_tests/Java_class_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/Java_class_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Java_class_5.test	2013-05-14 15:12:53.000000000 -0700
@@ -5,7 +5,7 @@
      void bar();
 }
 $28|/** Java class example 5 */
-$0|$12220|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$12328|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,9 +33,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_class_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_class_5.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -442,7 +445,7 @@
 
 
 
-$12220|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$12328|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -470,9 +473,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_class_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_class_5.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Java_class_6.test headerdoc-8.9.20/testsuite/parser_tests/Java_class_6.test
--- headerdoc-8.9.14/testsuite/parser_tests/Java_class_6.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Java_class_6.test	2013-05-14 15:12:53.000000000 -0700
@@ -5,7 +5,7 @@
      void bar();
 }
 $28|/*! Java class example 6 */
-$0|$12220|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$12328|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,9 +33,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_class_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_class_6.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -442,7 +445,7 @@
 
 
 
-$12220|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$12328|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -470,9 +473,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_class_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_class_6.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Java_function_1.test headerdoc-8.9.20/testsuite/parser_tests/Java_function_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Java_function_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Java_function_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -13,7 +13,7 @@
   // break comes here if it runs
 }
 $23|/** Java function 1 */
-$0|$9455|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9563|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -41,8 +41,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_function_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -382,7 +385,7 @@
 
 
 
-$9455|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9563|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -410,8 +413,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_function_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Java_function_2.test headerdoc-8.9.20/testsuite/parser_tests/Java_function_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Java_function_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Java_function_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$84|public void drawPolygon (Point p1, Point p2, Point p3, Point... otherPoints) {…}
 
 $24|/*! varargs function */
-$0|$11937|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$12045|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_function_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_function_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -452,7 +455,7 @@
 
 
 
-$11937|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$12045|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -480,8 +483,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_function_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_function_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Java_interface_1.test headerdoc-8.9.20/testsuite/parser_tests/Java_interface_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Java_interface_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Java_interface_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -3,7 +3,7 @@
      void foo();
 }
 $32|/** Java interface example 1 */
-$0|$9194|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9302|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,9 +31,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_interface_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_interface_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -332,7 +335,7 @@
 
 
 
-$9194|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9302|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -360,9 +363,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_interface_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_interface_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Java_interface_2.test headerdoc-8.9.20/testsuite/parser_tests/Java_interface_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Java_interface_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Java_interface_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -3,7 +3,7 @@
      void bar();
 }
 $32|/*! Java interface example 2 */
-$0|$9150|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9258|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,9 +31,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_interface_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_interface_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -332,7 +335,7 @@
 
 
 
-$9150|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9258|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -360,9 +363,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_interface_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_interface_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Java_variable_1.test headerdoc-8.9.20/testsuite/parser_tests/Java_variable_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Java_variable_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Java_variable_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$35|SomeClass[] java_2_myArray = null;
 $22|/*! This is a var. */
-$0|$6315|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6423|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_variable_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_variable_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -243,7 +246,7 @@
 
 
 
-$6315|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6423|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -271,8 +274,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_variable_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_variable_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Java_variable_2.test headerdoc-8.9.20/testsuite/parser_tests/Java_variable_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Java_variable_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Java_variable_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$29|myArray = new SomeClass[10];
 $25|/** Another variable. */
-$0|$6009|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6117|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_variable_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_variable_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -242,7 +245,7 @@
 
 
 
-$6009|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6117|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -270,8 +273,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_variable_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_variable_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Java_variable_3.test headerdoc-8.9.20/testsuite/parser_tests/Java_variable_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/Java_variable_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Java_variable_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$48|SomeClass[] java_1_myArray = new SomeClass[10];
 $24|/*! Yet another one. */
-$0|$6639|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6747|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_variable_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_variable_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -253,7 +256,7 @@
 
 
 
-$6639|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6747|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -281,8 +284,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_variable_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_variable_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Java_variable_4.test headerdoc-8.9.20/testsuite/parser_tests/Java_variable_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/Java_variable_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Java_variable_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$97|SomeClass[] Java_5_myarray = new SomeClass[]{new SomeClass(), new SomeClass(), new SomeClass()};
 $28|/*! This is a tough one. */
-$0|$9706|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9814|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_variable_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_variable_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -345,7 +348,7 @@
 
 
 
-$9706|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9814|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -373,8 +376,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Java_variable_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Java_variable_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/MIG_routine_1.test headerdoc-8.9.20/testsuite/parser_tests/MIG_routine_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/MIG_routine_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/MIG_routine_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -8,7 +8,7 @@
  *      to which the target task has access, along with
  *      the type (set or port) for each name.
  */
-$0|$11418|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$11526|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -36,8 +36,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/MIG_routine_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/MIG_routine_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -431,7 +434,7 @@
 
 
 
-$11418|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$11526|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -459,8 +462,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/MIG_routine_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/MIG_routine_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/MIG_routine_2.test headerdoc-8.9.20/testsuite/parser_tests/MIG_routine_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/MIG_routine_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/MIG_routine_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -10,7 +10,7 @@
  *      Like port_allocate_name, but the kernel picks a name.
  *      It can use any name not associated with a right.
  */
-$0|$13203|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$13311|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -38,8 +38,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/MIG_routine_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/MIG_routine_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -495,7 +498,7 @@
 
 
 
-$13203|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$13311|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -523,8 +526,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/MIG_routine_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/MIG_routine_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/MIG_simpleroutine_1.test headerdoc-8.9.20/testsuite/parser_tests/MIG_simpleroutine_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/MIG_simpleroutine_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/MIG_simpleroutine_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -2,7 +2,7 @@
                 audit_port      : mach_port_t;
         in      flags           : int);
 $30|/*! Audit triggers routine */
-$0|$9294|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9402|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/MIG_simpleroutine_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/MIG_simpleroutine_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -358,7 +361,7 @@
 
 
 
-$9294|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9402|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -386,8 +389,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/MIG_simpleroutine_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/MIG_simpleroutine_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/MIG_type_1.test headerdoc-8.9.20/testsuite/parser_tests/MIG_type_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/MIG_type_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/MIG_type_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$27|type clock_flavor_t = int;
 $23|/*! Simple typedef. */
-$0|$5690|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5798|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/MIG_type_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/MIG_type_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -238,7 +241,7 @@
 
 
 
-$5690|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$5798|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -266,8 +269,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/MIG_type_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/MIG_type_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/MIG_type_2.test headerdoc-8.9.20/testsuite/parser_tests/MIG_type_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/MIG_type_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/MIG_type_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$59|type exception_data_t           = array[*:2] of integer_t;
 $22|/*! Exception data */
-$0|$6139|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6247|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/MIG_type_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/MIG_type_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -257,7 +260,7 @@
 
 
 
-$6139|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6247|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -285,8 +288,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/MIG_type_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/MIG_type_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_category_1.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_category_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_category_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_category_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -12,7 +12,7 @@
         @discussion Methods declared in the BoatsCanFly category of the Boats class can only be u
 sed with properly equiped Boat objects.
 */
-$0|$13927|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$14035|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -40,8 +40,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_category_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_category_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -477,7 +480,7 @@
 
 
 
-$13927|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$14035|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -505,8 +508,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_category_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_category_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_category_2.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_category_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_category_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_category_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -11,7 +11,7 @@
         @discussion Methods declared in the Performance category of the Trains class are typicall
 y used during development--to analyze and improve performance.
 */
-$0|$9949|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10057|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -39,8 +39,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_category_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_category_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -367,7 +370,7 @@
 
 
 
-$9949|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10057|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -395,8 +398,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_category_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_category_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_category_3.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_category_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_category_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_category_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -12,7 +12,7 @@
         @abstract The TrainsCanFly category adds levitation methods to the Train class.
         @discussion Methods declared in the TrainsCanFly category of the Train class can only be used with properly equiped Train objects.
 */
-$0|$14007|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$14115|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -40,8 +40,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_category_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_category_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -474,7 +477,7 @@
 
 
 
-$14007|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$14115|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -502,8 +505,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_category_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_category_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_category_4.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_category_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_category_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_category_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -11,7 +11,7 @@
         @abstract The TrainsUnderWater category adds submarine methods to the Train class.
         @discussion Methods declared in the TrainsUnderWater category of the Train class can only be used with properly equiped Train objects and appropriate infrastructure.
 */
-$0|$13943|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$14051|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -39,8 +39,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_category_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_category_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -473,7 +476,7 @@
 
 
 
-$13943|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$14051|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -501,8 +504,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_category_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_category_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_category_5.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_category_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_category_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_category_5.test	2013-05-14 15:12:53.000000000 -0700
@@ -10,7 +10,7 @@
 $96|/*! For some reason, this was flagged as a .h file of concern.  Adding it
     to the tests. */
 
-$0|$12886|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$12994|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -38,9 +38,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_category_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_category_5.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -435,7 +438,7 @@
 
 
 
-$12886|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$12994|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -463,9 +466,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_category_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_category_5.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_1.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -53,7 +53,7 @@
         @discussion An NSBox object is a simple NSView that can do two things:
         It can draw a border around itself, and it can title itself.
 */
-$0|$40362|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$40470|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -81,9 +81,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -1343,7 +1346,7 @@
 
 
 
-$52352|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$52460|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -1371,9 +1374,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_2.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -18,7 +18,7 @@
 
 @end
 $43|/*! A class with no instance variables. */
-$0|$11587|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$11695|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -46,8 +46,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -431,7 +434,7 @@
 
 
 
-$11587|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$11695|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -459,8 +462,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_3.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -53,7 +53,7 @@
         @discussion An NSBox object is a simple NSView that can do two things:
         It can draw a border around itself, and it can title itself.
 */
-$0|$41746|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$41854|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -81,8 +81,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -1353,7 +1356,7 @@
 
 
 
-$54102|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$54210|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -1381,8 +1384,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -3112,4 +3118,4 @@
 
 
 
-_$17|ObjC_class_3.test$1|C$12|ObjC class 3$1|C$6|parser
\ No newline at end of file
+_$94|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/ObjC_class_3.test$1|C$12|ObjC class 3$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_4.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$46|@interface EmptyObjCClassBeta : NSObject
 @end
 $66|/*! A class with no variables, methods, or instance variables. */
-$0|$6983|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7091|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -249,7 +252,7 @@
 
 
 
-$6983|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7091|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -277,8 +280,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_5.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_5.test	2013-05-14 15:12:53.000000000 -0700
@@ -40,7 +40,7 @@
         @discussion An NSBox object is a simple NSView that can do two things:
         It can draw a border around itself, and it can title itself.
 */
-$0|$20633|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$20741|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -68,9 +68,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_5.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -709,7 +712,7 @@
 
 
 
-$32731|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$32839|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -737,9 +740,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_5.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_6.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_6.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_6.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_6.test	2013-05-14 15:12:53.000000000 -0700
@@ -63,7 +63,7 @@
         @abstract ObjCClassBeta provides a visual grouping element.
         @discussion An NSBox object is a simple NSView that can do two things: It can draw a border around itself, and it can title itself.
 */
-$0|$65008|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$65116|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -91,9 +91,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_6.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -2117,7 +2120,7 @@
 
 
 
-$90360|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$90468|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -2145,9 +2148,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_6.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -4900,4 +4906,4 @@
 
 
 
-_$17|ObjC_class_6.test$1|C$12|ObjC class 6$1|C$6|parser
\ No newline at end of file
+_$94|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/ObjC_class_6.test$1|C$12|ObjC class 6$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_7.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_7.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_7.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_7.test	2013-05-14 15:12:53.000000000 -0700
@@ -63,7 +63,7 @@
         @abstract ObjCClassDeux provides a visual grouping element.
         @discussion An NSBox object is a simple NSView that can do two things: It can draw a border around itself, and it can title itself.
 */
-$0|$64842|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$64950|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -91,9 +91,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_7.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_7.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -2132,7 +2135,7 @@
 
 
 
-$90068|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$90176|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -2160,9 +2163,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_7.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_7.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_8.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_8.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_8.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_8.test	2013-05-14 15:12:53.000000000 -0700
@@ -48,7 +48,7 @@
 
 @end
 $18|/*! test class */
-$0|$49909|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$50017|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -76,9 +76,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_8.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_8.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -1594,7 +1597,7 @@
 
 
 
-$61989|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$62097|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -1622,9 +1625,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_8.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_8.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_9.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_9.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_class_9.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_class_9.test	2013-05-14 15:12:53.000000000 -0700
@@ -32,7 +32,7 @@
  *        @class MyClass
  *        @abstract MyAbstract
  */
-$0|$17321|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$17429|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -60,8 +60,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_9.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_9.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -653,7 +656,7 @@
 
 
 
-$19108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$19216|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -681,8 +684,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_class_9.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_class_9.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_property.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_property.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_property.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_property.test	2013-05-14 15:12:53.000000000 -0700
@@ -12,7 +12,7 @@
 @end
 $19|/*! Interface */ 
 
-$0|$12538|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$12646|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -40,9 +40,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_property.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_property.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -467,7 +470,7 @@
 
 
 
-$12538|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$12646|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -495,9 +498,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_property.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_property.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_property_2.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_property_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_property_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_property_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -20,7 +20,7 @@
 $28|/*!
     This is a class.
 */
-$0|$14212|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$14320|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -48,9 +48,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_property_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_property_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -471,7 +474,7 @@
 
 
 
-$15987|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$16095|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -499,9 +502,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_property_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_property_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_property_3.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_property_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_property_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_property_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -20,7 +20,7 @@
 $28|/*!
     This is a class.
 */
-$0|$14212|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$14320|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -48,9 +48,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_property_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_property_3.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -471,7 +474,7 @@
 
 
 
-$15987|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$16095|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -499,9 +502,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_property_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_property_3.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_property_4.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_property_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_property_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_property_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -20,7 +20,7 @@
 $27|/*!
     This is a test.
 */
-$0|$14211|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$14319|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -48,9 +48,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_property_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_property_4.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -471,7 +474,7 @@
 
 
 
-$15986|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$16094|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -499,9 +502,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_property_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_property_4.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_protocol_1.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_protocol_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_protocol_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_protocol_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -12,7 +12,7 @@
         @discussion All validator objects validate--in fact, they can't
         help themselves. That's what they do.
 */
-$0|$14756|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$14864|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -40,8 +40,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_protocol_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_protocol_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -479,7 +482,7 @@
 
 
 
-$14756|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$14864|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -507,8 +510,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_protocol_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_protocol_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_protocol_2.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_protocol_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_protocol_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_protocol_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -13,7 +13,7 @@
         @discussion All validator objects validate--in fact, they can't
         help themselves. That's what they do.
 */
-$0|$14261|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$14369|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -41,8 +41,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_protocol_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_protocol_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -478,7 +481,7 @@
 
 
 
-$14261|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$14369|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -506,8 +509,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_protocol_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_protocol_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_protocol_3.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_protocol_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_protocol_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_protocol_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -13,7 +13,7 @@
         @discussion All validator objects validate--in fact, they can't
         help themselves. That's what they do.
 */
-$0|$14796|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$14904|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -41,8 +41,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_protocol_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_protocol_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -490,7 +493,7 @@
 
 
 
-$14796|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$14904|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -518,8 +521,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_protocol_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_protocol_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_protocol_4.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_protocol_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_protocol_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_protocol_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -12,7 +12,7 @@
         @discussion All validator objects validate--in fact, they can't
         help themselves. That's what they do.
 */
-$0|$15056|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$15164|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -40,8 +40,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_protocol_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_protocol_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -503,7 +506,7 @@
 
 
 
-$15056|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$15164|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -531,8 +534,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_protocol_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_protocol_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_protocol_5.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_protocol_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_protocol_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_protocol_5.test	2013-05-14 15:12:53.000000000 -0700
@@ -12,7 +12,7 @@
         @discussion All validator objects validate--in fact, they can't
         help themselves. That's what they do.
 */
-$0|$14627|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$14735|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -40,8 +40,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_protocol_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_protocol_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -479,7 +482,7 @@
 
 
 
-$14627|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$14735|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -507,8 +510,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_protocol_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_protocol_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_protocol_6.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_protocol_6.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_protocol_6.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_protocol_6.test	2013-05-14 15:12:53.000000000 -0700
@@ -35,7 +35,7 @@
                 ObjC keywords.
     @discussion tests \@optional and \@required.
  */
-$0|$64135|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$64243|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -63,8 +63,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_protocol_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_protocol_6.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -2043,7 +2046,7 @@
 
 
 
-$66350|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$66458|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -2071,8 +2074,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_protocol_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_protocol_6.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_protocol_7.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_protocol_7.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_protocol_7.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_protocol_7.test	2013-05-14 15:12:53.000000000 -0700
@@ -10,7 +10,7 @@
 $63|/*!        @protocol MyProtocol
         @abstract Abstract.
 */
-$0|$10546|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10654|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -38,8 +38,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_protocol_7.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_protocol_7.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -384,7 +387,7 @@
 
 
 
-$10546|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10654|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -412,8 +415,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_protocol_7.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_protocol_7.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/ObjC_single-line_comment_1.test headerdoc-8.9.20/testsuite/parser_tests/ObjC_single-line_comment_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/ObjC_single-line_comment_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/ObjC_single-line_comment_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -6,7 +6,7 @@
 $27|/*!
   Testing headerdoc
 */
-$0|$10074|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10182|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,9 +34,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_single-line_comment_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_single-line_comment_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -359,7 +362,7 @@
 
 
 
-$10074|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10182|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -387,9 +390,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/ObjC_single-line_comment_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/ObjC_single-line_comment_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/PHP_function_1.test headerdoc-8.9.20/testsuite/parser_tests/PHP_function_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/PHP_function_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/PHP_function_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -24,7 +24,7 @@
 $126|/*! Prints the info span.  This data provides a page ID in the database
     for use by the javascript message board code.
  */
-$0|$8551|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8659|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -52,8 +52,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/PHP_function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/PHP_function_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/PHP_function_2.test headerdoc-8.9.20/testsuite/parser_tests/PHP_function_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/PHP_function_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/PHP_function_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -52,7 +52,7 @@
     obtain the actual file), it uses it.  Otherwise, it returns
     the default link image ($icondir/biglink.png).
  */
-$0|$12606|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$12714|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -80,8 +80,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/PHP_function_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/PHP_function_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/PHP_function_3.test headerdoc-8.9.20/testsuite/parser_tests/PHP_function_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/PHP_function_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/PHP_function_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -32,7 +32,7 @@
 $129|/*! Processes a Camera RAW file into a "rotated" JPEG image for further
     scaling and manipulation with the usual methods.
  */
-$0|$10751|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10859|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -60,8 +60,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/PHP_function_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/PHP_function_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/PHP_global_1.test headerdoc-8.9.20/testsuite/parser_tests/PHP_global_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/PHP_global_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/PHP_global_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$22|$icondir = "/icons/";
 $84|/*! Directory for icon file (e.g. folder icons).  Path is relative to web root. 
 */
-$0|$5615|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5723|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/PHP_global_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/PHP_global_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/PHP_global_2.test headerdoc-8.9.20/testsuite/parser_tests/PHP_global_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/PHP_global_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/PHP_global_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$24|$images_as_preview = 1;
 $74|/*! Sets whether images should be displayed as previews or file icons. */
-$0|$5626|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5734|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/PHP_global_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/PHP_global_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/PHP_global_3.test headerdoc-8.9.20/testsuite/parser_tests/PHP_global_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/PHP_global_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/PHP_global_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$62|$server_netmasks = array("gatwood.net" => "68.165.1.188/29");
 $54|/*! This is a global variable containing an array. */
-$0|$6870|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6978|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/PHP_global_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/PHP_global_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Pascal_function_1.test headerdoc-8.9.20/testsuite/parser_tests/Pascal_function_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Pascal_function_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Pascal_function_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -4,7 +4,7 @@
         return 3;
 end;
 $35|{! A function with no arguments. }
-$0|$6503|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6611|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -32,8 +32,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_function_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -242,7 +245,7 @@
 
 
 
-$6503|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6611|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -270,8 +273,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_function_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Pascal_function_2.test headerdoc-8.9.20/testsuite/parser_tests/Pascal_function_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Pascal_function_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Pascal_function_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -3,7 +3,7 @@
         WriteLn('Function 2');
 end;
 $44|{! A function with arguments a, b, and j. }
-$0|$10727|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10835|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_function_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_function_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -402,7 +405,7 @@
 
 
 
-$10727|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10835|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -430,8 +433,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_function_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_function_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Pascal_procedure_1.test headerdoc-8.9.20/testsuite/parser_tests/Pascal_procedure_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Pascal_procedure_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Pascal_procedure_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -4,7 +4,7 @@
         return 3;
 end;
 $18|{! A procedure. }
-$0|$6025|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6133|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -32,8 +32,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_procedure_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_procedure_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -234,7 +237,7 @@
 
 
 
-$6025|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6133|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -262,8 +265,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_procedure_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_procedure_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Pascal_procedure_2.test headerdoc-8.9.20/testsuite/parser_tests/Pascal_procedure_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Pascal_procedure_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Pascal_procedure_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -3,7 +3,7 @@
         WriteLn('Procedure 2');
 end;
 $45|{! A procedure with arguments a, b, and j. }
-$0|$10390|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10498|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_procedure_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_procedure_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -394,7 +397,7 @@
 
 
 
-$10390|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10498|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -422,8 +425,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_procedure_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_procedure_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Pascal_variable_1.test headerdoc-8.9.20/testsuite/parser_tests/Pascal_variable_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Pascal_variable_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Pascal_variable_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$47|  pascal_var_r: Real;
   pascal_var_i: Integer;
 $21|{! This is a test. }
-$0|$5642|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5750|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_variable_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_variable_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -235,7 +238,7 @@
 
 
 
-$5642|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$5750|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -263,8 +266,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_variable_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_variable_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Pascal_variable_2.test headerdoc-8.9.20/testsuite/parser_tests/Pascal_variable_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Pascal_variable_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Pascal_variable_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$54|  pascal_var_e: (apple, pear, banana, orange, lemon);
 $22|{! This is an enum. }
-$0|$12277|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$12385|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_variable_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_variable_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -482,7 +485,7 @@
 
 
 
-$12277|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$12385|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -510,8 +513,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_variable_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_variable_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Pascal_variable_3.test headerdoc-8.9.20/testsuite/parser_tests/Pascal_variable_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/Pascal_variable_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Pascal_variable_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$53|  pascal_var_arr: packed array [1..10] of character;
 $22|{! This is an array }
-$0|$6325|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6433|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_variable_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_variable_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -263,7 +266,7 @@
 
 
 
-$6325|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6433|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -291,8 +294,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_variable_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_variable_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Pascal_variable_4.test headerdoc-8.9.20/testsuite/parser_tests/Pascal_variable_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/Pascal_variable_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Pascal_variable_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$57|  pascal_var_enum: (apple, pear, banana, orange, lemon);
 $51|{! @var pascal_var_enum
         This is an enum. }
-$0|$12304|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$12412|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_variable_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_variable_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -483,7 +486,7 @@
 
 
 
-$12304|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$12412|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -511,8 +514,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_variable_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_variable_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Pascal_variable_5.test headerdoc-8.9.20/testsuite/parser_tests/Pascal_variable_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/Pascal_variable_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Pascal_variable_5.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$48|  pascal_var_multi_1, pascal_var_multi_2: Real;
 $21|{! This is a test. }
-$0|$8016|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8124|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_variable_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_variable_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -304,7 +307,7 @@
 
 
 
-$8016|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8124|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -332,8 +335,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Pascal_variable_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Pascal_variable_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_function_1.test headerdoc-8.9.20/testsuite/parser_tests/Perl_function_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_function_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_function_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -21,7 +21,7 @@
     }
 $35|# /*! @function getHeaders 
 #   */
-$0|$7892|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -49,8 +49,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_function_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -290,7 +293,7 @@
 
 
 
-$7892|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -318,8 +321,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_function_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_function_2.test headerdoc-8.9.20/testsuite/parser_tests/Perl_function_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_function_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_function_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -3660,7 +3660,7 @@
 #     @param case_sensitive boolean: controls whether keywords should be processed in a case-sensitive fashion.
 #     @result Returns ($inputCounter, $declaration, $typelist, $namelist, $posstypes, $value, \@pplStack, $returntype, $privateDeclaration, $treeTop, $simpleTDcontents, $availability).
 # */
-$0|$496969|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$497077|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -3688,8 +3688,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_function_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_function_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -11601,7 +11604,7 @@
 
 
 
-$496969|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$497077|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -11629,8 +11632,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_function_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_function_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_function_3.test headerdoc-8.9.20/testsuite/parser_tests/Perl_function_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_function_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_function_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -263,7 +263,7 @@
     $self->{RESULT} = $results;
 }
 $18|/*! run tests. */
-$0|$29929|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$30037|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -291,8 +291,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_function_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_function_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -1018,7 +1021,7 @@
 
 
 
-$29929|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$30037|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -1046,8 +1049,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_function_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_function_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_function_4.test headerdoc-8.9.20/testsuite/parser_tests/Perl_function_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_function_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_function_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -24,7 +24,7 @@
 }
 
 $50|/*! This tests an at sign in a parameter list. */
-$0|$6979|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7087|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -52,8 +52,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_function_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_function_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -303,7 +306,7 @@
 
 
 
-$6979|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7087|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -331,8 +334,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_function_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_function_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_multiline_string_test.test headerdoc-8.9.20/testsuite/parser_tests/Perl_multiline_string_test.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_multiline_string_test.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_multiline_string_test.test	2013-05-14 15:12:53.000000000 -0700
@@ -6,7 +6,7 @@
 FOO
 ;
 $12|/*! test */
-$0|$8119|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8227|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,8 +34,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_multiline_string_test.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_multiline_string_test.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -319,7 +322,7 @@
 
 
 
-$8119|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8227|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -347,8 +350,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_multiline_string_test.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_multiline_string_test.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_package_1.test headerdoc-8.9.20/testsuite/parser_tests/Perl_package_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_package_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_package_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$36|package HeaderDoc::LineRange::test;
 $18|/*! test class */
-$0|$7270|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7378|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,9 +28,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_package_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_package_1.test
 $parserState->{ISFORWARDDECLARATION} => 1
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -242,7 +245,7 @@
 
 
 
-$7270|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7378|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -270,9 +273,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_package_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_package_1.test
 $parserState->{ISFORWARDDECLARATION} => 1
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_pound.test headerdoc-8.9.20/testsuite/parser_tests/Perl_pound.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_pound.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_pound.test	2013-05-14 15:12:53.000000000 -0700
@@ -7,7 +7,7 @@
 #        #define foo
 #    leading pound signs.
 #  */
-$0|$5892|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -35,8 +35,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_pound.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_pound.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -239,7 +242,7 @@
 
 
 
-$5892|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -267,8 +270,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_pound.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_pound.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_1.test headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -7,7 +7,7 @@
 }
 $13|/*! test */
 
-$0|$6224|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6332|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -35,8 +35,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -248,7 +251,7 @@
 
 
 
-$6224|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6332|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -276,8 +279,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_10.test headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_10.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_10.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_10.test	2013-05-14 15:12:53.000000000 -0700
@@ -3,7 +3,7 @@
         $ret =~ s/^[-\x{2014}\x{2013}[:space:]]*//s; # Nuke any leading hyphens,
 }
 $12|/*! Test */
-$0|$6184|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6292|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_10.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_10.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -236,7 +239,7 @@
 
 
 
-$6184|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6292|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -264,8 +267,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_10.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_10.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_11.test headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_11.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_11.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_11.test	2013-05-14 15:12:53.000000000 -0700
@@ -4,7 +4,7 @@
 }
 # This is *not* a regular expression....
 $12|/*! Test */
-$0|$5991|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6099|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -32,8 +32,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_11.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_11.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -236,7 +239,7 @@
 
 
 
-$5991|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6099|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -264,8 +267,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_11.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_11.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_2.test headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -20,7 +20,7 @@
 # sub classType
 # from APIOwner.pm
 $20|/*! regex test 2 */
-$0|$6588|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6696|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -48,8 +48,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -280,7 +283,7 @@
 
 
 
-$6588|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6696|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -308,8 +311,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_3.test headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -59,7 +59,7 @@
 # sub tocStringSubForClasses
 # from APIOwner.pm
 $20|/*! Regex test 3 */
-$0|$10225|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10333|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -87,8 +87,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -397,7 +400,7 @@
 
 
 
-$10225|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10333|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -425,8 +428,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_4.test headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -23,7 +23,7 @@
 
 # Random bits of APIOwner.pm
 $20|/*! Regex test 4 */
-$0|$7521|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7629|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -51,8 +51,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -294,7 +297,7 @@
 
 
 
-$7521|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7629|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -322,8 +325,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_5.test headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_5.test	2013-05-14 15:12:53.000000000 -0700
@@ -9,7 +9,7 @@
 	}
 }
 $18|/*! Test of [] */
-$0|$6202|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6310|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -37,8 +37,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -253,7 +256,7 @@
 
 
 
-$6202|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6310|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -281,8 +284,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_6.test headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_6.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_6.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_6.test	2013-05-14 15:12:53.000000000 -0700
@@ -8,7 +8,7 @@
 
 }
 $35|/*! Regexp test for [)] and [(] */
-$0|$5941|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6049|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -36,8 +36,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_6.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -249,7 +252,7 @@
 
 
 
-$5941|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6049|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -277,8 +280,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_6.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_7.test headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_7.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_7.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_7.test	2013-05-14 15:12:53.000000000 -0700
@@ -7,7 +7,7 @@
 	$string =~ s/d/(/g;
 }
 $21|/*! Regexp test 7 */
-$0|$6084|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6192|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -35,8 +35,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_7.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_7.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -247,7 +250,7 @@
 
 
 
-$6084|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6192|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -275,8 +278,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_7.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_7.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_8.test headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_8.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_8.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_8.test	2013-05-14 15:12:53.000000000 -0700
@@ -84,7 +84,7 @@
     if ($fail_count) { $HeaderDoc::exitstatus = -1; }
 }
 $56|/*! This is a test of something that is not a regex. */
-$0|$10586|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10694|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -112,8 +112,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_8.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_8.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -481,7 +484,7 @@
 
 
 
-$10586|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10694|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -509,8 +512,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_8.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_8.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_9.test headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_9.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_regex_9.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_regex_9.test	2013-05-14 15:12:53.000000000 -0700
@@ -5,7 +5,7 @@
 }
 $15|# /*! Test */
 
-$0|$5853|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5961|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,8 +33,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_9.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_9.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -238,7 +241,7 @@
 
 
 
-$5853|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$5961|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -266,8 +269,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_regex_9.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_regex_9.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_simulated_instance_variables.test headerdoc-8.9.20/testsuite/parser_tests/Perl_simulated_instance_variables.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_simulated_instance_variables.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_simulated_instance_variables.test	2013-05-14 15:12:53.000000000 -0700
@@ -4,7 +4,7 @@
 #     @var ivar_test_in_perl
 #          Description of ivar_test_in_perl goes here.
 #  */
-$0|$8024|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8132|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -32,9 +32,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_simulated_instance_variables.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_simulated_instance_variables.test
 $parserState->{ISFORWARDDECLARATION} => 1
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -285,7 +288,7 @@
 
 
 
-$8024|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8132|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -313,9 +316,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_simulated_instance_variables.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_simulated_instance_variables.test
 $parserState->{ISFORWARDDECLARATION} => 1
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_variable_1.test headerdoc-8.9.20/testsuite/parser_tests/Perl_variable_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_variable_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_variable_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$35|$VERSION = '$Revision: 1.1.2.1 $';
 $38|/*! Version string for this module */
-$0|$5967|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6075|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_variable_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_variable_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -262,7 +265,7 @@
 
 
 
-$5967|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6075|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -290,8 +293,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_variable_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_variable_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_variable_2.test headerdoc-8.9.20/testsuite/parser_tests/Perl_variable_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_variable_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_variable_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$17|my $foo = "bar";
 $31|/*! A file-scoped variable. */
-$0|$5666|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5774|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_variable_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_variable_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -245,7 +248,7 @@
 
 
 
-$5666|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$5774|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -273,8 +276,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_variable_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_variable_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Perl_variable_3.test headerdoc-8.9.20/testsuite/parser_tests/Perl_variable_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/Perl_variable_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Perl_variable_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$36|$HeaderDoc::myVariableName = "foo";
 $21|/*! test variable */
-$0|$6458|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6566|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_variable_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_variable_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -245,7 +248,7 @@
 
 
 
-$6458|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6566|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -273,8 +276,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Perl_variable_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Perl_variable_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Python_class_1.test headerdoc-8.9.20/testsuite/parser_tests/Python_class_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Python_class_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Python_class_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -25,7 +25,7 @@
     print bat
 
 $23|        Python_class_1
-$0|$21841|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$21870|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -54,6 +54,7 @@
 fullpath: /test_suite_bogus_path/Python_class_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
 $parserState->{FULLPATH} => /test_suite_bogus_path/Python_class_1.test
+$parserState->{afterNL} => 2
 $parserState->{autoContinue} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Python_class_2.test headerdoc-8.9.20/testsuite/parser_tests/Python_class_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Python_class_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Python_class_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -18,7 +18,7 @@
     "bar" ]
 
 $28|    Python_class_2_A class.
-$0|$9658|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9687|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -47,6 +47,7 @@
 fullpath: /test_suite_bogus_path/Python_class_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
 $parserState->{FULLPATH} => /test_suite_bogus_path/Python_class_2.test
+$parserState->{afterNL} => 2
 $parserState->{autoContinue} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Python_class_3.test headerdoc-8.9.20/testsuite/parser_tests/Python_class_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/Python_class_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Python_class_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -4,7 +4,7 @@
 Python_class_3_test_two = [
     "bar" ]
 $28|    Python_class_3_B class.
-$0|$6257|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6286|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,6 +33,7 @@
 fullpath: /test_suite_bogus_path/Python_class_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
 $parserState->{FULLPATH} => /test_suite_bogus_path/Python_class_3.test
+$parserState->{afterNL} => 2
 $parserState->{autoContinue} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Python_class_4.test headerdoc-8.9.20/testsuite/parser_tests/Python_class_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/Python_class_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Python_class_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -30,7 +30,7 @@
         "bar"
 ]
 $24|Python_class_4_A class.
-$0|$11969|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$11998|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -59,6 +59,7 @@
 fullpath: /test_suite_bogus_path/Python_class_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
 $parserState->{FULLPATH} => /test_suite_bogus_path/Python_class_4.test
+$parserState->{afterNL} => 2
 $parserState->{autoContinue} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Python_function_1.test headerdoc-8.9.20/testsuite/parser_tests/Python_function_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Python_function_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Python_function_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -13,7 +13,7 @@
         qux(x)
         foo(x - 1)
 $9|Pyfunc_1
-$0|$10843|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10872|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -42,6 +42,7 @@
 fullpath: /test_suite_bogus_path/Python_function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
 $parserState->{FULLPATH} => /test_suite_bogus_path/Python_function_1.test
+$parserState->{afterNL} => 2
 $parserState->{autoContinue} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
@@ -468,4 +469,4 @@
 
 
 _$26|Test of python functions.
-$45|testsuite/parser_tests/Python_function_1.test$6|python$17|Python function 1$6|python$6|parser
\ No newline at end of file
+$99|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/Python_function_1.test$6|python$17|Python function 1$6|python$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Python_tab_test.test headerdoc-8.9.20/testsuite/parser_tests/Python_tab_test.test
--- headerdoc-8.9.14/testsuite/parser_tests/Python_tab_test.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Python_tab_test.test	2013-05-14 15:12:53.000000000 -0700
@@ -4,7 +4,7 @@
 def Python_tab_test_failure(baz):
 	print what
 $24|        Python_tab_test
-$0|$7610|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7639|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,6 +33,7 @@
 fullpath: /test_suite_bogus_path/Python_tab_test.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
 $parserState->{FULLPATH} => /test_suite_bogus_path/Python_tab_test.test
+$parserState->{afterNL} => 2
 $parserState->{autoContinue} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
@@ -316,4 +317,4 @@
 fails because of changes to that code, set the
 $test_pyspace variable in PythonParse.pm to 1,
 then run HeaderDoc to see what's going on.
-$43|testsuite/parser_tests/Python_tab_test.test$6|python$15|Python tab test$6|python$6|parser
\ No newline at end of file
+$97|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/Python_tab_test.test$6|python$15|Python tab test$6|python$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Python_variable_1.test headerdoc-8.9.20/testsuite/parser_tests/Python_variable_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Python_variable_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Python_variable_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$37|python_var_1 = 3
 python_var_junk = 4
 $29|        python_var_1 comment
-$0|$5739|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5768|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,6 +30,7 @@
 fullpath: /test_suite_bogus_path/Python_variable_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
 $parserState->{FULLPATH} => /test_suite_bogus_path/Python_variable_1.test
+$parserState->{afterNL} => 2
 $parserState->{autoContinue} => 0
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
@@ -239,4 +240,4 @@
 
 
 
-__$45|testsuite/parser_tests/Python_variable_1.test$6|python$17|Python variable 1$6|python$6|parser
\ No newline at end of file
+__$99|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/Python_variable_1.test$6|python$17|Python variable 1$6|python$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Python_variable_2.test headerdoc-8.9.20/testsuite/parser_tests/Python_variable_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Python_variable_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Python_variable_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -2,7 +2,7 @@
         5
 python_var_junk = 4
 $29|        python_var_2 comment
-$0|$5958|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5987|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,6 +31,7 @@
 fullpath: /test_suite_bogus_path/Python_variable_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
 $parserState->{FULLPATH} => /test_suite_bogus_path/Python_variable_2.test
+$parserState->{afterNL} => 2
 $parserState->{autoContinue} => 0
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
@@ -261,4 +262,4 @@
 
 
 _$1|
-$45|testsuite/parser_tests/Python_variable_2.test$6|python$17|Python variable 2$6|python$6|parser
\ No newline at end of file
+$99|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/Python_variable_2.test$6|python$17|Python variable 2$6|python$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Python_variable_3.test headerdoc-8.9.20/testsuite/parser_tests/Python_variable_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/Python_variable_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Python_variable_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$42|python_var_3 = "Test"
 python_var_junk = 4
 $29|        python_var_3 comment
-$0|$5866|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5895|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,6 +30,7 @@
 fullpath: /test_suite_bogus_path/Python_variable_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
 $parserState->{FULLPATH} => /test_suite_bogus_path/Python_variable_3.test
+$parserState->{afterNL} => 2
 $parserState->{autoContinue} => 0
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
@@ -245,4 +246,4 @@
 
 
 
-__$45|testsuite/parser_tests/Python_variable_3.test$6|python$17|Python variable 3$6|python$6|parser
\ No newline at end of file
+__$99|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/Python_variable_3.test$6|python$17|Python variable 3$6|python$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Python_variable_4.test headerdoc-8.9.20/testsuite/parser_tests/Python_variable_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/Python_variable_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Python_variable_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -3,7 +3,7 @@
     """
 python_var_junk = 4
 $29|        python_var_4 comment
-$0|$6312|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6341|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -32,6 +32,7 @@
 fullpath: /test_suite_bogus_path/Python_variable_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
 $parserState->{FULLPATH} => /test_suite_bogus_path/Python_variable_4.test
+$parserState->{afterNL} => 2
 $parserState->{autoContinue} => 0
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
@@ -274,4 +275,4 @@
 
 
 
-__$45|testsuite/parser_tests/Python_variable_4.test$6|python$17|Python variable 4$6|python$6|parser
\ No newline at end of file
+__$99|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/Python_variable_4.test$6|python$17|Python variable 4$6|python$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Python_variable_5.test headerdoc-8.9.20/testsuite/parser_tests/Python_variable_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/Python_variable_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Python_variable_5.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$39|python_var_5 = "x"
 python_var_junk = 4
 $29|        python_var_5 comment
-$0|$5848|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5877|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,6 +30,7 @@
 fullpath: /test_suite_bogus_path/Python_variable_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
 $parserState->{FULLPATH} => /test_suite_bogus_path/Python_variable_5.test
+$parserState->{afterNL} => 2
 $parserState->{autoContinue} => 0
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
@@ -245,4 +246,4 @@
 
 
 
-__$45|testsuite/parser_tests/Python_variable_5.test$6|python$17|Python variable 5$6|python$6|parser
\ No newline at end of file
+__$99|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/Python_variable_5.test$6|python$17|Python variable 5$6|python$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Ruby_class_1.test headerdoc-8.9.20/testsuite/parser_tests/Ruby_class_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Ruby_class_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Ruby_class_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -10,7 +10,7 @@
   @name = name.capitalize
 end
 $21|    This is a class.
-$0|$6017|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6046|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -41,6 +41,7 @@
 $parserState->{FULLPATH} => /test_suite_bogus_path/Ruby_class_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Ruby_class_2.test headerdoc-8.9.20/testsuite/parser_tests/Ruby_class_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Ruby_class_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Ruby_class_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -27,7 +27,7 @@
   @name = name.capitalize
 end
 $21|    This is a class.
-$0|$14235|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$14264|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -58,6 +58,7 @@
 $parserState->{FULLPATH} => /test_suite_bogus_path/Ruby_class_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Ruby_class_3.test headerdoc-8.9.20/testsuite/parser_tests/Ruby_class_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/Ruby_class_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Ruby_class_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -18,7 +18,7 @@
 end
 
 $41|	Another class that throws an exception.
-$0|$14485|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$14514|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -49,6 +49,7 @@
 $parserState->{FULLPATH} => /test_suite_bogus_path/Ruby_class_3.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Ruby_function_1.test headerdoc-8.9.20/testsuite/parser_tests/Ruby_function_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Ruby_function_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Ruby_function_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -4,7 +4,7 @@
 a = "\nThis is a double quoted string\n"
 $53|    This is a function that
     takes one parameter.
-$0|$7338|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7446|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -32,8 +32,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Ruby_function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Ruby_function_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Ruby_function_2.test headerdoc-8.9.20/testsuite/parser_tests/Ruby_function_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Ruby_function_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Ruby_function_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -3,7 +3,7 @@
 end
 $75|       This is an instance method that
        doesn't take any parameters.
-$0|$6284|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6392|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Ruby_function_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Ruby_function_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Ruby_regex_1.test headerdoc-8.9.20/testsuite/parser_tests/Ruby_regex_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Ruby_regex_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Ruby_regex_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -17,7 +17,7 @@
     !headerdoc!
     ruby_regexp_1
 =end
-$0|$7733|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7841|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -45,8 +45,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Ruby_regex_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Ruby_regex_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Ruby_variable_1.test headerdoc-8.9.20/testsuite/parser_tests/Ruby_variable_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Ruby_variable_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Ruby_variable_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$112|ruby_variable_a = "\nThis is a double quoted string\n"
 bogus_variable_a = %/\nThis is a double quoted string\n/
 $14|    string a.
-$0|$6201|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6309|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Ruby_variable_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Ruby_variable_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Ruby_variable_2.test headerdoc-8.9.20/testsuite/parser_tests/Ruby_variable_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Ruby_variable_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Ruby_variable_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$118|ruby_variable_b = %{\nThis is a ruby quoted string (no Q)\n}
 bogus_variable_b = %/\nThis is a double quoted string\n/
 $14|    string b.
-$0|$6408|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6516|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Ruby_variable_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Ruby_variable_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Ruby_variable_3.test headerdoc-8.9.20/testsuite/parser_tests/Ruby_variable_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/Ruby_variable_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Ruby_variable_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$121|ruby_variable_c = %Q{\nThis is a ruby quoted string (with Q)\n}
 bogus_variable_c = %/\nThis is a double quoted string\n/
 $14|    string c.
-$0|$6429|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6537|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Ruby_variable_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Ruby_variable_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Ruby_variable_4.test headerdoc-8.9.20/testsuite/parser_tests/Ruby_variable_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/Ruby_variable_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Ruby_variable_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -4,7 +4,7 @@
 BLOCK
 bogus_variable_d = %/\nThis is a double quoted string\n/
 $14|    string d.
-$0|$6608|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6716|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -32,8 +32,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Ruby_variable_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Ruby_variable_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Ruby_variable_5.test headerdoc-8.9.20/testsuite/parser_tests/Ruby_variable_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/Ruby_variable_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Ruby_variable_5.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$109|ruby_variable_e = %/\nThis is a slash quoted string\n/
 bogus_variable_e = "This is a double quoted string\n"
 $14|    string e.
-$0|$6201|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6309|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Ruby_variable_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Ruby_variable_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Shell_function_1.test headerdoc-8.9.20/testsuite/parser_tests/Shell_function_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Shell_function_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Shell_function_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -13,7 +13,7 @@
 #    @param $2 The next-to-last word of the message
 #    @param $3+ The rest of the message
 #*/
-$0|$9218|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9326|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -41,8 +41,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Shell_function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Shell_function_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{afterSemi} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Shell_function_2.test headerdoc-8.9.20/testsuite/parser_tests/Shell_function_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Shell_function_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Shell_function_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -13,7 +13,7 @@
 #    @param $2 The next-to-last word of the message
 #    @param $3+ The rest of the message
 #*/
-$0|$9522|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9630|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -41,8 +41,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Shell_function_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Shell_function_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{afterSemi} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Shell_function_3.test headerdoc-8.9.20/testsuite/parser_tests/Shell_function_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/Shell_function_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Shell_function_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -15,7 +15,7 @@
 #    @param $2 The next-to-last word of the message
 #    @param $3+ The rest of the message
 #*/
-$0|$9318|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9426|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -43,8 +43,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Shell_function_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Shell_function_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{afterSemi} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Shell_function_4.test headerdoc-8.9.20/testsuite/parser_tests/Shell_function_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/Shell_function_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Shell_function_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -13,7 +13,7 @@
 	esac
 }
 $24|# /*! @abstract test */
-$0|$6919|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7027|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -41,8 +41,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Shell_function_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Shell_function_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{afterSemi} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Shell_string_1.test headerdoc-8.9.20/testsuite/parser_tests/Shell_string_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Shell_string_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Shell_string_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -9,7 +9,7 @@
 this is a test;
 
 $23|# /*! function test */
-$0|$5810|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5918|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -37,8 +37,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Shell_string_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Shell_string_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{afterSemi} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Shell_variable_1.test headerdoc-8.9.20/testsuite/parser_tests/Shell_variable_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/Shell_variable_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Shell_variable_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$38|PATH="$PATH:/usr/local/myproject/bin"
 $30|/*! A variable declaration */
-$0|$5866|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5974|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Shell_variable_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Shell_variable_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{afterSemi} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Shell_variable_2.test headerdoc-8.9.20/testsuite/parser_tests/Shell_variable_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/Shell_variable_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Shell_variable_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -2,7 +2,7 @@
 Last"
 SHELL_VAR_ACROSS_NEWLINE_NOT_PART_DBL="blah"
 $28|/*! goes over line break */
-$0|$5852|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5960|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Shell_variable_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Shell_variable_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{afterSemi} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/Shell_variable_3.test headerdoc-8.9.20/testsuite/parser_tests/Shell_variable_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/Shell_variable_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/Shell_variable_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -2,7 +2,7 @@
 Last'
 SHELL_VAR_ACROSS_NEWLINE_NOT_PART="blah"
 $28|/*! goes over line break */
-$0|$5792|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5900|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/Shell_variable_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/Shell_variable_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{afterSemi} => 1
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/TCL_class_1.test headerdoc-8.9.20/testsuite/parser_tests/TCL_class_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/TCL_class_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/TCL_class_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -41,7 +41,7 @@
 $33|# /*!
 #     Class number 1
 #  */
-$0|$17723|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$17802|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -69,6 +69,8 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/TCL_class_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/TCL_class_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
@@ -682,7 +684,7 @@
 
 
 
-$37814|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$37893|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -710,6 +712,8 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/TCL_class_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/TCL_class_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/TCL_function_1.test headerdoc-8.9.20/testsuite/parser_tests/TCL_function_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/TCL_function_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/TCL_function_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -5,7 +5,7 @@
 $44|# /*!
 #     Function called "return1"
 #  */
-$0|$8228|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8307|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,6 +33,8 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/TCL_function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/TCL_function_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
 $parserState->{afterNL} => 2
@@ -343,7 +345,7 @@
 
 
 
-$8228|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8307|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -371,6 +373,8 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/TCL_function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/TCL_function_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
 $parserState->{afterNL} => 2
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/TCL_function_2.test headerdoc-8.9.20/testsuite/parser_tests/TCL_function_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/TCL_function_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/TCL_function_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -13,7 +13,7 @@
 $44|# /*!
 #     Function called "return2"
 #  */
-$0|$7226|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7305|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -41,6 +41,8 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/TCL_function_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/TCL_function_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
 $parserState->{afterNL} => 2
@@ -311,7 +313,7 @@
 
 
 
-$10434|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10513|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -339,6 +341,8 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/TCL_function_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/TCL_function_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
 $parserState->{afterNL} => 2
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/TCL_regex_1.test headerdoc-8.9.20/testsuite/parser_tests/TCL_regex_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/TCL_regex_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/TCL_regex_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -4,7 +4,7 @@
 }
 
 $22|# /*! do_something */
-$0|$6115|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6194|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -32,6 +32,8 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/TCL_regex_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/TCL_regex_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
 $parserState->{afterNL} => 2
@@ -247,7 +249,7 @@
 
 
 
-$6115|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6194|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -275,6 +277,8 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/TCL_regex_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/TCL_regex_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
 $parserState->{afterNL} => 2
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/__BEGIN_DECLS.test headerdoc-8.9.20/testsuite/parser_tests/__BEGIN_DECLS.test
--- headerdoc-8.9.14/testsuite/parser_tests/__BEGIN_DECLS.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/__BEGIN_DECLS.test	2013-05-14 15:12:53.000000000 -0700
@@ -65,7 +65,7 @@
 #endif
 
 $12|/*! Test */
-$0|$225943|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$226051|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -93,8 +93,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/__BEGIN_DECLS.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/__BEGIN_DECLS.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -4183,7 +4186,7 @@
 
 
 
-$225943|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$226051|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -4211,8 +4214,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/__BEGIN_DECLS.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/__BEGIN_DECLS.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/asm_1.test headerdoc-8.9.20/testsuite/parser_tests/asm_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/asm_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/asm_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -3,7 +3,7 @@
         dispatch_block_t work,
         dispatch_block_t completion) __asm__("_dispatch_call2");
 $32|/*! Tests the use of __asm__ */
-$0|$11527|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$11635|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/asm_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/asm_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
@@ -414,7 +417,7 @@
 
 
 
-$11527|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$11635|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -442,8 +445,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/asm_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/asm_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/asm_2.test headerdoc-8.9.20/testsuite/parser_tests/asm_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/asm_2.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/asm_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -3,7 +3,7 @@
         dispatch_block_t work,
         dispatch_block_t completion) __asm("_dispatch_call2");
 $30|/*! Tests the use of __asm */
-$0|$11627|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$11735|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/asm_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/asm_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
@@ -414,7 +417,7 @@
 
 
 
-$11627|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$11735|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -442,8 +445,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/asm_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/asm_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/asm_3.test headerdoc-8.9.20/testsuite/parser_tests/asm_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/asm_3.test	1969-12-31 16:00:00.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/asm_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -0,0 +1,772 @@
+FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$283|	static inline void setPMC0(const UInt64 & value)
+	{
+		UInt32 low  = value & 0xffffffff;
+		UInt32 high = value >> 32;
+		
+		__asm__ volatile("mcr p15, 1, %0, c9, c15, 0;"
+						 :
+						 : "r" (low));
+		__asm__ volatile("mcr p15, 1, %0, c9, c15, 1;"
+						 :
+						 : "r" (high));
+	}
+$283|	/*!
+	 @function setPMC0
+	 @abstract Set Performance Monitor Counter&nbsp;0.
+	 
+	 @discussion
+	 This 40-bit counter is implemented using two 32-bit registers.  Access
+	 is performed using two 32-bit transfers.
+	 
+	 @param value
+	 The value to write to PMC0 on the present core.
+	 */
+$0|$10044|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+inHeader: 0
+inClass: 0
+inInterface: 0
+inCPPHeader: 0
+inOCCHeader: 0
+inPerlScript: 0
+inShellScript: 0
+inPHPScript: 0
+inJavaSource: 0
+inFunctionGroup: 0
+inGroup: 0
+inFunction: 1
+inPDefine: 0
+inTypedef: 0
+inUnion: 0
+inStruct: 0
+inConstant: 0
+inVar: 0
+inEnum: 0
+inMethod: 0
+inAvailabilityMacro: 0
+inUnknown: 0
+classType: unknown
+inputCounter: 0
+blockOffset: 0
+fullpath: /test_suite_bogus_path/asm_3.test
+-=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
+$parserState->{FULLPATH} => /test_suite_bogus_path/asm_3.test
+$parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
+$parserState->{availability} => 
+$parserState->{backslashcount} => 0
+$parserState->{basetype} => 
+$parserState->{bracePending} => 0
+$parserState->{callbackIsTypedef} => 0
+$parserState->{callbackName} => 
+$parserState->{callbackNamePending} => -1
+$parserState->{categoryClass} => 
+$parserState->{classtype} => 
+$parserState->{freezeStack} => ARRAY(OBJID)
+$parserState->{freezereturn} => 1
+$parserState->{frozensodname} => setPMC0
+$parserState->{functionContents} => {
+                UInt32 low  = value & 0xffffffff;
+                UInt32 high = value >> 32;
+
+                __asm__ volatile("mcr p15, 1, %0, c9, c15, 0;"
+                                                 :
+                                                 : "r" (low));
+                __asm__ volatile("mcr p15, 1, %0, c9, c15, 1;"
+                                                 :
+                                                 : "r" (high));
+        }
+
+$parserState->{functionReturnsCallback} => 0
+$parserState->{hollow} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{inBrackets} => 0
+$parserState->{inChar} => 0
+$parserState->{inClass} => 0
+$parserState->{inComment} => 0
+$parserState->{inInlineComment} => 0
+$parserState->{inMacro} => 0
+$parserState->{inMacroLine} => 0
+$parserState->{inOperator} => 0
+$parserState->{inPrivateParamTypes} => 0
+$parserState->{inString} => 0
+$parserState->{inTemplate} => 0
+$parserState->{initbsCount} => 0
+$parserState->{inputCounter} => 12
+$parserState->{isStatic} => 1
+$parserState->{kr_c_function} => 0
+$parserState->{kr_c_name} => 
+$parserState->{lang} => C
+$parserState->{lastTreeNode} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{lastsymbol} => 
+$parserState->{macroNoTrunc} => 1
+$parserState->{name} => 
+$parserState->{namePending} => 0
+$parserState->{noInsert} => 0
+$parserState->{occmethod} => 0
+$parserState->{occmethodname} => 
+$parserState->{occparmlabelfound} => 4
+$parserState->{onlyComments} => 0
+$parserState->{parsedParamAtBrace} => ARRAY(OBJID)
+$parserState->{parsedParamList} => ARRAY(OBJID)
+$parserState->{parsedParamParse} => 0
+$parserState->{parsedParamStateAtBrace} => ARRAY(OBJID)
+$parserState->{posstypes} => 
+$parserState->{posstypesPending} => 0
+$parserState->{pplStack} => ARRAY(OBJID)
+$parserState->{preEqualsSymbol} => 
+$parserState->{preTemplateSymbol} => 
+$parserState->{prekeywordsodname} => 
+$parserState->{prekeywordsodtype} => 
+$parserState->{returntype} => static inline void
+$parserState->{seenBraces} => 1
+$parserState->{seenMacroPart} => 0
+$parserState->{seenTilde} => 0
+$parserState->{simpleTDcontents} => 
+$parserState->{simpleTypedef} => 0
+$parserState->{sodclass} => function
+$parserState->{sodname} => setPMC0
+$parserState->{sodtype} =>  static inline void
+$parserState->{stackFrozen} => 1
+$parserState->{startOfDec} => 0
+$parserState->{sublang} => C
+$parserState->{temponlyComments} => 0
+$parserState->{value} => 
+$parserState->{valuepending} => 0
+-=: BLOCKPARSE RETURN VALUES :=-
+newcount: 12
+typelist: function
+namelist: setPMC0
+posstypes: function method
+value: 
+returntype:  static inline void
+pridec: 
+simpleTDcontents: 
+bpavail: 
+blockOffset: 0
+conformsToList: 
+functionContents: {
+                UInt32 low  = value & 0xffffffff;
+                UInt32 high = value >> 32;
+
+                __asm__ volatile("mcr p15, 1, %0, c9, c15, 0;"
+                                                 :
+                                                 : "r" (low));
+                __asm__ volatile("mcr p15, 1, %0, c9, c15, 1;"
+                                                 :
+                                                 : "r" (high));
+        }
+
+extendsClass: 
+implementsClass: 
+-=: LIST OF PARSED PARAMETERS :=-
+Parsed Param 0 => const UInt64 & value
+-=: DUMP OF PARSE TREE :=-
++---        
++---static
++--- 
++---inline
++--- 
++---void
++--- 
++---setPMC0
++---(
+|   +---const
+|   +--- 
+|   +---UInt64
+|   +--- 
+|   +---&
+|   +--- 
+|   +---value
+|   +---)
++---[ NEWLINE ]
++---        
+-=: COMPUTED VALUE :=-
+SUCCESS: 0
+VALUE: 0
+-=: CPP CHANGES :=-
+NO CPP CHANGES
+-=: FOUND MATCH :=-
+1
+-=: NAMED OBJECTS :=-
+TREE COUNT: 0
+INDEX GROUP: 
+IS BLOCK: 
+OBJECT TYPE: HeaderDoc::Header
+NAME: asm 3
+APIUID: //test_ref/doc/header/asm_3.test
+ABSTRACT: ""
+DISCUSSION: "<p></p>"
+UPDATED: ""
+COPYRIGHT: ""
+HTMLMETA: ""
+PRIVATEDECLARATION: ""
+GROUP: ""
+INDEXGROUP: ""
+THROWS: ""
+XMLTHROWS: ""
+UPDATED: ""
+LINKAGESTATE: ""
+ACCESSCONTROL: ""
+AVAILABILITY: ""
+LINKUID: ""
+ORIGCLASS: ""
+ISDEFINE: ""
+ISTEMPLATE: ""
+VALUE: "UNKNOWN"
+RETURNTYPE: ""
+LINENUM: ""
+CLASS: "HeaderDoc::Header"
+MASTERENUM: ""
+APIREFSETUPDONE: "1"
+TPCDONE: ""
+NOREGISTERUID: ""
+SUPPRESSCHILDREN: ""
+NAMELINE_DISCUSSION: ""
+HIDEDOC: ""
+HIDESINGLETONS: ""
+HIDECONTENTS: ""
+MAINOBJECT: ""
+LIST ATTRIBUTES: 
+SHORT ATTRIBUTES: 
+LONG ATTRIBUTES: 
+    TREE COUNT: 1
+    INDEX GROUP: 
+    IS BLOCK: 
+    OBJECT TYPE: HeaderDoc::Function
+    NAME: setPMC0
+    APIUID: //test_ref/c/func/asm_3.test/setPMC0
+    ABSTRACT: "<p>Set Performance Monitor Counter&nbsp;0.
+</p>
+"
+    DISCUSSION: "<p>This 40-bit counter is implemented using two 32-bit registers.  Access
+is performed using two 32-bit transfers.
+</p>
+"
+    UPDATED: ""
+    COPYRIGHT: ""
+    HTMLMETA: ""
+    PRIVATEDECLARATION: ""
+    GROUP: "default_function_group"
+    INDEXGROUP: ""
+    THROWS: ""
+    XMLTHROWS: ""
+    UPDATED: ""
+    LINKAGESTATE: ""
+    ACCESSCONTROL: ""
+    AVAILABILITY: ""
+    LINKUID: ""
+    ORIGCLASS: ""
+    ISDEFINE: ""
+    ISTEMPLATE: ""
+    VALUE: "UNKNOWN"
+    RETURNTYPE: " static inline void"
+    LINENUM: ""
+    CLASS: "HeaderDoc::Function"
+    MASTERENUM: ""
+    APIREFSETUPDONE: "1"
+    TPCDONE: ""
+    NOREGISTERUID: ""
+    SUPPRESSCHILDREN: "0"
+    NAMELINE_DISCUSSION: ""
+    HIDEDOC: ""
+    HIDESINGLETONS: ""
+    HIDECONTENTS: ""
+    MAINOBJECT: ""
+    LIST ATTRIBUTES: 
+    SHORT ATTRIBUTES: 
+    LONG ATTRIBUTES: 
+    PARSED PARAMETERS:
+        TREE COUNT: 0
+        INDEX GROUP: 
+        IS BLOCK: 
+        OBJECT TYPE: HeaderDoc::MinorAPIElement
+        NAME: value
+        TYPE: const UInt64 &
+        APIUID: 
+        ABSTRACT: ""
+        DISCUSSION: "<p></p>"
+        UPDATED: ""
+        COPYRIGHT: ""
+        HTMLMETA: ""
+        PRIVATEDECLARATION: ""
+        GROUP: ""
+        INDEXGROUP: ""
+        THROWS: ""
+        XMLTHROWS: ""
+        UPDATED: ""
+        LINKAGESTATE: ""
+        ACCESSCONTROL: ""
+        AVAILABILITY: ""
+        LINKUID: ""
+        ORIGCLASS: ""
+        ISDEFINE: ""
+        ISTEMPLATE: ""
+        VALUE: "UNKNOWN"
+        RETURNTYPE: ""
+        LINENUM: ""
+        CLASS: "HeaderDoc::MinorAPIElement"
+        MASTERENUM: ""
+        APIREFSETUPDONE: "1"
+        TPCDONE: ""
+        NOREGISTERUID: ""
+        SUPPRESSCHILDREN: ""
+        NAMELINE_DISCUSSION: ""
+        HIDEDOC: ""
+        HIDESINGLETONS: ""
+        HIDECONTENTS: ""
+        MAINOBJECT: ""
+        LIST ATTRIBUTES: 
+        SHORT ATTRIBUTES: 
+        LONG ATTRIBUTES: 
+    TAGGED PARAMETERS:
+        TREE COUNT: 0
+        INDEX GROUP: 
+        IS BLOCK: 
+        OBJECT TYPE: HeaderDoc::MinorAPIElement
+        NAME: value
+        TYPE: 
+        APIUID: //test_ref/doc/functionparam/setPMC0/value
+        ABSTRACT: ""
+        DISCUSSION: "<p>The value to write to PMC0 on the present core."
+        UPDATED: ""
+        COPYRIGHT: ""
+        HTMLMETA: ""
+        PRIVATEDECLARATION: ""
+        GROUP: ""
+        INDEXGROUP: ""
+        THROWS: ""
+        XMLTHROWS: ""
+        UPDATED: ""
+        LINKAGESTATE: ""
+        ACCESSCONTROL: ""
+        AVAILABILITY: ""
+        LINKUID: ""
+        ORIGCLASS: ""
+        ISDEFINE: ""
+        ISTEMPLATE: ""
+        VALUE: "UNKNOWN"
+        RETURNTYPE: ""
+        LINENUM: ""
+        CLASS: "HeaderDoc::MinorAPIElement"
+        MASTERENUM: ""
+        APIREFSETUPDONE: "1"
+        TPCDONE: ""
+        NOREGISTERUID: ""
+        SUPPRESSCHILDREN: ""
+        NAMELINE_DISCUSSION: ""
+        HIDEDOC: ""
+        HIDESINGLETONS: ""
+        HIDECONTENTS: ""
+        MAINOBJECT: ""
+        LIST ATTRIBUTES: 
+        SHORT ATTRIBUTES: 
+        LONG ATTRIBUTES: 
+-=: NAMED OBJECT PARSE TREES :=-
+OBJECT: setPMC0 (HeaderDoc::Function)
++---        
++---static
++--- 
++---inline
++--- 
++---void
++--- 
++---setPMC0
++---(
+|   +---const
+|   +--- 
+|   +---UInt64
+|   +--- 
+|   +---&
+|   +--- 
+|   +---value
+|   +---)
++---[ NEWLINE ]
++---        
+END OF OBJECT
+
+
+
+-=: HTML OUTPUT OF PARSE TREES :=-
+OBJECT: setPMC0 (HeaderDoc::Function)
+	<span class="keyword">static</span> <span class="keyword">inline</span> <!-- a logicalPath="//test_ref/c/cl/void //test_ref/c/tdef/void //test_ref/c/tag/void //test_ref/c/struct/void //test_ref/c/intf/void //test_ref/doc/anysymbol/void" machineGenerated="true" --><span class="type">void</span><!-- /a --> <!-- a logicalPath="//test_ref/c/instm/setPMC0 //test_ref/c/clm/setPMC0 //test_ref/c/intfcm/setPMC0 //test_ref/c/intfm/setPMC0 //test_ref/c/func/setPMC0 //test_ref/c/ftmplt/setPMC0 //test_ref/c/defn/setPMC0 //test_ref/c/macro/setPMC0 //test_ref/doc/anysymbol/setPMC0" machineGenerated="true" --><span class="function">setPMC0</span><!-- /a -->(
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/c/cl/UInt64 //test_ref/c/tdef/UInt64 //test_ref/c/tag/UInt64 //test_ref/c/struct/UInt64 //test_ref/c/intf/UInt64 //test_ref/doc/anysymbol/UInt64" machineGenerated="true" --><span class="type">UInt64</span><!-- /a --> &amp; <span class="param">value</span>) 
+END OF OBJECT
+
+
+
+$10044|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+inHeader: 0
+inClass: 0
+inInterface: 0
+inCPPHeader: 0
+inOCCHeader: 0
+inPerlScript: 0
+inShellScript: 0
+inPHPScript: 0
+inJavaSource: 0
+inFunctionGroup: 0
+inGroup: 0
+inFunction: 1
+inPDefine: 0
+inTypedef: 0
+inUnion: 0
+inStruct: 0
+inConstant: 0
+inVar: 0
+inEnum: 0
+inMethod: 0
+inAvailabilityMacro: 0
+inUnknown: 0
+classType: unknown
+inputCounter: 0
+blockOffset: 0
+fullpath: /test_suite_bogus_path/asm_3.test
+-=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
+$parserState->{FULLPATH} => /test_suite_bogus_path/asm_3.test
+$parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
+$parserState->{availability} => 
+$parserState->{backslashcount} => 0
+$parserState->{basetype} => 
+$parserState->{bracePending} => 0
+$parserState->{callbackIsTypedef} => 0
+$parserState->{callbackName} => 
+$parserState->{callbackNamePending} => -1
+$parserState->{categoryClass} => 
+$parserState->{classtype} => 
+$parserState->{freezeStack} => ARRAY(OBJID)
+$parserState->{freezereturn} => 1
+$parserState->{frozensodname} => setPMC0
+$parserState->{functionContents} => {
+                UInt32 low  = value & 0xffffffff;
+                UInt32 high = value >> 32;
+
+                __asm__ volatile("mcr p15, 1, %0, c9, c15, 0;"
+                                                 :
+                                                 : "r" (low));
+                __asm__ volatile("mcr p15, 1, %0, c9, c15, 1;"
+                                                 :
+                                                 : "r" (high));
+        }
+
+$parserState->{functionReturnsCallback} => 0
+$parserState->{hollow} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{inBrackets} => 0
+$parserState->{inChar} => 0
+$parserState->{inClass} => 0
+$parserState->{inComment} => 0
+$parserState->{inInlineComment} => 0
+$parserState->{inMacro} => 0
+$parserState->{inMacroLine} => 0
+$parserState->{inOperator} => 0
+$parserState->{inPrivateParamTypes} => 0
+$parserState->{inString} => 0
+$parserState->{inTemplate} => 0
+$parserState->{initbsCount} => 0
+$parserState->{inputCounter} => 12
+$parserState->{isStatic} => 1
+$parserState->{kr_c_function} => 0
+$parserState->{kr_c_name} => 
+$parserState->{lang} => C
+$parserState->{lastTreeNode} => HeaderDoc::ParseTree=HASH(OBJID)
+$parserState->{lastsymbol} => 
+$parserState->{macroNoTrunc} => 1
+$parserState->{name} => 
+$parserState->{namePending} => 0
+$parserState->{noInsert} => 0
+$parserState->{occmethod} => 0
+$parserState->{occmethodname} => 
+$parserState->{occparmlabelfound} => 4
+$parserState->{onlyComments} => 0
+$parserState->{parsedParamAtBrace} => ARRAY(OBJID)
+$parserState->{parsedParamList} => ARRAY(OBJID)
+$parserState->{parsedParamParse} => 0
+$parserState->{parsedParamStateAtBrace} => ARRAY(OBJID)
+$parserState->{posstypes} => 
+$parserState->{posstypesPending} => 0
+$parserState->{pplStack} => ARRAY(OBJID)
+$parserState->{preEqualsSymbol} => 
+$parserState->{preTemplateSymbol} => 
+$parserState->{prekeywordsodname} => 
+$parserState->{prekeywordsodtype} => 
+$parserState->{returntype} => static inline void
+$parserState->{seenBraces} => 1
+$parserState->{seenMacroPart} => 0
+$parserState->{seenTilde} => 0
+$parserState->{simpleTDcontents} => 
+$parserState->{simpleTypedef} => 0
+$parserState->{sodclass} => function
+$parserState->{sodname} => setPMC0
+$parserState->{sodtype} =>  static inline void
+$parserState->{stackFrozen} => 1
+$parserState->{startOfDec} => 0
+$parserState->{sublang} => C
+$parserState->{temponlyComments} => 0
+$parserState->{value} => 
+$parserState->{valuepending} => 0
+-=: BLOCKPARSE RETURN VALUES :=-
+newcount: 12
+typelist: function
+namelist: setPMC0
+posstypes: function method
+value: 
+returntype:  static inline void
+pridec: 
+simpleTDcontents: 
+bpavail: 
+blockOffset: 0
+conformsToList: 
+functionContents: {
+                UInt32 low  = value & 0xffffffff;
+                UInt32 high = value >> 32;
+
+                __asm__ volatile("mcr p15, 1, %0, c9, c15, 0;"
+                                                 :
+                                                 : "r" (low));
+                __asm__ volatile("mcr p15, 1, %0, c9, c15, 1;"
+                                                 :
+                                                 : "r" (high));
+        }
+
+extendsClass: 
+implementsClass: 
+-=: LIST OF PARSED PARAMETERS :=-
+Parsed Param 0 => const UInt64 & value
+-=: DUMP OF PARSE TREE :=-
++---        
++---static
++--- 
++---inline
++--- 
++---void
++--- 
++---setPMC0
++---(
+|   +---const
+|   +--- 
+|   +---UInt64
+|   +--- 
+|   +---&
+|   +--- 
+|   +---value
+|   +---)
++---[ NEWLINE ]
++---        
+-=: COMPUTED VALUE :=-
+SUCCESS: 0
+VALUE: 0
+-=: CPP CHANGES :=-
+NO CPP CHANGES
+-=: FOUND MATCH :=-
+1
+-=: NAMED OBJECTS :=-
+TREE COUNT: 0
+INDEX GROUP: 
+IS BLOCK: 
+OBJECT TYPE: HeaderDoc::Header
+NAME: asm 3
+APIUID: //test_ref/doc/header/asm_3.test
+ABSTRACT: ""
+DISCUSSION: "<p></p>"
+UPDATED: ""
+COPYRIGHT: ""
+HTMLMETA: ""
+PRIVATEDECLARATION: ""
+GROUP: ""
+INDEXGROUP: ""
+THROWS: ""
+XMLTHROWS: ""
+UPDATED: ""
+LINKAGESTATE: ""
+ACCESSCONTROL: ""
+AVAILABILITY: ""
+LINKUID: ""
+ORIGCLASS: ""
+ISDEFINE: ""
+ISTEMPLATE: ""
+VALUE: "UNKNOWN"
+RETURNTYPE: ""
+LINENUM: ""
+CLASS: "HeaderDoc::Header"
+MASTERENUM: ""
+APIREFSETUPDONE: "1"
+TPCDONE: ""
+NOREGISTERUID: ""
+SUPPRESSCHILDREN: ""
+NAMELINE_DISCUSSION: ""
+HIDEDOC: ""
+HIDESINGLETONS: ""
+HIDECONTENTS: ""
+MAINOBJECT: ""
+LIST ATTRIBUTES: 
+SHORT ATTRIBUTES: 
+LONG ATTRIBUTES: 
+    TREE COUNT: 1
+    INDEX GROUP: 
+    IS BLOCK: 
+    OBJECT TYPE: HeaderDoc::Function
+    NAME: setPMC0
+    APIUID: //test_ref/c/func/asm_3.test/setPMC0
+    ABSTRACT: "<p>Set Performance Monitor Counter&nbsp;0.
+</p>
+"
+    DISCUSSION: "<p>This 40-bit counter is implemented using two 32-bit registers.  Access
+is performed using two 32-bit transfers.
+</p>
+"
+    UPDATED: ""
+    COPYRIGHT: ""
+    HTMLMETA: ""
+    PRIVATEDECLARATION: ""
+    GROUP: "default_function_group"
+    INDEXGROUP: ""
+    THROWS: ""
+    XMLTHROWS: ""
+    UPDATED: ""
+    LINKAGESTATE: ""
+    ACCESSCONTROL: ""
+    AVAILABILITY: ""
+    LINKUID: ""
+    ORIGCLASS: ""
+    ISDEFINE: ""
+    ISTEMPLATE: ""
+    VALUE: "UNKNOWN"
+    RETURNTYPE: " static inline void"
+    LINENUM: ""
+    CLASS: "HeaderDoc::Function"
+    MASTERENUM: ""
+    APIREFSETUPDONE: "1"
+    TPCDONE: ""
+    NOREGISTERUID: ""
+    SUPPRESSCHILDREN: "0"
+    NAMELINE_DISCUSSION: ""
+    HIDEDOC: ""
+    HIDESINGLETONS: ""
+    HIDECONTENTS: ""
+    MAINOBJECT: ""
+    LIST ATTRIBUTES: 
+    SHORT ATTRIBUTES: 
+    LONG ATTRIBUTES: 
+    PARSED PARAMETERS:
+        TREE COUNT: 0
+        INDEX GROUP: 
+        IS BLOCK: 
+        OBJECT TYPE: HeaderDoc::MinorAPIElement
+        NAME: value
+        TYPE: const UInt64 &
+        APIUID: 
+        ABSTRACT: ""
+        DISCUSSION: "<p></p>"
+        UPDATED: ""
+        COPYRIGHT: ""
+        HTMLMETA: ""
+        PRIVATEDECLARATION: ""
+        GROUP: ""
+        INDEXGROUP: ""
+        THROWS: ""
+        XMLTHROWS: ""
+        UPDATED: ""
+        LINKAGESTATE: ""
+        ACCESSCONTROL: ""
+        AVAILABILITY: ""
+        LINKUID: ""
+        ORIGCLASS: ""
+        ISDEFINE: ""
+        ISTEMPLATE: ""
+        VALUE: "UNKNOWN"
+        RETURNTYPE: ""
+        LINENUM: ""
+        CLASS: "HeaderDoc::MinorAPIElement"
+        MASTERENUM: ""
+        APIREFSETUPDONE: "1"
+        TPCDONE: ""
+        NOREGISTERUID: ""
+        SUPPRESSCHILDREN: ""
+        NAMELINE_DISCUSSION: ""
+        HIDEDOC: ""
+        HIDESINGLETONS: ""
+        HIDECONTENTS: ""
+        MAINOBJECT: ""
+        LIST ATTRIBUTES: 
+        SHORT ATTRIBUTES: 
+        LONG ATTRIBUTES: 
+    TAGGED PARAMETERS:
+        TREE COUNT: 0
+        INDEX GROUP: 
+        IS BLOCK: 
+        OBJECT TYPE: HeaderDoc::MinorAPIElement
+        NAME: value
+        TYPE: 
+        APIUID: //test_ref/doc/functionparam/setPMC0/value
+        ABSTRACT: ""
+        DISCUSSION: "<p>The value to write to PMC0 on the present core."
+        UPDATED: ""
+        COPYRIGHT: ""
+        HTMLMETA: ""
+        PRIVATEDECLARATION: ""
+        GROUP: ""
+        INDEXGROUP: ""
+        THROWS: ""
+        XMLTHROWS: ""
+        UPDATED: ""
+        LINKAGESTATE: ""
+        ACCESSCONTROL: ""
+        AVAILABILITY: ""
+        LINKUID: ""
+        ORIGCLASS: ""
+        ISDEFINE: ""
+        ISTEMPLATE: ""
+        VALUE: "UNKNOWN"
+        RETURNTYPE: ""
+        LINENUM: ""
+        CLASS: "HeaderDoc::MinorAPIElement"
+        MASTERENUM: ""
+        APIREFSETUPDONE: "1"
+        TPCDONE: ""
+        NOREGISTERUID: ""
+        SUPPRESSCHILDREN: ""
+        NAMELINE_DISCUSSION: ""
+        HIDEDOC: ""
+        HIDESINGLETONS: ""
+        HIDECONTENTS: ""
+        MAINOBJECT: ""
+        LIST ATTRIBUTES: 
+        SHORT ATTRIBUTES: 
+        LONG ATTRIBUTES: 
+-=: NAMED OBJECT PARSE TREES :=-
+OBJECT: setPMC0 (HeaderDoc::Function)
++---        
++---static
++--- 
++---inline
++--- 
++---void
++--- 
++---setPMC0
++---(
+|   +---const
+|   +--- 
+|   +---UInt64
+|   +--- 
+|   +---&
+|   +--- 
+|   +---value
+|   +---)
++---[ NEWLINE ]
++---        
+END OF OBJECT
+
+
+
+-=: HTML OUTPUT OF PARSE TREES :=-
+OBJECT: setPMC0 (HeaderDoc::Function)
+	<span class="keyword">static</span> <span class="keyword">inline</span> <!-- a logicalPath="//test_ref/c/cl/void //test_ref/c/tdef/void //test_ref/c/tag/void //test_ref/c/struct/void //test_ref/c/intf/void //test_ref/doc/anysymbol/void" machineGenerated="true" --><span class="type">void</span><!-- /a --> <!-- a logicalPath="//test_ref/c/instm/setPMC0 //test_ref/c/clm/setPMC0 //test_ref/c/intfcm/setPMC0 //test_ref/c/intfm/setPMC0 //test_ref/c/func/setPMC0 //test_ref/c/ftmplt/setPMC0 //test_ref/c/defn/setPMC0 //test_ref/c/macro/setPMC0 //test_ref/doc/anysymbol/setPMC0" machineGenerated="true" --><span class="function">setPMC0</span><!-- /a -->(
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/c/cl/UInt64 //test_ref/c/tdef/UInt64 //test_ref/c/tag/UInt64 //test_ref/c/struct/UInt64 //test_ref/c/intf/UInt64 //test_ref/doc/anysymbol/UInt64" machineGenerated="true" --><span class="type">UInt64</span><!-- /a --> &amp; <span class="param">value</span>) 
+END OF OBJECT
+
+
+
+_$87|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/asm_3.test$1|C$5|asm 3$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/attribute_1.test headerdoc-8.9.20/testsuite/parser_tests/attribute_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/attribute_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/attribute_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$76|int attribute_test_function(int a, char *b) __attribute__((always_inline));
 $18|/*! no comment */
-$0|$9513|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9621|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/attribute_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/attribute_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
@@ -356,7 +359,7 @@
 
 
 
-$9513|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9621|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -384,8 +387,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/attribute_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/attribute_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/attribute_block_1.test headerdoc-8.9.20/testsuite/parser_tests/attribute_block_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/attribute_block_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/attribute_block_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -8,7 +8,7 @@
             foo()
 </pre>
 */
-$0|$6263|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6371|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -36,8 +36,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/attribute_block_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/attribute_block_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -248,7 +251,7 @@
 
 
 
-$6263|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6371|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -276,8 +279,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/attribute_block_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/attribute_block_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/attribute_block_2.test headerdoc-8.9.20/testsuite/parser_tests/attribute_block_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/attribute_block_2.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/attribute_block_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -14,7 +14,7 @@
 
 }
 $29|/*! myClass Documentation */
-$0|$10276|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10384|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -42,9 +42,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/attribute_block_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/attribute_block_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -391,7 +394,7 @@
 
 
 
-$10276|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10384|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -419,9 +422,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/attribute_block_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/attribute_block_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros.h.test headerdoc-8.9.20/testsuite/parser_tests/avmacros.h.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros.h.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros.h.test	2013-05-14 15:12:53.000000000 -0700
@@ -2,7 +2,7 @@
 $66|/*! @availabilitymacro
         Available in Mac OS X for Vax.
  */
-$0|$6633|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6741|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros.h.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros.h.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -229,7 +232,7 @@
 
 
 
-$6633|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6741|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -257,8 +260,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros.h.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros.h.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_001.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_001.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_001.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_001.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$96|int available_mac_os_x_version_10_0_and_later(int a) AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER;
 $17|/*! test case */
-$0|$8080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8188|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_001.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_001.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8188|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_001.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_001.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_002.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_002.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_002.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_002.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$126|int available_mac_os_x_version_10_0_and_later_but_deprecated(int a) AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED;
 $17|/*! test case */
-$0|$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_002.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_002.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, and deprecated in Mac OS X v10.0.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_002.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_002.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, and deprecated in Mac OS X v10.0.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_003.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_003.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_003.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_003.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$104|int deprecated_in_mac_os_x_version_10_0_and_later(int a) DEPRECATED_IN_MAC_OS_X_VERSION_10_0_AND_LATER;
 $17|/*! test case */
-$0|$8160|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_003.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_003.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.0.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8160|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_003.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_003.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.0.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_004.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_004.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_004.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_004.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$96|int available_mac_os_x_version_10_1_and_later(int a) AVAILABLE_MAC_OS_X_VERSION_10_1_AND_LATER;
 $17|/*! test case */
-$0|$8080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8188|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_004.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_004.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8188|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_004.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_004.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_005.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_005.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_005.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_005.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$126|int available_mac_os_x_version_10_1_and_later_but_deprecated(int a) AVAILABLE_MAC_OS_X_VERSION_10_1_AND_LATER_BUT_DEPRECATED;
 $17|/*! test case */
-$0|$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_005.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_005.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1, and deprecated in Mac OS X v10.1.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_005.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_005.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1, and deprecated in Mac OS X v10.1.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_006.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_006.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_006.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_006.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_0_and_later_but_deprecated_in_mac_os_x_version_10_1(int a) AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_1;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_006.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_006.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, but later deprecated in Mac OS X v10.1.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_006.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_006.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, but later deprecated in Mac OS X v10.1.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_007.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_007.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_007.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_007.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$104|int deprecated_in_mac_os_x_version_10_1_and_later(int a) DEPRECATED_IN_MAC_OS_X_VERSION_10_1_AND_LATER;
 $17|/*! test case */
-$0|$8160|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_007.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_007.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.1.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8160|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_007.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_007.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.1.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_008.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_008.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_008.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_008.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$96|int available_mac_os_x_version_10_2_and_later(int a) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER;
 $17|/*! test case */
-$0|$8077|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8185|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_008.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_008.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.2
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8077|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8185|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_008.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_008.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.2
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_009.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_009.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_009.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_009.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$126|int available_mac_os_x_version_10_2_and_later_but_deprecated(int a) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED;
 $17|/*! test case */
-$0|$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_009.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_009.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.2, and deprecated in Mac OS X v10.2.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_009.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_009.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.2, and deprecated in Mac OS X v10.2.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_010.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_010.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_010.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_010.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_0_and_later_but_deprecated_in_mac_os_x_version_10_2(int a) AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_2;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_010.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_010.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, but later deprecated in Mac OS X v10.2.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_010.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_010.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, but later deprecated in Mac OS X v10.2.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_011.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_011.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_011.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_011.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_1_and_later_but_deprecated_in_mac_os_x_version_10_2(int a) AVAILABLE_MAC_OS_X_VERSION_10_1_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_2;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_011.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_011.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1, but later deprecated in Mac OS X v10.2.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_011.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_011.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1, but later deprecated in Mac OS X v10.2.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_012.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_012.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_012.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_012.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$104|int deprecated_in_mac_os_x_version_10_2_and_later(int a) DEPRECATED_IN_MAC_OS_X_VERSION_10_2_AND_LATER;
 $17|/*! test case */
-$0|$8163|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8271|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_012.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_012.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.2 .
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8163|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8271|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_012.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_012.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.2 .
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_013.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_013.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_013.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_013.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$96|int available_mac_os_x_version_10_3_and_later(int a) AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER;
 $17|/*! test case */
-$0|$8080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8188|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_013.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_013.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.3.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8188|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_013.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_013.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.3.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_014.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_014.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_014.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_014.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$126|int available_mac_os_x_version_10_3_and_later_but_deprecated(int a) AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER_BUT_DEPRECATED;
 $17|/*! test case */
-$0|$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_014.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_014.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.3, and deprecated in Mac OS X v10.3.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_014.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_014.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.3, and deprecated in Mac OS X v10.3.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_015.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_015.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_015.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_015.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_0_and_later_but_deprecated_in_mac_os_x_version_10_3(int a) AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_3;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_015.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_015.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, but later deprecated in Mac OS X v10.3.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_015.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_015.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, but later deprecated in Mac OS X v10.3.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_016.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_016.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_016.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_016.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$177|int available_mac_os_x_version_10_1_and_later_but_deprecated_in_mac_os_x_version_10_3(int a) AVAILABLE_MAC_OS_X_VERSION_10_1_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_3;
 
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_016.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_016.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1, but later deprecated in Mac OS X v10.3.
 
 $parserState->{backslashcount} => 0
@@ -292,7 +295,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -320,8 +323,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_016.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_016.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1, but later deprecated in Mac OS X v10.3.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_017.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_017.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_017.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_017.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$104|int deprecated_in_mac_os_x_version_10_3_and_later(int a) DEPRECATED_IN_MAC_OS_X_VERSION_10_3_AND_LATER;
 $17|/*! test case */
-$0|$8160|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_017.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_017.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.3.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8160|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_017.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_017.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.3.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_018.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_018.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_018.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_018.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$96|int available_mac_os_x_version_10_4_and_later(int a) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
 $17|/*! test case */
-$0|$8080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8188|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_018.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_018.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.4.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8188|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_018.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_018.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.4.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_019.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_019.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_019.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_019.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$126|int available_mac_os_x_version_10_4_and_later_but_deprecated(int a) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER_BUT_DEPRECATED;
 $17|/*! test case */
-$0|$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_019.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_019.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.4, and deprecated in Mac OS X v10.4.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_019.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_019.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.4, and deprecated in Mac OS X v10.4.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_020.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_020.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_020.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_020.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_0_and_later_but_deprecated_in_mac_os_x_version_10_4(int a) AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_020.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_020.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, but later deprecated in Mac OS X v10.4.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_020.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_020.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, but later deprecated in Mac OS X v10.4.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_021.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_021.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_021.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_021.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_1_and_later_but_deprecated_in_mac_os_x_version_10_4(int a) AVAILABLE_MAC_OS_X_VERSION_10_1_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_021.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_021.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1, but later deprecated in Mac OS X v10.4.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_021.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_021.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1, but later deprecated in Mac OS X v10.4.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_022.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_022.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_022.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_022.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_2_and_later_but_deprecated_in_mac_os_x_version_10_4(int a) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_022.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_022.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.2, but later deprecated in Mac OS X v10.4.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_022.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_022.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.2, but later deprecated in Mac OS X v10.4.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_023.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_023.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_023.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_023.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_3_and_later_but_deprecated_in_mac_os_x_version_10_4(int a) AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_023.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_023.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.3, but later deprecated in Mac OS X v10.4.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_023.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_023.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.3, but later deprecated in Mac OS X v10.4.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_024.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_024.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_024.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_024.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$104|int deprecated_in_mac_os_x_version_10_4_and_later(int a) DEPRECATED_IN_MAC_OS_X_VERSION_10_4_AND_LATER;
 $17|/*! test case */
-$0|$8160|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_024.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_024.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.4.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8160|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_024.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_024.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.4.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_025.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_025.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_025.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_025.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$96|int available_mac_os_x_version_10_5_and_later(int a) AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER;
 $17|/*! test case */
-$0|$8080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8188|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_025.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_025.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8188|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_025.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_025.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_026.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_026.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_026.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_026.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$126|int available_mac_os_x_version_10_5_and_later_but_deprecated(int a) AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER_BUT_DEPRECATED;
 $17|/*! test case */
-$0|$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_026.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_026.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.5, and deprecated in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_026.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_026.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.5, and deprecated in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_027.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_027.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_027.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_027.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_0_and_later_but_deprecated_in_mac_os_x_version_10_5(int a) AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_5;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_027.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_027.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, but later deprecated in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_027.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_027.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, but later deprecated in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_028.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_028.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_028.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_028.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_1_and_later_but_deprecated_in_mac_os_x_version_10_5(int a) AVAILABLE_MAC_OS_X_VERSION_10_1_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_5;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_028.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_028.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1, but later deprecated in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_028.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_028.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1, but later deprecated in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_029.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_029.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_029.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_029.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_2_and_later_but_deprecated_in_mac_os_x_version_10_5(int a) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_5;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_029.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_029.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.2, but later deprecated in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_029.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_029.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.2, but later deprecated in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_030.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_030.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_030.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_030.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_3_and_later_but_deprecated_in_mac_os_x_version_10_5(int a) AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_5;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_030.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_030.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.3, but later deprecated in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_030.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_030.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.3, but later deprecated in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_031.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_031.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_031.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_031.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_4_and_later_but_deprecated_in_mac_os_x_version_10_5(int a) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_5;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_031.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_031.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.4, but later deprecated in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_031.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_031.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.4, but later deprecated in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_032.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_032.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_032.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_032.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$104|int deprecated_in_mac_os_x_version_10_5_and_later(int a) DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER;
 $17|/*! test case */
-$0|$8160|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_032.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_032.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8160|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_032.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_032.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.5.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_033.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_033.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_033.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_033.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$96|int available_mac_os_x_version_10_6_and_later(int a) AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER;
 $17|/*! test case */
-$0|$8080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8188|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_033.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_033.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8188|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_033.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_033.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_034.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_034.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_034.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_034.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$126|int available_mac_os_x_version_10_6_and_later_but_deprecated(int a) AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER_BUT_DEPRECATED;
 $17|/*! test case */
-$0|$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_034.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_034.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.6, and deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_034.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_034.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.6, and deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_035.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_035.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_035.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_035.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_0_and_later_but_deprecated_in_mac_os_x_version_10_6(int a) AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_6;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_035.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_035.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, but later deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_035.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_035.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, but later deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_036.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_036.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_036.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_036.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_1_and_later_but_deprecated_in_mac_os_x_version_10_6(int a) AVAILABLE_MAC_OS_X_VERSION_10_1_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_6;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_036.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_036.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1, but later deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_036.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_036.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1, but later deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_037.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_037.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_037.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_037.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_2_and_later_but_deprecated_in_mac_os_x_version_10_6(int a) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_6;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_037.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_037.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.2, but later deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_037.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_037.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.2, but later deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_038.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_038.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_038.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_038.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_3_and_later_but_deprecated_in_mac_os_x_version_10_6(int a) AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_6;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_038.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_038.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.3, but later deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_038.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_038.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.3, but later deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_039.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_039.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_039.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_039.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_4_and_later_but_deprecated_in_mac_os_x_version_10_6(int a) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_6;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_039.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_039.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.4, but later deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_039.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_039.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.4, but later deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_040.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_040.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_040.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_040.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_5_and_later_but_deprecated_in_mac_os_x_version_10_6(int a) AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_6;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_040.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_040.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.5, but later deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_040.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_040.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.5, but later deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_041.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_041.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_041.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_041.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$104|int deprecated_in_mac_os_x_version_10_6_and_later(int a) DEPRECATED_IN_MAC_OS_X_VERSION_10_6_AND_LATER;
 $17|/*! test case */
-$0|$8160|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_041.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_041.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8160|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_041.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_041.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.6.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_042.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_042.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_042.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_042.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$96|int available_mac_os_x_version_10_7_and_later(int a) AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER;
 $17|/*! test case */
-$0|$8080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8188|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_042.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_042.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8188|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_042.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_042.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_043.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_043.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_043.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_043.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$126|int available_mac_os_x_version_10_7_and_later_but_deprecated(int a) AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER_BUT_DEPRECATED;
 $17|/*! test case */
-$0|$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_043.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_043.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.7, and deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8482|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8590|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_043.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_043.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.7, and deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_044.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_044.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_044.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_044.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_0_and_later_but_deprecated_in_mac_os_x_version_10_7(int a) AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_7;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_044.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_044.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, but later deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_044.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_044.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.0, but later deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_045.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_045.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_045.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_045.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_1_and_later_but_deprecated_in_mac_os_x_version_10_7(int a) AVAILABLE_MAC_OS_X_VERSION_10_1_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_7;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_045.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_045.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1, but later deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_045.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_045.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.1, but later deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_046.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_046.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_046.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_046.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_2_and_later_but_deprecated_in_mac_os_x_version_10_7(int a) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_7;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_046.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_046.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.2, but later deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_046.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_046.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.2, but later deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_047.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_047.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_047.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_047.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_3_and_later_but_deprecated_in_mac_os_x_version_10_7(int a) AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_7;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_047.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_047.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.3, but later deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_047.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_047.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.3, but later deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_048.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_048.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_048.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_048.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_4_and_later_but_deprecated_in_mac_os_x_version_10_7(int a) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_7;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_048.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_048.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.4, but later deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_048.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_048.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.4, but later deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_049.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_049.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_049.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_049.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_5_and_later_but_deprecated_in_mac_os_x_version_10_7(int a) AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_7;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_049.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_049.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.5, but later deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_049.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_049.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.5, but later deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_050.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_050.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_050.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_050.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$176|int available_mac_os_x_version_10_6_and_later_but_deprecated_in_mac_os_x_version_10_7(int a) AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_7;
 $17|/*! test case */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_050.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_050.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.6, but later deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_050.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_050.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Introduced in Mac OS X v10.6, but later deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_051.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_051.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_051.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_051.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$104|int deprecated_in_mac_os_x_version_10_7_and_later(int a) DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;
 $17|/*! test case */
-$0|$8160|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_051.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_051.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
@@ -291,7 +294,7 @@
 
 
 
-$8160|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -319,8 +322,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_051.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_051.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => Deprecated in Mac OS X v10.7.
 
 $parserState->{backslashcount} => 0
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_052.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_052.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_052.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_052.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$126|int __osx_available_but_deprecated(int a) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_6, __MAC_10_7, __IPHONE_3_0, __IPHONE_4_0);
 $17|/*! test case */
-$0|$8438|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8546|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_052.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_052.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -314,7 +317,7 @@
 
 
 
-$8438|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8546|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -342,8 +345,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_052.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_052.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_053.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_053.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_053.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_053.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$88|int __osx_available_starting(int a) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_0);
 $17|/*! test case */
-$0|$8006|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8114|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_053.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_053.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -302,7 +305,7 @@
 
 
 
-$8006|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8114|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -330,8 +333,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_053.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_053.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_054.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_054.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_054.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_054.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$49|int ns_available(int a) NS_AVAILABLE(10_7, 3_0);
 $17|/*! test case */
-$0|$7736|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7844|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_054.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_054.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -302,7 +305,7 @@
 
 
 
-$7736|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7844|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -330,8 +333,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_054.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_054.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_055.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_055.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_055.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_055.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$49|int cf_available(int a) CF_AVAILABLE(10_7, 3_0);
 $17|/*! test case */
-$0|$7736|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7844|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_055.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_055.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -302,7 +305,7 @@
 
 
 
-$7736|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7844|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -330,8 +333,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_055.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_055.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_056.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_056.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_056.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_056.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$52|int ns_available_mac(int a) NS_AVAILABLE_MAC(10_7);
 $17|/*! test case */
-$0|$7750|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7858|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_056.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_056.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -296,7 +299,7 @@
 
 
 
-$7750|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7858|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -324,8 +327,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_056.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_056.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_057.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_057.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_057.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_057.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$52|int cf_available_mac(int a) CF_AVAILABLE_MAC(10_7);
 $17|/*! test case */
-$0|$7750|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7858|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_057.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_057.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -296,7 +299,7 @@
 
 
 
-$7750|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7858|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -324,8 +327,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_057.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_057.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_058.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_058.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_058.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_058.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$57|int ns_available_iphone(int a) NS_AVAILABLE_IPHONE(3_0);
 $17|/*! test case */
-$0|$7806|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7914|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_058.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_058.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -296,7 +299,7 @@
 
 
 
-$7806|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7914|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -324,8 +327,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_058.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_058.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_059.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_059.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_059.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_059.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$51|int ns_available_ios(int a) NS_AVAILABLE_IOS(3_0);
 $17|/*! test case */
-$0|$7746|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7854|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_059.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_059.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -296,7 +299,7 @@
 
 
 
-$7746|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7854|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -324,8 +327,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_059.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_059.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_060.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_060.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_060.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_060.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$57|int cf_available_iphone(int a) CF_AVAILABLE_IPHONE(3_0);
 $17|/*! test case */
-$0|$7806|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7914|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_060.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_060.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -296,7 +299,7 @@
 
 
 
-$7806|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7914|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -324,8 +327,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_060.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_060.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_061.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_061.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_061.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_061.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$51|int cf_available_ios(int a) CF_AVAILABLE_IOS(3_0);
 $17|/*! test case */
-$0|$7746|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7854|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_061.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_061.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -296,7 +299,7 @@
 
 
 
-$7746|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7854|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -324,8 +327,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_061.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_061.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_062.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_062.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_062.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_062.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$62|int ns_deprecated(int a) NS_DEPRECATED(10_6, 10_7, 3_0, 3_1);
 $17|/*! test case */
-$0|$8038|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8146|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_062.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_062.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -314,7 +317,7 @@
 
 
 
-$8038|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8146|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -342,8 +345,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_062.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_062.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_063.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_063.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_063.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_063.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$62|int cf_deprecated(int a) CF_DEPRECATED(10_6, 10_7, 3_0, 3_1);
 $17|/*! test case */
-$0|$8038|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8146|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_063.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_063.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -314,7 +317,7 @@
 
 
 
-$8038|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8146|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -342,8 +345,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_063.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_063.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_064.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_064.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_064.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_064.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$60|int ns_deprecated_mac(int a) NS_DEPRECATED_MAC(10_6, 10_7);
 $17|/*! test case */
-$0|$7918|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8026|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_064.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_064.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -302,7 +305,7 @@
 
 
 
-$7918|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8026|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -330,8 +333,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_064.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_064.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_065.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_065.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_065.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_065.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$60|int cf_deprecated_mac(int a) CF_DEPRECATED_MAC(10_6, 10_7);
 $17|/*! test case */
-$0|$7918|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8026|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_065.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_065.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -302,7 +305,7 @@
 
 
 
-$7918|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8026|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -330,8 +333,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_065.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_065.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_066.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_066.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_066.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_066.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$64|int ns_deprecated_iphone(int a) NS_DEPRECATED_IPHONE(3_0, 3_1);
 $17|/*! test case */
-$0|$7960|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8068|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_066.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_066.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -302,7 +305,7 @@
 
 
 
-$7960|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8068|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -330,8 +333,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_066.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_066.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_067.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_067.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_067.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_067.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$58|int ns_deprecated_ios(int a) NS_DEPRECATED_IOS(3_0, 3_1);
 $17|/*! test case */
-$0|$7900|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8008|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_067.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_067.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -302,7 +305,7 @@
 
 
 
-$7900|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8008|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -330,8 +333,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_067.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_067.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_068.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_068.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_068.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_068.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$64|int cf_deprecated_iphone(int a) CF_DEPRECATED_IPHONE(3_0, 3_1);
 $17|/*! test case */
-$0|$7960|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8068|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_068.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_068.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -302,7 +305,7 @@
 
 
 
-$7960|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8068|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -330,8 +333,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_068.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_068.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_069.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_069.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_069.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_069.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$58|int cf_deprecated_ios(int a) CF_DEPRECATED_IOS(3_0, 3_1);
 $17|/*! test case */
-$0|$7900|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8008|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_069.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_069.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -302,7 +305,7 @@
 
 
 
-$7900|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8008|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -330,8 +333,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_069.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_069.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_070.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_070.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_070.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_070.test	2013-05-14 15:12:53.000000000 -0700
@@ -2,7 +2,7 @@
 
 $80|/*! Verifies that availability macro definitions
     don't choke the parser. */
-$0|$20698|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$20806|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_070.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_070.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -481,7 +484,7 @@
 
 
 
-$20698|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$20806|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -509,8 +512,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_070.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_070.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_071.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_071.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_071.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_071.test	2013-05-14 15:12:53.000000000 -0700
@@ -13,7 +13,7 @@
 @end
 $34|/*! @class avmacros_071_class
  */
-$0|$19446|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$19554|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -41,9 +41,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_071.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_071.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -615,7 +618,7 @@
 
 
 
-$21505|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$21613|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -643,9 +646,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_071.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_071.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/avmacros_072.test headerdoc-8.9.20/testsuite/parser_tests/avmacros_072.test
--- headerdoc-8.9.14/testsuite/parser_tests/avmacros_072.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/avmacros_072.test	2013-05-14 15:12:53.000000000 -0700
@@ -6,7 +6,7 @@
 @end
 
 $12|/*! test */
-$0|$9030|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9138|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,8 +34,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_072.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_072.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
@@ -319,7 +322,7 @@
 
 
 
-$10825|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10933|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -347,8 +350,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/avmacros_072.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/avmacros_072.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{attributeState} => 0
 $parserState->{availability} => 
 $parserState->{availabilityNodesArray} => ARRAY(OBJID)
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/basic_function.test headerdoc-8.9.20/testsuite/parser_tests/basic_function.test
--- headerdoc-8.9.14/testsuite/parser_tests/basic_function.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/basic_function.test	2013-05-14 15:12:53.000000000 -0700
@@ -2,7 +2,7 @@
 $59|/*! @function foo
 This is a test, this is only a test.
  */
-_$7236|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+_$7344|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/basic_function.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/basic_function.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -286,7 +289,7 @@
 
 
 
-$7236|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7344|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -314,8 +317,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/basic_function.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/basic_function.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/block_1.test headerdoc-8.9.20/testsuite/parser_tests/block_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/block_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/block_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$76|typedef void (^block_test_29342384_dispatch_block_t)(dispatch_item_t item);
 $22|/*! Block callback */
-$0|$8204|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8312|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/block_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/block_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -296,7 +299,7 @@
 
 
 
-$8204|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8312|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -324,8 +327,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/block_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/block_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/block_2.test headerdoc-8.9.20/testsuite/parser_tests/block_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/block_2.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/block_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -4,7 +4,7 @@
                 A parameter that takes a block with one argument of
                 type size_t and another argument of type int.
  */
-$0|$10816|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10924|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -32,8 +32,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/block_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/block_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -407,7 +410,7 @@
 
 
 
-$10816|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10924|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -435,8 +438,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/block_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/block_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/block_3.test headerdoc-8.9.20/testsuite/parser_tests/block_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/block_3.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/block_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -6,7 +6,7 @@
         Returns a block that takes two arguments, one of type
         size_t and one of type int.
  */
-$0|$11816|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$11924|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,8 +34,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/block_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/block_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -439,7 +442,7 @@
 
 
 
-$11816|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$11924|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -467,8 +470,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/block_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/block_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/block_4.test headerdoc-8.9.20/testsuite/parser_tests/block_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/block_4.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/block_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -9,7 +9,7 @@
 }
 #endif
 $11|/*! foo */
-$0|$6399|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6507|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -37,8 +37,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/block_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/block_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -258,7 +261,7 @@
 
 
 
-$6399|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6507|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -286,8 +289,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/block_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/block_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/block_5.test headerdoc-8.9.20/testsuite/parser_tests/block_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/block_5.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/block_5.test	2013-05-14 15:12:53.000000000 -0700
@@ -6,7 +6,7 @@
 	int nestedif_BAR(int a, char *b);
 #endif
 $12|/*! test */
-$0|$12589|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$12697|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,8 +34,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/block_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/block_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -455,7 +458,7 @@
 
 
 
-$12589|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$12697|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -483,8 +486,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/block_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/block_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/callback_1.test headerdoc-8.9.20/testsuite/parser_tests/callback_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/callback_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/callback_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -24,7 +24,7 @@
         @field hash The callback used to compute a hash code for keys as they
                 are used to access, add, or remove values in the dictionary.
 */
-$0|$30644|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$30752|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -52,8 +52,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/callback_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/callback_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -1096,7 +1099,7 @@
 
 
 
-$30644|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$30752|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -1124,8 +1127,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/callback_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/callback_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/callback_2.test headerdoc-8.9.20/testsuite/parser_tests/callback_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/callback_2.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/callback_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -10,7 +10,7 @@
         @param char_b
                 A char *.
  */ 
-$0|$12000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$12108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -38,8 +38,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/callback_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/callback_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -467,7 +470,7 @@
 
 
 
-$12000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$12108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -495,8 +498,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/callback_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/callback_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/callback_3.test headerdoc-8.9.20/testsuite/parser_tests/callback_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/callback_3.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/callback_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -3,7 +3,7 @@
     @field z
         Z
  */
-$0|$11820|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$11928|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/callback_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/callback_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -445,7 +448,7 @@
 
 
 
-$11820|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$11928|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -473,8 +476,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/callback_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/callback_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/callback_4.test headerdoc-8.9.20/testsuite/parser_tests/callback_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/callback_4.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/callback_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -10,7 +10,7 @@
         @param char_d
                 A char *.
  */
-$0|$13084|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$13192|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -38,8 +38,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/callback_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/callback_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -499,7 +502,7 @@
 
 
 
-$13084|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$13192|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -527,8 +530,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/callback_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/callback_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/callback_5.test headerdoc-8.9.20/testsuite/parser_tests/callback_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/callback_5.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/callback_5.test	2013-05-14 15:12:53.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$77|typedef void (*funcptr_test_29384789234_std_callback)(dispatch_item_t item);
 $25|/*! Standard callback */
-$0|$8297|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8405|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/callback_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/callback_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -297,7 +300,7 @@
 
 
 
-$8297|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8405|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -325,8 +328,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/callback_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/callback_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/class_1.test headerdoc-8.9.20/testsuite/parser_tests/class_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/class_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/class_1.test	2013-05-14 15:12:53.000000000 -0700
@@ -6,7 +6,7 @@
 
 };
 $43|/*! @class class_example_1 : public bat */
-$0|$9798|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9906|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -34,9 +34,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/class_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/class_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -358,7 +361,7 @@
 
 
 
-$9798|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9906|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -386,9 +389,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/class_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/class_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/class_2.test headerdoc-8.9.20/testsuite/parser_tests/class_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/class_2.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/class_2.test	2013-05-14 15:12:53.000000000 -0700
@@ -9,7 +9,7 @@
 foo_t operator &(foo_t &a);
 };
 $13|/*! class */
-$0|$17641|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$17749|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -37,9 +37,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/class_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/class_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -629,7 +632,7 @@
 
 
 
-$17641|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$17749|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -657,9 +660,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/class_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/class_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/class_3.test headerdoc-8.9.20/testsuite/parser_tests/class_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/class_3.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/class_3.test	2013-05-14 15:12:53.000000000 -0700
@@ -198,7 +198,7 @@
 client that creates the event, not the work-loop, is expected to retain the
 source.
 */
-$0|$197474|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$197582|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -226,9 +226,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/class_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/class_3.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -8548,7 +8551,7 @@
 
 
 
-$210093|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$210201|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -8576,9 +8579,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/class_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/class_3.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/class_4.test headerdoc-8.9.20/testsuite/parser_tests/class_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/class_4.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/class_4.test	2013-05-14 15:12:53.000000000 -0700
@@ -220,7 +220,7 @@
     virtual void _RESERVEDOSMetaClassBase7();
 };
 $23|/*! OSMetaClassBase */
-$0|$409653|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$409761|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -248,9 +248,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/class_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/class_4.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -16682,7 +16685,7 @@
 
 
 
-$501696|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$501804|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -16710,9 +16713,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/class_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/class_4.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/class_5.test headerdoc-8.9.20/testsuite/parser_tests/class_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/class_5.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/class_5.test	2013-05-14 15:12:53.000000000 -0700
@@ -394,7 +394,7 @@
     @class OSMetaClass : OSMetaClassBase
     @abstract An instance of a OSMetaClass represents one class then the kernel's runtime type information system is aware of.
 */
-$0|$3924238|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$3924346|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -422,9 +422,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/class_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/class_5.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -174146,7 +174149,7 @@
 
 
 
-$4370531|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$4370639|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -174174,9 +174177,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/class_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/class_5.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/class_6.test headerdoc-8.9.20/testsuite/parser_tests/class_6.test
--- headerdoc-8.9.14/testsuite/parser_tests/class_6.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/class_6.test	2013-05-14 15:12:54.000000000 -0700
@@ -18,7 +18,7 @@
     is an example of this implementing all the functions necessary to drive an
     OHCI controller.
 */
-$0|$13993|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$14101|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -46,9 +46,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/class_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/class_6.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -472,7 +475,7 @@
 
 
 
-$13993|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$14101|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -500,9 +503,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/class_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/class_6.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/comments_1.test headerdoc-8.9.20/testsuite/parser_tests/comments_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/comments_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/comments_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -11,7 +11,7 @@
 
 }
 $12|/*! test */
-$0|$10322|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10430|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -39,8 +39,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/comments_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/comments_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -412,7 +415,7 @@
 
 
 
-$10322|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10430|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -440,8 +443,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/comments_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/comments_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/const_1.test headerdoc-8.9.20/testsuite/parser_tests/const_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/const_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/const_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$31|    const OSSymbol *className;
 $51|/*! @var className OSSymbol of the class' name. */
-$0|$6015|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6123|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/const_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/const_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -239,7 +242,7 @@
 
 
 
-$6015|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6123|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -267,8 +270,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/const_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/const_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/const_2.test headerdoc-8.9.20/testsuite/parser_tests/const_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/const_2.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/const_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$30|char *mystring = "const foo";
 $31|/*! This is NOT a constant. */
-$0|$6090|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6198|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/const_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/const_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -249,7 +252,7 @@
 
 
 
-$6090|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6198|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -277,8 +280,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/const_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/const_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/const_3.test headerdoc-8.9.20/testsuite/parser_tests/const_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/const_3.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/const_3.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$70|char mychar = 'const foo';
 /* No, this is not strictly legal C.... */
 $39|/*! This is NOT a constant, either. */
-$0|$5990|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6098|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/const_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/const_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -247,7 +250,7 @@
 
 
 
-$5990|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6098|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -275,8 +278,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/const_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/const_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/cpp_1.test headerdoc-8.9.20/testsuite/parser_tests/cpp_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/cpp_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/cpp_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$16|#define foo bar
 $20|/*! @define foo
  */
-_$6305|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+_$6413|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/cpp_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/cpp_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -231,7 +234,7 @@
 
 
 
-$6305|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6413|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -259,8 +262,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/cpp_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/cpp_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/cpp_error.test headerdoc-8.9.20/testsuite/parser_tests/cpp_error.test
--- headerdoc-8.9.14/testsuite/parser_tests/cpp_error.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/cpp_error.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$93|#error "This is a bad failure #include <foo/foo.h> instead"
 int bogus_test_variable_error_1;
 $22|/*! This is a test */
-$0|$6016|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6124|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/cpp_error.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/cpp_error.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -248,7 +251,7 @@
 
 
 
-$6016|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6124|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -276,8 +279,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/cpp_error.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/cpp_error.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/cpp_warning.test headerdoc-8.9.20/testsuite/parser_tests/cpp_warning.test
--- headerdoc-8.9.14/testsuite/parser_tests/cpp_warning.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/cpp_warning.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$103|#warning  "This is a less bad failure. #include <foo/foo.h> instead."
 int bogus_test_variable_error_2;
 $22|/*! This is a test */
-$0|$6091|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6199|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/cpp_warning.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/cpp_warning.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -253,7 +256,7 @@
 
 
 
-$6091|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6199|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -281,8 +284,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/cpp_warning.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/cpp_warning.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/define_1.test headerdoc-8.9.20/testsuite/parser_tests/define_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/define_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/define_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -3,7 +3,7 @@
                 This is a test
 
 $18|/*! Multi-line */
-$0|$9872|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9980|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -275,7 +278,7 @@
 
 
 
-$9872|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9980|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -303,8 +306,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/define_2.test headerdoc-8.9.20/testsuite/parser_tests/define_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/define_2.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/define_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -3,7 +3,7 @@
      @defined IOEventSourceAction
      @discussion Back compatibility macro for new class based typing.
 */
-$0|$7763|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7871|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -240,7 +243,7 @@
 
 
 
-$7763|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7871|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -268,8 +271,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/define_3.test headerdoc-8.9.20/testsuite/parser_tests/define_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/define_3.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/define_3.test	2013-05-14 15:12:54.000000000 -0700
@@ -3,7 +3,7 @@
         @param a arg1
         @param b arg2
  */
-$0|$13575|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$13683|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -439,7 +442,7 @@
 
 
 
-$13575|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$13683|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -467,8 +470,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/define_4.test headerdoc-8.9.20/testsuite/parser_tests/define_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/define_4.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/define_4.test	2013-05-14 15:12:54.000000000 -0700
@@ -7,7 +7,7 @@
         @param d arg4
  */
 
-$0|$13878|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$13986|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -35,8 +35,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -461,7 +464,7 @@
 
 
 
-$13878|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$13986|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -489,8 +492,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/define_5.test headerdoc-8.9.20/testsuite/parser_tests/define_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/define_5.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/define_5.test	2013-05-14 15:12:54.000000000 -0700
@@ -19,7 +19,7 @@
     @param className Name of class. NO QUOTES.
     @hidecontents
 */
-$0|$16606|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$16714|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -47,8 +47,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -698,7 +701,7 @@
 
 
 
-$16606|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$16714|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -726,8 +729,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/define_block_1.test headerdoc-8.9.20/testsuite/parser_tests/define_block_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/define_block_1.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/define_block_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -16,7 +16,7 @@
     @abstract Abstract for block 1
     @discussion Discussion for block 1
  */
-$0|$23724|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$23832|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -44,8 +44,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_block_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_block_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -774,7 +777,7 @@
 
 
 
-$23724|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$23832|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -802,8 +805,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_block_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_block_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/define_block_2.test headerdoc-8.9.20/testsuite/parser_tests/define_block_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/define_block_2.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/define_block_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -13,7 +13,7 @@
 @define DEFINE_BLOCK_2_MEM_FOO Assume Foo.
 @discussion All these bits are optional.
 */
-$0|$42385|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$42493|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -41,8 +41,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_block_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_block_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -1089,7 +1092,7 @@
 
 
 
-$42385|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$42493|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -1117,8 +1120,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_block_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_block_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/define_block_3.test headerdoc-8.9.20/testsuite/parser_tests/define_block_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/define_block_3.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/define_block_3.test	2013-05-14 15:12:54.000000000 -0700
@@ -15,7 +15,7 @@
 	HSDB #4 discussion here.
     @hidesingletons
  */
-$0|$28710|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$28818|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -43,8 +43,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_block_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_block_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -915,7 +918,7 @@
 
 
 
-$28710|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$28818|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -943,8 +946,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_block_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_block_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/define_block_4.test headerdoc-8.9.20/testsuite/parser_tests/define_block_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/define_block_4.test	2014-02-21 13:49:18.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/define_block_4.test	2013-05-14 15:12:54.000000000 -0700
@@ -26,7 +26,7 @@
 ntracts with regards to logging behaviour, so it must be used carefully (and is thus not the 
  * default behaviour).
  *       @param error The CFErrorRef to reuse. */
-$0|$28755|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$28863|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -54,8 +54,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_block_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_block_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -608,7 +611,7 @@
 
 
 
-$28755|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$28863|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -636,8 +639,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_block_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_block_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/define_block_5.test headerdoc-8.9.20/testsuite/parser_tests/define_block_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/define_block_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/define_block_5.test	2013-05-14 15:12:54.000000000 -0700
@@ -21,7 +21,7 @@
 
 };
 $13|/*! Class */
-$0|$40744|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$40852|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -49,9 +49,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_block_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_block_5.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -1045,7 +1048,7 @@
 
 
 
-$40744|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$40852|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -1073,9 +1076,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_block_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_block_5.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/define_block_6.test headerdoc-8.9.20/testsuite/parser_tests/define_block_6.test
--- headerdoc-8.9.14/testsuite/parser_tests/define_block_6.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/define_block_6.test	2013-05-14 15:12:54.000000000 -0700
@@ -29,7 +29,7 @@
     @abstract Define block 1 abstract.
     @discussion Define block 1 discussion.
  */
-$0|$62700|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$62808|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -57,8 +57,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_block_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_block_6.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -1591,7 +1594,7 @@
 
 
 
-$62700|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$62808|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -1619,8 +1622,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/define_block_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/define_block_6.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/duplicate_apple_ref_1-1.test headerdoc-8.9.20/testsuite/parser_tests/duplicate_apple_ref_1-1.test
--- headerdoc-8.9.14/testsuite/parser_tests/duplicate_apple_ref_1-1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/duplicate_apple_ref_1-1.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$26|int dup_apple_ref(int a);
 $32|/*! @function dup_apple_ref
  */
-$0|$7420|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7528|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/duplicate_apple_ref_1-1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/duplicate_apple_ref_1-1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -285,7 +288,7 @@
 
 
 
-$7420|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7528|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -313,8 +316,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/duplicate_apple_ref_1-1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/duplicate_apple_ref_1-1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/duplicate_apple_ref_1-2.test headerdoc-8.9.20/testsuite/parser_tests/duplicate_apple_ref_1-2.test
--- headerdoc-8.9.14/testsuite/parser_tests/duplicate_apple_ref_1-2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/duplicate_apple_ref_1-2.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$28|int dup_apple_ref(char *b);
 $32|/*! @function dup_apple_ref
  */
-$0|$7525|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7633|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/duplicate_apple_ref_1-2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/duplicate_apple_ref_1-2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -288,7 +291,7 @@
 
 
 
-$7525|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7633|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -316,8 +319,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/duplicate_apple_ref_1-2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/duplicate_apple_ref_1-2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/enum_1.test headerdoc-8.9.20/testsuite/parser_tests/enum_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/enum_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/enum_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -13,7 +13,7 @@
   @constant kMilk Dairy beverages.
   @constant kWater Unflavored, non-sweet, non-caloric, non-alcoholic beverages.
 */
-$0|$11017|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$11125|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -41,8 +41,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/enum_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/enum_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
@@ -464,7 +467,7 @@
 
 
 
-$11017|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$11125|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -492,8 +495,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/enum_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/enum_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/enum_2.test headerdoc-8.9.20/testsuite/parser_tests/enum_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/enum_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/enum_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -4,7 +4,7 @@
 $26|/*!
    Anonymous enum
  */
-$0|$6654|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6762|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -32,8 +32,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/enum_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/enum_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
@@ -292,7 +295,7 @@
 
 
 
-$6654|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6762|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -320,8 +323,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/enum_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/enum_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/enum_3.test headerdoc-8.9.20/testsuite/parser_tests/enum_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/enum_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/enum_3.test	2013-05-14 15:12:54.000000000 -0700
@@ -22,7 +22,7 @@
  * default priority and high priority queues have been
  * scheduled.
  */
-$0|$10589|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10697|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -50,8 +50,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/enum_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/enum_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
@@ -444,7 +447,7 @@
 
 
 
-$10589|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10697|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -472,8 +475,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/enum_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/enum_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/enum_4.test headerdoc-8.9.20/testsuite/parser_tests/enum_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/enum_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/enum_4.test	2013-05-14 15:12:54.000000000 -0700
@@ -19,7 +19,7 @@
  * If the specified absolute time has already passed,
  * the timer will fire immediately.
  */
-$0|$10478|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10586|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -47,8 +47,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/enum_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/enum_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
@@ -439,7 +442,7 @@
 
 
 
-$10478|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10586|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -467,8 +470,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/enum_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/enum_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/enum_5.test headerdoc-8.9.20/testsuite/parser_tests/enum_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/enum_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/enum_5.test	2013-05-14 15:12:54.000000000 -0700
@@ -23,7 +23,7 @@
     parse, causing some constant values to not get picked up correctly in
     code that really shouldn't care, but does.
  */
-$0|$11397|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$11505|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -51,8 +51,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/enum_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/enum_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
@@ -435,7 +438,7 @@
 
 
 
-$11397|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$11505|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -463,8 +466,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/enum_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/enum_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/extern__C__1.test headerdoc-8.9.20/testsuite/parser_tests/extern__C__1.test
--- headerdoc-8.9.14/testsuite/parser_tests/extern__C__1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/extern__C__1.test	2013-05-14 15:12:54.000000000 -0700
@@ -2,7 +2,7 @@
 int extern_c_foo(int extern_c_foo_a, char *extern_c_foo_b);
 }
 $23|/*! This is a test. */
-$0|$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/extern__C__1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/extern__C__1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -343,7 +346,7 @@
 
 
 
-$9000|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9108|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -371,8 +374,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/extern__C__1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/extern__C__1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/function_1.test headerdoc-8.9.20/testsuite/parser_tests/function_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/function_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/function_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -2,7 +2,7 @@
 $104|/*! @function anonymous_parameter_test
     @abstract Test of anonymous parameters (void *, void *).
  */
-$0|$12463|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$12571|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -460,7 +463,7 @@
 
 
 
-$12463|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$12571|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -488,8 +491,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/function_2.test headerdoc-8.9.20/testsuite/parser_tests/function_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/function_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/function_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -4,7 +4,7 @@
     @param foo Format string.
     @param ... additional parameters.
 */
-$0|$11293|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$11401|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -32,8 +32,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -439,7 +442,7 @@
 
 
 
-$11293|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$11401|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -467,8 +470,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/function_3.test headerdoc-8.9.20/testsuite/parser_tests/function_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/function_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/function_3.test	2013-05-14 15:12:54.000000000 -0700
@@ -2,7 +2,7 @@
 $91|/*! @function arrayparam_test
     @param someArray This is a test of array parameters.
  */
-$0|$13331|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$13439|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -489,7 +492,7 @@
 
 
 
-$13331|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$13439|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -517,8 +520,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/function_4.test headerdoc-8.9.20/testsuite/parser_tests/function_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/function_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/function_4.test	2013-05-14 15:12:54.000000000 -0700
@@ -3,7 +3,7 @@
     return k;
 }
 $13|/*! test2 */
-$0|$7436|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7544|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -289,7 +292,7 @@
 
 
 
-$7436|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7544|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -317,8 +320,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/function_5.test headerdoc-8.9.20/testsuite/parser_tests/function_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/function_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/function_5.test	2013-05-14 15:12:54.000000000 -0700
@@ -9,7 +9,7 @@
     @abstract Returns an iterator over an registry entry's parent entries in a specified plane.
     @param plane The plane object.
     @result Returns an iterator over the parents of the registry entry, or zero if there is a resource failure. The iterator must be released when the iteration is finished. All objects returned by the iteration are retained while the iterator is valid, though they may no longer be attached during the iteration. */
-$0|$9816|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9924|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -37,8 +37,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -368,7 +371,7 @@
 
 
 
-$9816|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9924|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -396,8 +399,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/function_6.test headerdoc-8.9.20/testsuite/parser_tests/function_6.test
--- headerdoc-8.9.14/testsuite/parser_tests/function_6.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/function_6.test	2013-05-14 15:12:54.000000000 -0700
@@ -5,7 +5,7 @@
     @discussion This function will return the parent to which a registry entry was first attached. Since the majority of registry entrys have only one provider, this is a useful simplification.
     @param plane The plane object.
     @result Returns the first parent of the registry entry, or zero if the entry is not attached into the registry in that plane. The parent is retained while the entry is attached, and should not be released by the caller. */
-$0|$9801|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9909|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,8 +33,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_6.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -363,7 +366,7 @@
 
 
 
-$9801|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9909|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -391,8 +394,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_6.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/function_7.test headerdoc-8.9.20/testsuite/parser_tests/function_7.test
--- headerdoc-8.9.14/testsuite/parser_tests/function_7.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/function_7.test	2013-05-14 15:12:54.000000000 -0700
@@ -3,7 +3,7 @@
 $37|/*!
  * @function function_test_7
  */
-$0|$6722|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6830|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_7.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_7.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -260,7 +263,7 @@
 
 
 
-$6722|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6830|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -288,8 +291,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_7.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_7.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/function_block_1.test headerdoc-8.9.20/testsuite/parser_tests/function_block_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/function_block_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/function_block_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -5,7 +5,7 @@
 int mylongfunction(int mylongfunctionvalue);
 #endif
 $37|/*! This is a block of functions. */
-$0|$28476|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$28584|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,8 +33,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_block_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_block_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -869,7 +872,7 @@
 
 
 
-$28476|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$28584|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -897,8 +900,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_block_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_block_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/function_block_2.test headerdoc-8.9.20/testsuite/parser_tests/function_block_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/function_block_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/function_block_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -6,7 +6,7 @@
 $64|/*! @function
         This is a function with two variants.
  */
-$0|$10637|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10745|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,8 +34,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_block_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_block_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -381,7 +384,7 @@
 
 
 
-$10637|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10745|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -409,8 +412,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_block_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_block_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/function_block_3.test headerdoc-8.9.20/testsuite/parser_tests/function_block_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/function_block_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/function_block_3.test	2013-05-14 15:12:54.000000000 -0700
@@ -6,7 +6,7 @@
 $70|/*! @function
         This is another function with two variants.
  */
-$0|$10658|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10766|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,8 +34,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_block_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_block_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -381,7 +384,7 @@
 
 
 
-$10658|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10766|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -409,8 +412,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_block_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_block_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/function_block_4.test headerdoc-8.9.20/testsuite/parser_tests/function_block_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/function_block_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/function_block_4.test	2013-05-14 15:12:54.000000000 -0700
@@ -6,7 +6,7 @@
 $87|/*! @function multi_func_3
         This is yet another function with two variants.
  */
-$0|$10646|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10754|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,8 +34,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_block_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_block_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -380,7 +383,7 @@
 
 
 
-$10646|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10754|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -408,8 +411,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_block_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_block_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/function_block_5.test headerdoc-8.9.20/testsuite/parser_tests/function_block_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/function_block_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/function_block_5.test	2013-05-14 15:12:54.000000000 -0700
@@ -6,7 +6,7 @@
 $87|/*! @function multi_func_4
         This is yet another function with two variants.
  */
-$0|$10661|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10769|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,8 +34,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_block_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_block_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -380,7 +383,7 @@
 
 
 
-$10661|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10769|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -408,8 +411,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_block_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_block_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/function_block_6.test headerdoc-8.9.20/testsuite/parser_tests/function_block_6.test
--- headerdoc-8.9.14/testsuite/parser_tests/function_block_6.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/function_block_6.test	2013-05-14 15:12:54.000000000 -0700
@@ -26,7 +26,7 @@
         char *another_hidden_function(char *this_function_also_should_not_appear);
 };
 $24|/*! This is a class. */
-$0|$31488|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$31596|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -54,9 +54,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_block_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_block_6.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -997,7 +1000,7 @@
 
 
 
-$57903|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$58011|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -1025,9 +1028,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/function_block_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/function_block_6.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -2937,4 +2943,4 @@
 
 
 
-_$21|function_block_6.test$1|C$16|function block 6$1|C$6|parser
\ No newline at end of file
+_$98|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/function_block_6.test$1|C$16|function block 6$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/group_test_1.test headerdoc-8.9.20/testsuite/parser_tests/group_test_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/group_test_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/group_test_1.test	2014-02-14 18:03:01.000000000 -0800
@@ -64,4 +64,4 @@
 name => test group
 Description => <p>This is a test of groups.  <hd_link posstarget="foo"> bar </hd_link>.
 $49|This is a basic test of handling the @group tag.
-$129|/Network/Servers/hills/Volumes/tienda/dgatwood/headerdoc-8.8.20/Modules/HeaderDoc//../../testsuite/parser_tests/group_test_1.test$1|C$12|group test 1$1|C$6|parser
\ No newline at end of file
+$40|testsuite/parser_tests/group_test_1.test$1|C$12|group test 1$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/group_test_10.test headerdoc-8.9.20/testsuite/parser_tests/group_test_10.test
--- headerdoc-8.9.14/testsuite/parser_tests/group_test_10.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/group_test_10.test	2014-02-14 18:03:01.000000000 -0800
@@ -16,7 +16,7 @@
 $33|/*!
      @class group_test_10
 */
-$0|$15309|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$15417|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -44,9 +44,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/group_test_10.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/group_test_10.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -519,7 +522,7 @@
 
 
 
-$15309|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$15417|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -547,9 +550,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/group_test_10.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/group_test_10.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -1023,4 +1029,4 @@
 
 
 $47|Tests groups with descriptions inside a class.
-$95|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/group_test_10.test$1|C$13|group test 10$1|C$6|parser
\ No newline at end of file
+$41|testsuite/parser_tests/group_test_10.test$1|C$13|group test 10$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/group_test_2.test headerdoc-8.9.20/testsuite/parser_tests/group_test_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/group_test_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/group_test_2.test	2014-02-14 18:03:01.000000000 -0800
@@ -64,4 +64,4 @@
 name => test function group
 Description => <p>This is a test of groups.  <hd_link posstarget="foo"> bar </hd_link>.
 $48|This is a basic test of the @functiongroup tag.
-$129|/Network/Servers/hills/Volumes/tienda/dgatwood/headerdoc-8.8.20/Modules/HeaderDoc//../../testsuite/parser_tests/group_test_2.test$1|C$12|group test 2$1|C$6|parser
\ No newline at end of file
+$40|testsuite/parser_tests/group_test_2.test$1|C$12|group test 2$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/group_test_3.test headerdoc-8.9.20/testsuite/parser_tests/group_test_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/group_test_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/group_test_3.test	2014-02-14 18:03:01.000000000 -0800
@@ -64,4 +64,4 @@
 name => test method group
 Description => <p>This is a test of groups.  <hd_link posstarget="foo"> bar </hd_link>.
 $46|This is a basic test of the @methodgroup tag.
-$129|/Network/Servers/hills/Volumes/tienda/dgatwood/headerdoc-8.8.20/Modules/HeaderDoc//../../testsuite/parser_tests/group_test_3.test$1|C$12|group test 3$1|C$6|parser
\ No newline at end of file
+$40|testsuite/parser_tests/group_test_3.test$1|C$12|group test 3$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/group_test_4.test headerdoc-8.9.20/testsuite/parser_tests/group_test_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/group_test_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/group_test_4.test	2014-02-14 18:03:01.000000000 -0800
@@ -64,4 +64,4 @@
 name => name group test
 Description => <p>This is a test of groups.  <hd_link posstarget="foo"> bar </hd_link>.
 $39|This is a basic test of the @name tag.
-$129|/Network/Servers/hills/Volumes/tienda/dgatwood/headerdoc-8.8.20/Modules/HeaderDoc//../../testsuite/parser_tests/group_test_4.test$1|C$12|group test 4$1|C$6|parser
\ No newline at end of file
+$40|testsuite/parser_tests/group_test_4.test$1|C$12|group test 4$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/group_test_5.test headerdoc-8.9.20/testsuite/parser_tests/group_test_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/group_test_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/group_test_5.test	2014-02-14 18:03:01.000000000 -0800
@@ -62,4 +62,4 @@
 name => test group 5
 Description =>  
 $65|This tests to make sure multi-word groups get created correctly.
-$129|/Network/Servers/hills/Volumes/tienda/dgatwood/headerdoc-8.8.20/Modules/HeaderDoc//../../testsuite/parser_tests/group_test_5.test$1|C$12|group test 5$1|C$6|parser
\ No newline at end of file
+$40|testsuite/parser_tests/group_test_5.test$1|C$12|group test 5$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/group_test_6.test headerdoc-8.9.20/testsuite/parser_tests/group_test_6.test
--- headerdoc-8.9.14/testsuite/parser_tests/group_test_6.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/group_test_6.test	2014-02-14 18:03:01.000000000 -0800
@@ -63,4 +63,4 @@
 name => test function group 6
 Description =>  
 $39|This tests multi-word function groups.
-$129|/Network/Servers/hills/Volumes/tienda/dgatwood/headerdoc-8.8.20/Modules/HeaderDoc//../../testsuite/parser_tests/group_test_6.test$1|C$12|group test 6$1|C$6|parser
\ No newline at end of file
+$40|testsuite/parser_tests/group_test_6.test$1|C$12|group test 6$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/group_test_7.test headerdoc-8.9.20/testsuite/parser_tests/group_test_7.test
--- headerdoc-8.9.14/testsuite/parser_tests/group_test_7.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/group_test_7.test	2014-02-14 18:03:01.000000000 -0800
@@ -62,4 +62,4 @@
 name => test method group 7
 Description =>  
 $34|Test of multi-word method groups.
-$129|/Network/Servers/hills/Volumes/tienda/dgatwood/headerdoc-8.8.20/Modules/HeaderDoc//../../testsuite/parser_tests/group_test_7.test$1|C$12|group test 7$1|C$6|parser
\ No newline at end of file
+$40|testsuite/parser_tests/group_test_7.test$1|C$12|group test 7$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/group_test_8.test headerdoc-8.9.20/testsuite/parser_tests/group_test_8.test
--- headerdoc-8.9.14/testsuite/parser_tests/group_test_8.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/group_test_8.test	2014-02-14 18:03:01.000000000 -0800
@@ -62,4 +62,4 @@
 name => test name group 8
 Description =>  
 $48|This is a test of multi-word @name group names.
-$129|/Network/Servers/hills/Volumes/tienda/dgatwood/headerdoc-8.8.20/Modules/HeaderDoc//../../testsuite/parser_tests/group_test_8.test$1|C$12|group test 8$1|C$6|parser
\ No newline at end of file
+$40|testsuite/parser_tests/group_test_8.test$1|C$12|group test 8$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/group_test_9.test headerdoc-8.9.20/testsuite/parser_tests/group_test_9.test
--- headerdoc-8.9.14/testsuite/parser_tests/group_test_9.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/group_test_9.test	2014-02-14 18:03:01.000000000 -0800
@@ -62,4 +62,4 @@
 name => 
 Description =>  
 $38|Test of resetting the group to empty.
-$129|/Network/Servers/hills/Volumes/tienda/dgatwood/headerdoc-8.8.20/Modules/HeaderDoc//../../testsuite/parser_tests/group_test_9.test$1|C$12|group test 9$1|C$6|parser
\ No newline at end of file
+$40|testsuite/parser_tests/group_test_9.test$1|C$12|group test 9$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/header_1.test headerdoc-8.9.20/testsuite/parser_tests/header_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/header_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/header_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -47,7 +47,7 @@
 
 	For more information, reread this page.
  */
-$0|$4705|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$4813|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -75,8 +75,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/header_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/header_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -254,7 +257,7 @@
 
 -=: HTML OUTPUT OF PARSE TREES :=-
 
-$4705|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$4813|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -282,8 +285,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/header_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/header_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/header_2.test headerdoc-8.9.20/testsuite/parser_tests/header_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/header_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/header_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -5,7 +5,7 @@
 
         @indexgroup Photo Gallery (PHP)
  */
-$0|$4090|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$4198|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -33,8 +33,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/header_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/header_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/header_3.test headerdoc-8.9.20/testsuite/parser_tests/header_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/header_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/header_3.test	2013-05-14 15:12:54.000000000 -0700
@@ -3,7 +3,7 @@
 
         @indexgroup Photo Gallery (JavaScript)
  */
-$0|$4033|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$4141|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/header_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/header_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/header_4.test headerdoc-8.9.20/testsuite/parser_tests/header_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/header_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/header_4.test	2013-05-14 15:12:54.000000000 -0700
@@ -2,7 +2,7 @@
     @copyright Apple Computer
     @meta http-equiv="refresh" content="1;http://www.apple.com/"
  */
-$0|$3983|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$4091|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/header_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/header_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -166,7 +169,7 @@
 
 -=: HTML OUTPUT OF PARSE TREES :=-
 
-$3983|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$4091|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -194,8 +197,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/header_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/header_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/header_5.test headerdoc-8.9.20/testsuite/parser_tests/header_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/header_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/header_5.test	2013-05-14 15:12:54.000000000 -0700
@@ -4,7 +4,7 @@
     @discussion My discussion
     @updated 2006-03-13
 */
-$0|$3957|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$4065|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -32,8 +32,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/header_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/header_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -168,7 +171,7 @@
 
 -=: HTML OUTPUT OF PARSE TREES :=-
 
-$3957|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$4065|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -196,8 +199,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/header_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/header_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/idl_1.test headerdoc-8.9.20/testsuite/parser_tests/idl_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/idl_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/idl_1.test	2014-02-14 18:03:01.000000000 -0800
@@ -41,7 +41,7 @@
 
 }
 $19|/*! HTML module */
-$0|$68955|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$69042|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -69,10 +69,13 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/idl_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/idl_1.test
 $parserState->{INMODULE} => 1
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -547,7 +550,7 @@
         XMLTHROWS: ""
         UPDATED: ""
         LINKAGESTATE: ""
-        ACCESSCONTROL: "protected"
+        ACCESSCONTROL: "public"
         AVAILABILITY: ""
         LINKUID: ""
         ORIGCLASS: ""
@@ -593,7 +596,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -635,7 +638,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -677,7 +680,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -719,7 +722,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -761,7 +764,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -803,7 +806,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -2277,7 +2280,7 @@
 
 
 
-$88999|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$89068|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -2305,10 +2308,13 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/idl_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/idl_1.test
 $parserState->{INMODULE} => 1
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -2783,7 +2789,7 @@
         XMLTHROWS: ""
         UPDATED: ""
         LINKAGESTATE: ""
-        ACCESSCONTROL: "protected"
+        ACCESSCONTROL: "public"
         AVAILABILITY: ""
         LINKUID: ""
         ORIGCLASS: ""
@@ -2828,7 +2834,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -2870,7 +2876,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -2912,7 +2918,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -2954,7 +2960,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -2996,7 +3002,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -3038,7 +3044,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -3080,7 +3086,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -3122,7 +3128,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -3164,7 +3170,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -3206,7 +3212,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -3248,7 +3254,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -3290,7 +3296,7 @@
             XMLTHROWS: ""
             UPDATED: ""
             LINKAGESTATE: ""
-            ACCESSCONTROL: "protected"
+            ACCESSCONTROL: "public"
             AVAILABILITY: ""
             LINKUID: ""
             ORIGCLASS: ""
@@ -5425,4 +5431,4 @@
 
 
 
-_$87|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/idl_1.test$1|C$5|idl 1$3|IDL$6|parser
\ No newline at end of file
+_$33|testsuite/parser_tests/idl_1.test$1|C$5|idl 1$3|IDL$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/idl_2.test headerdoc-8.9.20/testsuite/parser_tests/idl_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/idl_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/idl_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -4,7 +4,7 @@
 cpp_quote(" */")
 
 cpp_quote("#define WebKitErrorDomain TEXT(\"WebKitErrorDomain\")")
-_$0|$8493|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+_$0|$8601|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -32,8 +32,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/idl_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/idl_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -271,7 +274,7 @@
 
 
 
-$8493|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8601|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -299,8 +302,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/idl_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/idl_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/idl_3.test headerdoc-8.9.20/testsuite/parser_tests/idl_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/idl_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/idl_3.test	2014-02-14 18:03:01.000000000 -0800
@@ -16,7 +16,7 @@
 		bar.baz q;
 	};
 $21|/*! bar.baz class */
-$0|$24171|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$24264|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -44,9 +44,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/idl_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/idl_3.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -353,7 +356,7 @@
         XMLTHROWS: ""
         UPDATED: ""
         LINKAGESTATE: ""
-        ACCESSCONTROL: "protected"
+        ACCESSCONTROL: "public"
         AVAILABILITY: ""
         LINKUID: ""
         ORIGCLASS: ""
@@ -437,7 +440,7 @@
         XMLTHROWS: ""
         UPDATED: ""
         LINKAGESTATE: ""
-        ACCESSCONTROL: "protected"
+        ACCESSCONTROL: "public"
         AVAILABILITY: ""
         LINKUID: ""
         ORIGCLASS: ""
@@ -479,7 +482,7 @@
         XMLTHROWS: ""
         UPDATED: ""
         LINKAGESTATE: ""
-        ACCESSCONTROL: "protected"
+        ACCESSCONTROL: "public"
         AVAILABILITY: ""
         LINKUID: ""
         ORIGCLASS: ""
@@ -521,7 +524,7 @@
         XMLTHROWS: ""
         UPDATED: ""
         LINKAGESTATE: ""
-        ACCESSCONTROL: "protected"
+        ACCESSCONTROL: "public"
         AVAILABILITY: ""
         LINKUID: ""
         ORIGCLASS: ""
@@ -563,7 +566,7 @@
         XMLTHROWS: ""
         UPDATED: ""
         LINKAGESTATE: ""
-        ACCESSCONTROL: "protected"
+        ACCESSCONTROL: "public"
         AVAILABILITY: ""
         LINKUID: ""
         ORIGCLASS: ""
@@ -993,7 +996,7 @@
 
 
 
-$24171|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$24264|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -1021,9 +1024,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/idl_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/idl_3.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -1330,7 +1336,7 @@
         XMLTHROWS: ""
         UPDATED: ""
         LINKAGESTATE: ""
-        ACCESSCONTROL: "protected"
+        ACCESSCONTROL: "public"
         AVAILABILITY: ""
         LINKUID: ""
         ORIGCLASS: ""
@@ -1414,7 +1420,7 @@
         XMLTHROWS: ""
         UPDATED: ""
         LINKAGESTATE: ""
-        ACCESSCONTROL: "protected"
+        ACCESSCONTROL: "public"
         AVAILABILITY: ""
         LINKUID: ""
         ORIGCLASS: ""
@@ -1456,7 +1462,7 @@
         XMLTHROWS: ""
         UPDATED: ""
         LINKAGESTATE: ""
-        ACCESSCONTROL: "protected"
+        ACCESSCONTROL: "public"
         AVAILABILITY: ""
         LINKUID: ""
         ORIGCLASS: ""
@@ -1498,7 +1504,7 @@
         XMLTHROWS: ""
         UPDATED: ""
         LINKAGESTATE: ""
-        ACCESSCONTROL: "protected"
+        ACCESSCONTROL: "public"
         AVAILABILITY: ""
         LINKUID: ""
         ORIGCLASS: ""
@@ -1540,7 +1546,7 @@
         XMLTHROWS: ""
         UPDATED: ""
         LINKAGESTATE: ""
-        ACCESSCONTROL: "protected"
+        ACCESSCONTROL: "public"
         AVAILABILITY: ""
         LINKUID: ""
         ORIGCLASS: ""
@@ -1971,4 +1977,4 @@
 
 
 $30|Tests periods in class names.
-$87|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/idl_3.test$1|C$5|idl 3$3|IDL$6|parser
\ No newline at end of file
+$33|testsuite/parser_tests/idl_3.test$1|C$5|idl 3$3|IDL$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/illegal_markup_1.test headerdoc-8.9.20/testsuite/parser_tests/illegal_markup_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/illegal_markup_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/illegal_markup_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -7,7 +7,7 @@
 $65|/*! @category NSValue(MyAdditions)
     @abstract adds stuff.
  */
-$0|$7560|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7668|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -35,8 +35,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/illegal_markup_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/illegal_markup_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -264,7 +267,7 @@
 
 
 
-$11551|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$11659|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -292,8 +295,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/illegal_markup_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/illegal_markup_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/language_test_1.test headerdoc-8.9.20/testsuite/parser_tests/language_test_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/language_test_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/language_test_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,5 +1,5 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE_$30|/*! @language embedded-c++ */
-$0|$3932|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$4040|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -27,8 +27,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/language_test_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/language_test_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -161,7 +164,7 @@
 
 -=: HTML OUTPUT OF PARSE TREES :=-
 
-$3932|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$4040|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -189,8 +192,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/language_test_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/language_test_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/leading_star_1.test headerdoc-8.9.20/testsuite/parser_tests/leading_star_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/leading_star_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/leading_star_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -4,7 +4,7 @@
  * This should generate a warning
  * in paranoid mode.
  */
-$0|$5829|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5937|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -32,8 +32,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/leading_star_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/leading_star_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -236,7 +239,7 @@
 
 
 
-$5829|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$5937|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -264,8 +267,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/leading_star_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/leading_star_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/leading_star_2.test headerdoc-8.9.20/testsuite/parser_tests/leading_star_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/leading_star_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/leading_star_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -3,7 +3,7 @@
     This shouldn't generate any
     warning even in paranoid mode.
  */
-$0|$5901|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6009|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/leading_star_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/leading_star_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -238,7 +241,7 @@
 
 
 
-$5901|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6009|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -266,8 +269,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/leading_star_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/leading_star_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/leading_star_3.test headerdoc-8.9.20/testsuite/parser_tests/leading_star_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/leading_star_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/leading_star_3.test	2013-05-14 15:12:54.000000000 -0700
@@ -3,7 +3,7 @@
  *  Neither should this
  *  (even in paranoid mode).
  */
-$0|$5900|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6008|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/leading_star_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/leading_star_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -238,7 +241,7 @@
 
 
 
-$5900|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6008|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -266,8 +269,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/leading_star_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/leading_star_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/leading_star_4.test headerdoc-8.9.20/testsuite/parser_tests/leading_star_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/leading_star_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/leading_star_4.test	2013-05-14 15:12:54.000000000 -0700
@@ -8,7 +8,7 @@
  *
  *  The comment continues here.
  */
-$0|$5973|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6081|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -36,8 +36,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/leading_star_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/leading_star_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -245,7 +248,7 @@
 
 
 
-$5973|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6081|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -273,8 +276,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/leading_star_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/leading_star_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/leading_star_5.test headerdoc-8.9.20/testsuite/parser_tests/leading_star_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/leading_star_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/leading_star_5.test	2013-05-14 15:12:54.000000000 -0700
@@ -8,7 +8,7 @@
  *
  *  The comment continues here.
  */
-$0|$6051|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6159|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -36,8 +36,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/leading_star_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/leading_star_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -245,7 +248,7 @@
 
 
 
-$6051|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6159|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -273,8 +276,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/leading_star_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/leading_star_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/leading_star_6.test headerdoc-8.9.20/testsuite/parser_tests/leading_star_6.test
--- headerdoc-8.9.14/testsuite/parser_tests/leading_star_6.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/leading_star_6.test	2013-05-14 15:12:54.000000000 -0700
@@ -9,7 +9,7 @@
  *
  *  The comment continues here.
  */
-$0|$6122|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6230|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -37,8 +37,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/leading_star_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/leading_star_6.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -247,7 +250,7 @@
 
 
 
-$6122|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6230|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -275,8 +278,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/leading_star_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/leading_star_6.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/linktest_1.test headerdoc-8.9.20/testsuite/parser_tests/linktest_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/linktest_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/linktest_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE_$235|/*! @header foo.h
     @discussion For more information, see <A HREF="@docroot/index.html">the index</A> or {@link //apple_ref/occ//ObjCClassDeux/classTwoMethodFour:bogusOne:bogusTwo classTwoMethodFour documentation} if you'd like.
  */
-$0|$4153|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$4261|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/linktest_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/linktest_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -164,7 +167,7 @@
 
 -=: HTML OUTPUT OF PARSE TREES :=-
 
-$4153|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$4261|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -192,8 +195,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/linktest_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/linktest_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/linktest_1a.test headerdoc-8.9.20/testsuite/parser_tests/linktest_1a.test
--- headerdoc-8.9.14/testsuite/parser_tests/linktest_1a.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/linktest_1a.test	2013-05-14 15:12:54.000000000 -0700
@@ -14,7 +14,7 @@
 };
 $35|/*! @class linktest_fooclass_1
  */
-$0|$17834|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$17942|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -42,9 +42,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/linktest_1a.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/linktest_1a.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -598,7 +601,7 @@
 
 
 
-$17834|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$17942|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -626,9 +629,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/linktest_1a.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/linktest_1a.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/linktest_2.test headerdoc-8.9.20/testsuite/parser_tests/linktest_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/linktest_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/linktest_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -7,7 +7,7 @@
 $255|/*! @class foo
     @discussion For more information, see <A HREF="{@docroot}/index.html">the index</A>, <A HREF="@docroot/index.html">the index</A>, or { @link foo The foo documentation }, or else maybe { @linkplain foo The plain foo docs }.  Thanks.
  */
-$0|$6192|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6300|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -35,9 +35,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/linktest_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/linktest_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -249,7 +252,7 @@
 
 
 
-$6192|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6300|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -277,9 +280,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/linktest_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/linktest_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/linktest_3.test headerdoc-8.9.20/testsuite/parser_tests/linktest_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/linktest_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/linktest_3.test	2013-05-14 15:12:54.000000000 -0700
@@ -2,7 +2,7 @@
 $47|/*!
    This is a link to @link foo @/link.
  */
-$0|$5884|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5992|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/linktest_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/linktest_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -233,7 +236,7 @@
 
 
 
-$5884|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$5992|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -261,8 +264,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/linktest_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/linktest_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/list_fixup.test headerdoc-8.9.20/testsuite/parser_tests/list_fixup.test
--- headerdoc-8.9.14/testsuite/parser_tests/list_fixup.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/list_fixup.test	2013-05-14 15:12:54.000000000 -0700
@@ -53,7 +53,7 @@
 End test.
 
  */
-$0|$5297|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5405|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -81,8 +81,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/list_fixup.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/list_fixup.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -263,7 +266,7 @@
 
 -=: HTML OUTPUT OF PARSE TREES :=-
 
-$5297|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$5405|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -291,8 +294,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/list_fixup.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/list_fixup.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/local_variables_2.test headerdoc-8.9.20/testsuite/parser_tests/local_variables_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/local_variables_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/local_variables_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -12,7 +12,7 @@
 #         followed by a one-part regular expression (e.g. qq).
 #         This is a strict subset of {@link regexppattern}.
 # */
-$0|$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8376|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -40,8 +40,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/local_variables_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/local_variables_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -332,7 +335,7 @@
 
 
 
-$8268|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8376|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -360,8 +363,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/local_variables_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/local_variables_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/local_variables_and_variable_groups.test headerdoc-8.9.20/testsuite/parser_tests/local_variables_and_variable_groups.test
--- headerdoc-8.9.14/testsuite/parser_tests/local_variables_and_variable_groups.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/local_variables_and_variable_groups.test	2013-05-14 15:12:54.000000000 -0700
@@ -20,7 +20,7 @@
     @var local_5
 	Local variable #5.
  */
-$0|$16608|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$16716|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -48,8 +48,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/local_variables_and_variable_groups.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/local_variables_and_variable_groups.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -646,7 +649,7 @@
 
 
 
-$16608|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$16716|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -674,8 +677,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/local_variables_and_variable_groups.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/local_variables_and_variable_groups.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/macro_in_a_struct.test headerdoc-8.9.20/testsuite/parser_tests/macro_in_a_struct.test
--- headerdoc-8.9.14/testsuite/parser_tests/macro_in_a_struct.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/macro_in_a_struct.test	2013-05-14 15:12:54.000000000 -0700
@@ -12,7 +12,7 @@
  @field bart   The bart field
  @field cart   The cart field
 */
-$0|$15393|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$15501|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -40,8 +40,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/macro_in_a_struct.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/macro_in_a_struct.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -583,7 +586,7 @@
 
 
 
-$15393|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$15501|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -611,8 +614,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/macro_in_a_struct.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/macro_in_a_struct.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/mixed_block_1.test headerdoc-8.9.20/testsuite/parser_tests/mixed_block_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/mixed_block_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/mixed_block_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -6,7 +6,7 @@
 $31|/**
  * Badly formed block.
  */
-$0|$22132|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$22240|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,8 +34,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/mixed_block_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/mixed_block_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -565,7 +568,7 @@
 
 
 
-$22132|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$22240|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -593,8 +596,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/mixed_block_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/mixed_block_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/multi-line_link.test headerdoc-8.9.20/testsuite/parser_tests/multi-line_link.test
--- headerdoc-8.9.14/testsuite/parser_tests/multi-line_link.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/multi-line_link.test	2013-05-14 15:12:54.000000000 -0700
@@ -11,7 +11,7 @@
  * see {@link //apple_ref/doc/header/user_space_OSAtomic.h
  * OSAtomic.h (Usesr space)}
  */
-$0|$4338|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$4446|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -39,8 +39,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/multi-line_link.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/multi-line_link.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -181,7 +184,7 @@
 
 -=: HTML OUTPUT OF PARSE TREES :=-
 
-$4338|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$4446|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -209,8 +212,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/multi-line_link.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/multi-line_link.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/multi-param_function.test headerdoc-8.9.20/testsuite/parser_tests/multi-param_function.test
--- headerdoc-8.9.14/testsuite/parser_tests/multi-param_function.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/multi-param_function.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$35|int blah(int a, char *b, void *c);
 $22|/*! @function blah */
-_$10214|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+_$10322|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/multi-param_function.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/multi-param_function.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -397,7 +400,7 @@
 
 
 
-$10214|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10322|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -425,8 +428,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/multi-param_function.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/multi-param_function.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/multiple_names.test headerdoc-8.9.20/testsuite/parser_tests/multiple_names.test
--- headerdoc-8.9.14/testsuite/parser_tests/multiple_names.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/multiple_names.test	2013-05-14 15:12:54.000000000 -0700
@@ -11,7 +11,7 @@
 @param multi_name_e E
 @param multi_name_f F
  */
-$0|$38509|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$38617|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -39,8 +39,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/multiple_names.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/multiple_names.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -1426,7 +1429,7 @@
 
 
 
-$38509|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$38617|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -1454,8 +1457,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/multiple_names.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/multiple_names.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/multiple_names_002.test headerdoc-8.9.20/testsuite/parser_tests/multiple_names_002.test
--- headerdoc-8.9.14/testsuite/parser_tests/multiple_names_002.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/multiple_names_002.test	2013-05-14 15:12:54.000000000 -0700
@@ -18,7 +18,7 @@
     @param manynames_fromseed
 	From seed?
  */
-$0|$58532|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$58640|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -46,8 +46,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/multiple_names_002.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/multiple_names_002.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -1941,7 +1944,7 @@
 
 
 
-$58532|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$58640|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -1969,8 +1972,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/multiple_names_002.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/multiple_names_002.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/multiple_names_003.test headerdoc-8.9.20/testsuite/parser_tests/multiple_names_003.test
--- headerdoc-8.9.14/testsuite/parser_tests/multiple_names_003.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/multiple_names_003.test	2013-05-14 15:12:54.000000000 -0700
@@ -26,7 +26,7 @@
     @param manynames_bitfield Bitfield
     @param manynames_bitfield2 Bitfield 2
  */
-$0|$102047|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$102155|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -54,8 +54,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/multiple_names_003.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/multiple_names_003.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -3650,7 +3653,7 @@
 
 
 
-$102047|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$102155|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -3678,8 +3681,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/multiple_names_003.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/multiple_names_003.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_1.test headerdoc-8.9.20/testsuite/parser_tests/nametest_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$18|char *bar(int x);
 $22|/*! @function foo
  */
-$0|$10238|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10346|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -394,7 +397,7 @@
 
 
 
-$10238|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10346|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -422,8 +425,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_10.test headerdoc-8.9.20/testsuite/parser_tests/nametest_10.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_10.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_10.test	2013-05-14 15:12:54.000000000 -0700
@@ -9,7 +9,7 @@
         This is a terriffic define block.  Should be called My define block
         with separate definitions for def_1 and def_2.
  */ 
-$0|$18513|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$18621|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -37,8 +37,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_10.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_10.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -514,7 +517,7 @@
 
 
 
-$18513|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$18621|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -542,8 +545,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_10.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_10.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_11.test headerdoc-8.9.20/testsuite/parser_tests/nametest_11.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_11.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_11.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$57|    win_req_t                   req[CISTPL_MEM_MAX_WIN];
 $72|    /*! @var req
       Tracks the current common memory reservations */
-$0|$6338|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6446|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_11.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_11.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -240,7 +243,7 @@
 
 
 
-$6338|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6446|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -268,8 +271,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_11.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_11.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_12.test headerdoc-8.9.20/testsuite/parser_tests/nametest_12.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_12.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_12.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$18|#define def_3 baz
 $75|/*! @define def_3_altname This should be called def_3 and def_3_altname */
-$0|$9112|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9220|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_12.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_12.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -292,7 +295,7 @@
 
 
 
-$9112|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9220|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -320,8 +323,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_12.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_12.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_13.test headerdoc-8.9.20/testsuite/parser_tests/nametest_13.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_13.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_13.test	2013-05-14 15:12:54.000000000 -0700
@@ -6,7 +6,7 @@
         //apple_ref/doc/title:func/reverseorder and eventually
         //apple_ref/c func/not_the_right_function
  */ 
-$0|$11218|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$11326|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,8 +34,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_13.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_13.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -407,7 +410,7 @@
 
 
 
-$11218|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$11326|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -435,8 +438,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_13.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_13.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_14.test headerdoc-8.9.20/testsuite/parser_tests/nametest_14.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_14.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_14.test	2013-05-14 15:12:54.000000000 -0700
@@ -6,7 +6,7 @@
     Should be called reverseorder.  The apple_ref should be
     //apple_ref/c/func/reverseorder
  */
-$0|$7621|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7729|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,8 +34,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_14.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_14.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -297,7 +300,7 @@
 
 
 
-$7621|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7729|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -325,8 +328,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_14.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_14.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_15.test headerdoc-8.9.20/testsuite/parser_tests/nametest_15.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_15.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_15.test	2013-05-14 15:12:54.000000000 -0700
@@ -3,7 +3,7 @@
     Should be called normalorder.  The apple_ref should be
     //apple_ref/c/func/normalorder
  */
-$0|$7460|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7568|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_15.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_15.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -289,7 +292,7 @@
 
 
 
-$7460|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7568|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -317,8 +320,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_15.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_15.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_16.test headerdoc-8.9.20/testsuite/parser_tests/nametest_16.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_16.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_16.test	2013-05-14 15:12:54.000000000 -0700
@@ -5,7 +5,7 @@
     //apple_ref/doc/title:func/normalorder and eventually
     //apple_ref/c/func/wrong_function_again
  */
-$0|$11035|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$11143|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,8 +33,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_16.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_16.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -401,7 +404,7 @@
 
 
 
-$11035|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$11143|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -429,8 +432,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_16.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_16.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_17.test headerdoc-8.9.20/testsuite/parser_tests/nametest_17.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_17.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_17.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$23|#define test foo::test
 $20|/*! @define test */
-$0|$6990|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7098|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_17.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_17.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -234,7 +237,7 @@
 
 
 
-$6990|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7098|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -262,8 +265,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_17.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_17.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_18.test headerdoc-8.9.20/testsuite/parser_tests/nametest_18.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_18.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_18.test	2013-05-14 15:12:54.000000000 -0700
@@ -10,7 +10,7 @@
 
 };
 $36|/*! class should be called foo_t */
-$0|$17507|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$17615|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -38,9 +38,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_18.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_18.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -634,7 +637,7 @@
 
 
 
-$17507|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$17615|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -662,9 +665,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_18.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_18.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_19.test headerdoc-8.9.20/testsuite/parser_tests/nametest_19.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_19.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_19.test	2013-05-14 15:12:54.000000000 -0700
@@ -4,7 +4,7 @@
 $57|/*! @typedef teststruct_t
     @field field_1 field 1
  */
-$0|$8894|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9002|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -32,8 +32,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_19.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_19.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -353,7 +356,7 @@
 
 
 
-$8894|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9002|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -381,8 +384,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_19.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_19.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_2.test headerdoc-8.9.20/testsuite/parser_tests/nametest_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -3,7 +3,7 @@
         This really shouldn't be that hard....
         Should be called "simple".
  */
-$0|$5834|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5942|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -239,7 +242,7 @@
 
 
 
-$5834|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$5942|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -267,8 +270,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_20.test headerdoc-8.9.20/testsuite/parser_tests/nametest_20.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_20.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_20.test	2013-05-14 15:12:54.000000000 -0700
@@ -3,7 +3,7 @@
         This should be part of the discussion here.
         @discussion This should also be discussion.
  */
-$0|$7073|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7181|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_20.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_20.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -295,7 +298,7 @@
 
 
 
-$7073|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7181|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -323,8 +326,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_20.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_20.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_21.test headerdoc-8.9.20/testsuite/parser_tests/nametest_21.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_21.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_21.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,7 +1,7 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$25|struct single_line_disc;
 $67|/*! @struct single_line_disc single-line discussion goes here.
  */
-$0|$5660|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5768|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -29,8 +29,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_21.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_21.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -231,7 +234,7 @@
 
 
 
-$5660|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$5768|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -259,8 +262,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_21.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_21.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_22.test headerdoc-8.9.20/testsuite/parser_tests/nametest_22.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_22.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_22.test	2013-05-14 15:12:54.000000000 -0700
@@ -2,7 +2,7 @@
 $94|/*! @var values
     @abstract This should only be called values, not MAX_PERMUTATION_SIZE.
 */
-$0|$6385|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6493|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_22.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_22.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -244,7 +247,7 @@
 
 
 
-$6385|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6493|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -272,8 +275,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_22.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_22.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_23.test headerdoc-8.9.20/testsuite/parser_tests/nametest_23.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_23.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_23.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$28|int disambig_test(char *b);
 $91|/*! Test of apple_ref disambiguation.  Should be called //test_ref/c/func/disambig_test */
-$0|$7546|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7654|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_23.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_23.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -287,7 +290,7 @@
 
 
 
-$7546|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7654|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -315,8 +318,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_23.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_23.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_24.test headerdoc-8.9.20/testsuite/parser_tests/nametest_24.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_24.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_24.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$26|int disambig_test(int k);
 $102|/*! Test of apple_ref disambiguation.  Should be called //test_ref/c/func/disambig_test_DONTLINK_0 */
-$0|$7474|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7582|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_24.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_24.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -284,7 +287,7 @@
 
 
 
-$7474|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7582|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -312,8 +315,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_24.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_24.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_25.test headerdoc-8.9.20/testsuite/parser_tests/nametest_25.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_25.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_25.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$33|void *disambig_test(uint64_t q);
 $102|/*! Test of apple_ref disambiguation.  Should be called //test_ref/c/func/disambig_test_DONTLINK_1 */
-$0|$7622|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7730|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_25.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_25.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -287,7 +290,7 @@
 
 
 
-$7622|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7730|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -315,8 +318,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_25.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_25.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_26.test headerdoc-8.9.20/testsuite/parser_tests/nametest_26.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_26.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_26.test	2013-05-14 15:12:54.000000000 -0700
@@ -17,7 +17,7 @@
         @constant       kDRBlockSizeMode2Form2Data      Mode 2 Form 2 data.
         @constant       kDRBlockSizeDVDData                     DVD data.
 */
-$0|$15882|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$15990|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -45,8 +45,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_26.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_26.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
@@ -618,7 +621,7 @@
 
 
 
-$15882|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$15990|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -646,8 +649,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_26.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_26.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_27.test headerdoc-8.9.20/testsuite/parser_tests/nametest_27.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_27.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_27.test	2013-05-14 15:12:54.000000000 -0700
@@ -5,7 +5,7 @@
         @enum           DRBurnSessionSetupDialogOptions struct version
         @discussion
 */
-$0|$7383|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7491|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,8 +33,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_27.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_27.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
@@ -302,7 +305,7 @@
 
 
 
-$7383|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7491|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -330,8 +333,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_27.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_27.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_3.test headerdoc-8.9.20/testsuite/parser_tests/nametest_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_3.test	2013-05-14 15:12:54.000000000 -0700
@@ -11,7 +11,7 @@
         @constant kTest1 Is 3
         @constant kTest2 Is 4
  */
-$0|$9972|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -39,8 +39,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -414,7 +417,7 @@
 
 
 
-$9972|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10080|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -442,8 +445,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_4.test headerdoc-8.9.20/testsuite/parser_tests/nametest_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_4.test	2013-05-14 15:12:54.000000000 -0700
@@ -5,7 +5,7 @@
     @discussion Should be called "multi word anonymous enum & stuff"
     @constant kFoo1 Is 3
  */
-$0|$6987|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7095|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,8 +33,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
@@ -301,7 +304,7 @@
 
 
 
-$6987|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7095|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -329,8 +332,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_5.test headerdoc-8.9.20/testsuite/parser_tests/nametest_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_5.test	2013-05-14 15:12:54.000000000 -0700
@@ -6,7 +6,7 @@
         @constant kFoo1 Is 3
         @constant doesnotexist Is bogus
  */
-$0|$7006|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7114|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,8 +34,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
@@ -305,7 +308,7 @@
 
 
 
-$7006|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7114|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -333,8 +336,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_6.test headerdoc-8.9.20/testsuite/parser_tests/nametest_6.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_6.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_6.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$18|struct foostruct;
 $40|/*! this should be called foostruct. */
-$0|$5528|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5636|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_6.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -230,7 +233,7 @@
 
 
 
-$5528|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$5636|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -258,8 +261,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_6.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_7.test headerdoc-8.9.20/testsuite/parser_tests/nametest_7.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_7.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_7.test	2013-05-14 15:12:54.000000000 -0700
@@ -11,7 +11,7 @@
         a foo_td entry under typedefs.
         @abstract foo typedef abstract here.
  */
-$0|$9889|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$9997|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -39,8 +39,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_7.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_7.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -385,7 +388,7 @@
 
 
 
-$9889|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$9997|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -413,8 +416,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_7.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_7.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_8.test headerdoc-8.9.20/testsuite/parser_tests/nametest_8.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_8.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_8.test	2013-05-14 15:12:54.000000000 -0700
@@ -3,7 +3,7 @@
         This is foo_func, but should also be called
         CFStringRef foo_func.
  */
-$0|$10587|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10695|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_8.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_8.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -394,7 +397,7 @@
 
 
 
-$10587|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10695|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -422,8 +425,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_8.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_8.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/nametest_9.test headerdoc-8.9.20/testsuite/parser_tests/nametest_9.test
--- headerdoc-8.9.14/testsuite/parser_tests/nametest_9.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/nametest_9.test	2013-05-14 15:12:54.000000000 -0700
@@ -6,7 +6,7 @@
     up as ono1 and ono2.  If that flag is not set, it should
     also show up as iname.
  */     
-$0|$15104|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$15212|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -34,8 +34,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_9.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_9.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -571,7 +574,7 @@
 
 
 
-$15104|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$15212|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -599,8 +602,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/nametest_9.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/nametest_9.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/notes_and_warning_links.test headerdoc-8.9.20/testsuite/parser_tests/notes_and_warning_links.test
--- headerdoc-8.9.14/testsuite/parser_tests/notes_and_warning_links.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/notes_and_warning_links.test	2013-05-14 15:12:54.000000000 -0700
@@ -25,7 +25,7 @@
 
     This is out of the note again.
  */
-$0|$4693|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$4801|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -53,8 +53,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/notes_and_warning_links.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/notes_and_warning_links.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -203,7 +206,7 @@
 
 -=: HTML OUTPUT OF PARSE TREES :=-
 
-$4693|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$4801|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -231,8 +234,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/notes_and_warning_links.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/notes_and_warning_links.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -381,4 +387,4 @@
 
 -=: HTML OUTPUT OF PARSE TREES :=-
 
-_$51|testsuite/parser_tests/notes_and_warning_links.test$1|C$23|notes and warning links$1|C$6|parser
\ No newline at end of file
+_$105|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/notes_and_warning_links.test$1|C$23|notes and warning links$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/operator_test_1.test headerdoc-8.9.20/testsuite/parser_tests/operator_test_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/operator_test_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/operator_test_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -9,7 +9,7 @@
 ampersand_test_class_2_t operator &(ampersand_test_class_2_t &a);
 };
 $13|/*! class */
-$0|$18497|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$18605|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -37,9 +37,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/operator_test_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/operator_test_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -629,7 +632,7 @@
 
 
 
-$18497|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$18605|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -657,9 +660,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/operator_test_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/operator_test_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/operator_test_2.test headerdoc-8.9.20/testsuite/parser_tests/operator_test_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/operator_test_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/operator_test_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -148,7 +148,7 @@
 
 };
 $13|/*! class */
-$0|$129024|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$129114|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -176,9 +176,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/operator_test_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/operator_test_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -5307,7 +5310,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> &lt;&lt; ( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator &gt;&gt;
 	@abstract       Inequality operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -5315,7 +5318,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> &gt;&gt; ( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  <span class="comment">/*!
 	@constant foo</span>
 	        <span class="comment">*/</span>
 	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/int //test_ref/cpp/tdef/int //test_ref/cpp/tag/int //test_ref/cpp/struct/int //test_ref/cpp/intf/int //test_ref/doc/anysymbol/int" machineGenerated="true" --><span class="type">int</span><!-- /a --> <!-- a logicalPath="//test_ref/cpp/econst/foo //test_ref/cpp/data/foo //test_ref/cpp/clconst/foo " machineGenerated="true" --><span class="var">foo</span><!-- /a -->;  
@@ -5336,7 +5339,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> != ( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator +
 	@abstract       Addition operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -5344,7 +5347,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> +( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator ++
 	@abstract       Increment operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -5352,7 +5355,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> ++( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator -
 	@abstract       Subtraction operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -5360,7 +5363,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> -( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator --
 	@abstract       Decrement operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -5368,7 +5371,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> --( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator *
 	@abstract       Multiplication operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -5376,7 +5379,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> <span class="function">*</span>( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator /
 	@abstract       Division operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -5384,7 +5387,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> /( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   
 	};  
 END OF OBJECT
 
@@ -5396,13 +5399,13 @@
 
 OBJECT: operator << (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> &lt;&lt; ( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator >> (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> &gt;&gt; ( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
@@ -5414,43 +5417,43 @@
 
 OBJECT: operator != (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> != ( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator + (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> +( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator ++ (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> ++( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator - (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> -( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator -- (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> --( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator * (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> <span class="function">*</span>( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator / (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> /( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
@@ -5460,7 +5463,7 @@
 
 
 
-$129024|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$129114|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -5488,9 +5491,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/operator_test_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/operator_test_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -10619,7 +10625,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> &lt;&lt; ( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator &gt;&gt;
 	@abstract       Inequality operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -10627,7 +10633,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> &gt;&gt; ( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  <span class="comment">/*!
 	@constant foo</span>
 	        <span class="comment">*/</span>
 	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/int //test_ref/cpp/tdef/int //test_ref/cpp/tag/int //test_ref/cpp/struct/int //test_ref/cpp/intf/int //test_ref/doc/anysymbol/int" machineGenerated="true" --><span class="type">int</span><!-- /a --> <!-- a logicalPath="//test_ref/cpp/econst/foo //test_ref/cpp/data/foo //test_ref/cpp/clconst/foo " machineGenerated="true" --><span class="var">foo</span><!-- /a -->;  
@@ -10648,7 +10654,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> != ( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator +
 	@abstract       Addition operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -10656,7 +10662,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> +( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator ++
 	@abstract       Increment operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -10664,7 +10670,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> ++( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator -
 	@abstract       Subtraction operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -10672,7 +10678,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> -( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator --
 	@abstract       Decrement operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -10680,7 +10686,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> --( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator *
 	@abstract       Multiplication operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -10688,7 +10694,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> <span class="function">*</span>( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator /
 	@abstract       Division operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -10696,7 +10702,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> /( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   
 	};  
 END OF OBJECT
 
@@ -10708,13 +10714,13 @@
 
 OBJECT: operator << (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> &lt;&lt; ( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator >> (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> &gt;&gt; ( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
@@ -10726,43 +10732,43 @@
 
 OBJECT: operator != (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> != ( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator + (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> +( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator ++ (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> ++( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator - (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> -( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator -- (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> --( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator * (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> <span class="function">*</span>( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator / (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span> /( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/operator_test_3.test headerdoc-8.9.20/testsuite/parser_tests/operator_test_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/operator_test_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/operator_test_3.test	2013-05-14 15:12:54.000000000 -0700
@@ -149,7 +149,7 @@
 };
 $14|/*! class */
 
-$0|$128378|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$128468|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -177,9 +177,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/operator_test_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/operator_test_3.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -5215,7 +5218,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>&lt;&lt; ( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator&gt;&gt;
 	@abstract       Inequality operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -5223,7 +5226,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>&gt;&gt; ( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  <span class="comment">/*!
 	@constant foo</span>
 	        <span class="comment">*/</span>
 	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/int //test_ref/cpp/tdef/int //test_ref/cpp/tag/int //test_ref/cpp/struct/int //test_ref/cpp/intf/int //test_ref/doc/anysymbol/int" machineGenerated="true" --><span class="type">int</span><!-- /a --> <!-- a logicalPath="//test_ref/cpp/econst/foo //test_ref/cpp/data/foo //test_ref/cpp/clconst/foo " machineGenerated="true" --><span class="var">foo</span><!-- /a -->;  
@@ -5244,7 +5247,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>!= ( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator+
 	@abstract       Addition operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -5252,7 +5255,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>+( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator++
 	@abstract       Increment operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -5260,7 +5263,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>++( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator-
 	@abstract       Subtraction operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -5268,7 +5271,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>-( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator--
 	@abstract       Decrement operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -5276,7 +5279,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>--( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator*
 	@abstract       Multiplication operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -5284,7 +5287,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span><span class="function">*</span>( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator/
 	@abstract       Division operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -5292,7 +5295,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>/( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   
 	};  
 END OF OBJECT
 
@@ -5304,13 +5307,13 @@
 
 OBJECT: operator<< (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>&lt;&lt; ( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator>> (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>&gt;&gt; ( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
@@ -5322,43 +5325,43 @@
 
 OBJECT: operator!= (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>!= ( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator+ (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>+( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator++ (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>++( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator- (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>-( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator-- (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>--( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator* (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span><span class="function">*</span>( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator/ (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>/( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
@@ -5368,7 +5371,7 @@
 
 
 
-$128378|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$128468|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -5396,9 +5399,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/operator_test_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/operator_test_3.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -10434,7 +10440,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>&lt;&lt; ( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator&gt;&gt;
 	@abstract       Inequality operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -10442,7 +10448,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>&gt;&gt; ( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  <span class="comment">/*!
 	@constant foo</span>
 	        <span class="comment">*/</span>
 	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/int //test_ref/cpp/tdef/int //test_ref/cpp/tag/int //test_ref/cpp/struct/int //test_ref/cpp/intf/int //test_ref/doc/anysymbol/int" machineGenerated="true" --><span class="type">int</span><!-- /a --> <!-- a logicalPath="//test_ref/cpp/econst/foo //test_ref/cpp/data/foo //test_ref/cpp/clconst/foo " machineGenerated="true" --><span class="var">foo</span><!-- /a -->;  
@@ -10463,7 +10469,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>!= ( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator+
 	@abstract       Addition operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -10471,7 +10477,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>+( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator++
 	@abstract       Increment operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -10479,7 +10485,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>++( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator-
 	@abstract       Subtraction operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -10487,7 +10493,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>-( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator--
 	@abstract       Decrement operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -10495,7 +10501,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>--( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator*
 	@abstract       Multiplication operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -10503,7 +10509,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span><span class="function">*</span>( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    <span class="comment">/*!
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   <span class="comment">/*!
 	@function       operator/
 	@abstract       Division operator
 	@discussion     All message contents, including the parameters, are checked.
@@ -10511,7 +10517,7 @@
 	@param  inOtherMessage  The message to compare.</span>
 	        <span class="comment">*/</span>
 	    <!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>/( 
-	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>    
+	        <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>   
 	};  
 END OF OBJECT
 
@@ -10523,13 +10529,13 @@
 
 OBJECT: operator<< (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>&lt;&lt; ( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator>> (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>&gt;&gt; ( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
@@ -10541,43 +10547,43 @@
 
 OBJECT: operator!= (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>!= ( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator+ (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>+( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator++ (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>++( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator- (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>-( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator-- (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>--( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator* (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span><span class="function">*</span>( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
 OBJECT: operator/ (HeaderDoc::Function)
 	<!-- a logicalPath="//test_ref/cpp/cl/bool //test_ref/cpp/tdef/bool //test_ref/cpp/tag/bool //test_ref/cpp/struct/bool //test_ref/cpp/intf/bool //test_ref/doc/anysymbol/bool" machineGenerated="true" --><span class="type">bool</span><!-- /a --> <span class="keyword">operator</span>/( 
-	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span>  
+	    <span class="keyword">const</span> <!-- a logicalPath="//test_ref/cpp/cl/operator_test_class //test_ref/cpp/tdef/operator_test_class //test_ref/cpp/tag/operator_test_class //test_ref/cpp/struct/operator_test_class //test_ref/cpp/intf/operator_test_class //test_ref/doc/anysymbol/operator_test_class" machineGenerated="true" --><span class="type">operator_test_class</span><!-- /a --> &amp;<span class="param">inOtherMessage</span>) <span class="keyword">const</span> 
 END OF OBJECT
 
 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/static_and_virtual_in_return_types.test headerdoc-8.9.20/testsuite/parser_tests/static_and_virtual_in_return_types.test
--- headerdoc-8.9.14/testsuite/parser_tests/static_and_virtual_in_return_types.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/static_and_virtual_in_return_types.test	2013-05-14 15:12:54.000000000 -0700
@@ -13,7 +13,7 @@
     This class contains methods whose return types contain symbols that
     contain (but are not equal to) static and virtual.
  */
-$0|$17623|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$17731|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -41,9 +41,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/static_and_virtual_in_return_types.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/static_and_virtual_in_return_types.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -587,7 +590,7 @@
 
 
 
-$17623|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$17731|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -615,9 +618,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/static_and_virtual_in_return_types.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/static_and_virtual_in_return_types.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/struct_1.test headerdoc-8.9.20/testsuite/parser_tests/struct_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/struct_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/struct_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -9,7 +9,7 @@
     @field firstField Description of first field
     @field secondField Description of second field
 */
-$0|$19166|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$19274|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -37,8 +37,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/struct_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/struct_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -712,7 +715,7 @@
 
 
 
-$19166|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$19274|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -740,8 +743,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/struct_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/struct_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/struct_2.test headerdoc-8.9.20/testsuite/parser_tests/struct_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/struct_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/struct_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -10,7 +10,7 @@
     @param struct_test_2_c
 	Talk about struct_test_2_c.
  */
-$0|$13613|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$13721|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -38,8 +38,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/struct_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/struct_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -532,7 +535,7 @@
 
 
 
-$13613|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$13721|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -560,8 +563,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/struct_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/struct_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/struct_bitfield_1.test headerdoc-8.9.20/testsuite/parser_tests/struct_bitfield_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/struct_bitfield_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/struct_bitfield_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -10,7 +10,7 @@
  @field field2 The second field
  @field field3 The third field
 */
-$0|$14278|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$14386|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -38,8 +38,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/struct_bitfield_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/struct_bitfield_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -563,7 +566,7 @@
 
 
 
-$14278|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$14386|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -591,8 +594,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/struct_bitfield_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/struct_bitfield_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/stub_class_1.test headerdoc-8.9.20/testsuite/parser_tests/stub_class_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/stub_class_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/stub_class_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -8,7 +8,7 @@
 $53|/*! @class myclass
         This is a class test.
  */
-$0|$5824|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5932|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -36,9 +36,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/stub_class_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/stub_class_1.test
 $parserState->{ISFORWARDDECLARATION} => 1
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -241,7 +244,7 @@
 
 
 
-$5824|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$5932|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -269,9 +272,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/stub_class_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/stub_class_1.test
 $parserState->{ISFORWARDDECLARATION} => 1
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/tag_filters_1.test headerdoc-8.9.20/testsuite/parser_tests/tag_filters_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/tag_filters_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/tag_filters_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -12,7 +12,7 @@
     This is a <a name foo="bar" baz=bat bag>test</a>
     This is a <a name foo="bar" baz=bat=bag die>test</a>
  */
-$0|$6132|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6240|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -40,8 +40,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/tag_filters_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/tag_filters_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -255,7 +258,7 @@
 
 
 
-$6132|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6240|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -283,8 +286,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/tag_filters_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/tag_filters_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/template_1.test headerdoc-8.9.20/testsuite/parser_tests/template_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/template_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/template_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -46,7 +46,7 @@
         as template parameters.
     @updated 2003-04-01
 */
-$0|$44086|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$44194|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -74,9 +74,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/template_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/template_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -1683,7 +1686,7 @@
 
 
 
-$44086|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$44194|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -1711,9 +1714,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/template_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/template_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/template_2.test headerdoc-8.9.20/testsuite/parser_tests/template_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/template_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/template_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -25,7 +25,7 @@
     @templatefield BAR this is the data type of correlated data
     @discussion This class does basic correlation of two data types
 */
-$0|$41235|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$41343|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -53,9 +53,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/template_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/template_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -1403,7 +1406,7 @@
 
 
 
-$41235|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$41343|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 1
 inInterface: 0
@@ -1431,9 +1434,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/template_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/template_2.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/typedef_1.test headerdoc-8.9.20/testsuite/parser_tests/typedef_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/typedef_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/typedef_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -2,7 +2,7 @@
 $74|/*!     @typedef SimpleTypeDef
     @discussion Test of simple typedef.
 */
-$0|$6063|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6171|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -30,8 +30,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -246,7 +249,7 @@
 
 
 
-$6063|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6171|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -274,8 +277,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/typedef_10.test headerdoc-8.9.20/testsuite/parser_tests/typedef_10.test
--- headerdoc-8.9.14/testsuite/parser_tests/typedef_10.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/typedef_10.test	2013-05-14 15:12:54.000000000 -0700
@@ -27,7 +27,7 @@
 
         @field name Desc for name
 */
-$0|$54493|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$54601|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -55,8 +55,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_10.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_10.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -1925,7 +1928,7 @@
 
 
 
-$54493|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$54601|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -1953,8 +1956,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_10.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_10.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/typedef_11.test headerdoc-8.9.20/testsuite/parser_tests/typedef_11.test
--- headerdoc-8.9.14/testsuite/parser_tests/typedef_11.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/typedef_11.test	2013-05-14 15:12:54.000000000 -0700
@@ -8,7 +8,7 @@
     @constant constant2
 	This is constant 2.
  */
-$0|$8882|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$8990|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -36,8 +36,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_11.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_11.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
@@ -374,7 +377,7 @@
 
 
 
-$8882|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$8990|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -402,8 +405,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_11.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_11.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/typedef_2.test headerdoc-8.9.20/testsuite/parser_tests/typedef_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/typedef_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/typedef_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -9,7 +9,7 @@
     @field firstField Description of first field
     @field secondField Description of second field
 */
-$0|$20161|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$20269|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -37,8 +37,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -716,7 +719,7 @@
 
 
 
-$20161|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$20269|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -744,8 +747,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/typedef_3.test headerdoc-8.9.20/testsuite/parser_tests/typedef_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/typedef_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/typedef_3.test	2013-05-14 15:12:54.000000000 -0700
@@ -11,7 +11,7 @@
     @constant kCFCompareEqualTo Description of second constant.
     @constant kCFCompareGreaterThan Description of third constant.
 */
-$0|$10710|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$10818|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -39,8 +39,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
@@ -441,7 +444,7 @@
 
 
 
-$10710|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$10818|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -469,8 +472,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => enum
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/typedef_4.test headerdoc-8.9.20/testsuite/parser_tests/typedef_4.test
--- headerdoc-8.9.14/testsuite/parser_tests/typedef_4.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/typedef_4.test	2013-05-14 15:12:54.000000000 -0700
@@ -5,7 +5,7 @@
     @param outSecondParameter Description of the callback's second parameter.
     @result Returns what it can when it is possible to do so.
 */
-$0|$12174|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$12282|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,8 +33,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -453,7 +456,7 @@
 
 
 
-$12174|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$12282|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -481,8 +484,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_4.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_4.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/typedef_5.test headerdoc-8.9.20/testsuite/parser_tests/typedef_5.test
--- headerdoc-8.9.14/testsuite/parser_tests/typedef_5.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/typedef_5.test	2013-05-14 15:12:54.000000000 -0700
@@ -7,7 +7,7 @@
 $80|/*!     @typedef CGPathElement
     @discussion Test of struct/typedef combo.
 */
-$0|$11388|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$11496|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -35,8 +35,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -429,7 +432,7 @@
 
 
 
-$11388|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$11496|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -457,8 +460,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_5.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_5.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/typedef_6.test headerdoc-8.9.20/testsuite/parser_tests/typedef_6.test
--- headerdoc-8.9.14/testsuite/parser_tests/typedef_6.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/typedef_6.test	2013-05-14 15:12:54.000000000 -0700
@@ -59,7 +59,7 @@
 
     @field lastField Description of the struct's last field.
 */
-$0|$66215|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$66323|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -87,8 +87,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_6.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -2033,7 +2036,7 @@
 
 
 
-$66215|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$66323|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -2061,8 +2064,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_6.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_6.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/typedef_7.test headerdoc-8.9.20/testsuite/parser_tests/typedef_7.test
--- headerdoc-8.9.14/testsuite/parser_tests/typedef_7.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/typedef_7.test	2013-05-14 15:12:54.000000000 -0700
@@ -63,7 +63,7 @@
     
     @field lastField Description of the struct's last field.
 */
-$0|$67119|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$67227|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -91,8 +91,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_7.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_7.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -2160,7 +2163,7 @@
 
 
 
-$67119|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$67227|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -2188,8 +2191,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_7.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_7.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -4257,4 +4263,4 @@
 
 
 
-_$37|testsuite/parser_tests/typedef_7.test$1|C$9|typedef 7$1|C$6|parser
\ No newline at end of file
+_$91|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/typedef_7.test$1|C$9|typedef 7$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/typedef_8.test headerdoc-8.9.20/testsuite/parser_tests/typedef_8.test
--- headerdoc-8.9.14/testsuite/parser_tests/typedef_8.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/typedef_8.test	2013-05-14 15:12:54.000000000 -0700
@@ -3,7 +3,7 @@
  * @typedef BigUInt16
  * @abstract A Big-endian unsigned integer scalar size 16 - UInt16
  */
-$0|$6175|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6283|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -31,8 +31,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_8.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_8.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -242,7 +245,7 @@
 
 
 
-$6175|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6283|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -270,8 +273,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_8.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_8.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/typedef_9.test headerdoc-8.9.20/testsuite/parser_tests/typedef_9.test
--- headerdoc-8.9.14/testsuite/parser_tests/typedef_9.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/typedef_9.test	2013-05-14 15:12:54.000000000 -0700
@@ -8,7 +8,7 @@
  @typedef Wrapper2
  @abstract A struct
 */
-$0|$10986|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$11094|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -36,8 +36,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_9.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_9.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -441,7 +444,7 @@
 
 
 
-$10986|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$11094|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -469,8 +472,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_9.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_9.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -879,4 +885,4 @@
 bogus second one for struct myData2.  This has been fixed.
 In the unlikely even tthat this fix regresses, this test
 should detect it.
-$37|testsuite/parser_tests/typedef_9.test$1|C$9|typedef 9$1|C$6|parser
\ No newline at end of file
+$91|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/typedef_9.test$1|C$9|typedef 9$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/typedef_block_1.test headerdoc-8.9.20/testsuite/parser_tests/typedef_block_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/typedef_block_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/typedef_block_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -7,7 +7,7 @@
     @typedef IOHIDElementCookie
     @abstract Abstract data type used as a unique identifier for an element.
 */
-$0|$7804|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$7912|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -35,8 +35,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_block_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_block_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -290,7 +293,7 @@
 
 
 
-$7804|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$7912|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -318,8 +321,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_block_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_block_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/typedef_block_2.test headerdoc-8.9.20/testsuite/parser_tests/typedef_block_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/typedef_block_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/typedef_block_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -18,7 +18,7 @@
         You should always initialize a queue head structure with the
         initialization vector {@link OS_ATOMIC_QUEUE_INIT} before use.
  */
-$0|$15111|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$15219|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -46,8 +46,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_block_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_block_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -532,7 +535,7 @@
 
 
 
-$15111|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$15219|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -560,8 +563,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_block_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_block_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/typedef_struct__IOAudioTimeStamp.test headerdoc-8.9.20/testsuite/parser_tests/typedef_struct__IOAudioTimeStamp.test
--- headerdoc-8.9.14/testsuite/parser_tests/typedef_struct__IOAudioTimeStamp.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/typedef_struct__IOAudioTimeStamp.test	2013-05-14 15:12:54.000000000 -0700
@@ -12,7 +12,7 @@
                 A struct for encapsulating the parts of a time stamp. The flags
                 say which fields are valid.
  */
-_$48611|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+_$48719|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -40,8 +40,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_struct__IOAudioTimeStamp.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_struct__IOAudioTimeStamp.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
@@ -1687,7 +1690,7 @@
 
 
 
-$48611|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$48719|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -1715,8 +1718,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/typedef_struct__IOAudioTimeStamp.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/typedef_struct__IOAudioTimeStamp.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => struct
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/union_1.test headerdoc-8.9.20/testsuite/parser_tests/union_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/union_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/union_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -8,7 +8,7 @@
 	};
 };
 $15|/*! Union 1 */
-$0|$13773|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$13881|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -36,8 +36,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/union_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/union_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => union
@@ -539,7 +542,7 @@
 
 
 
-$13773|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$13881|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -567,8 +570,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/union_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/union_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => union
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/variable_1.test headerdoc-8.9.20/testsuite/parser_tests/variable_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/variable_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/variable_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$16|int variable_1;
 $23|/*! @var variable_1 */
-$0|$5686|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$5794|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/variable_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/variable_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -230,7 +233,7 @@
 
 
 
-$5686|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$5794|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -258,8 +261,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/variable_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/variable_1.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/variable_2.test headerdoc-8.9.20/testsuite/parser_tests/variable_2.test
--- headerdoc-8.9.14/testsuite/parser_tests/variable_2.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/variable_2.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$22|class foo variable_2;
 $23|/*! @var variable_2 */
-$0|$6101|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6209|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/variable_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/variable_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -237,7 +240,7 @@
 
 
 
-$6101|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6209|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -265,8 +268,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/variable_2.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/variable_2.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/variable_3.test headerdoc-8.9.20/testsuite/parser_tests/variable_3.test
--- headerdoc-8.9.14/testsuite/parser_tests/variable_3.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/variable_3.test	2013-05-14 15:12:54.000000000 -0700
@@ -1,6 +1,6 @@
 FrT;@1|>>0|$15|HeaderDoc::Test%22|$4|CODE$7|COMMENT$7|CPPCODE$15|EXPECTED_RESULT$23|EXPECTED_RESULT_ALLDECS$7|FAILMSG$8|FILENAME$4|LANG$4|NAME$7|SUBLANG$4|TYPE$27|static char *C_variable_3;
 $31|/*! A file-scoped variable. */
-$0|$5968|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6076|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -28,8 +28,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/variable_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/variable_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -238,7 +241,7 @@
 
 
 
-$5968|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6076|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -266,8 +269,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/variable_3.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/variable_3.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/warning_and_important.test headerdoc-8.9.20/testsuite/parser_tests/warning_and_important.test
--- headerdoc-8.9.14/testsuite/parser_tests/warning_and_important.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/warning_and_important.test	2013-05-14 15:12:54.000000000 -0700
@@ -15,7 +15,7 @@
     This is also a normal paragraph.
 
  */
-$0|$4310|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$4418|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -43,8 +43,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/warning_and_important.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/warning_and_important.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -187,7 +190,7 @@
 
 -=: HTML OUTPUT OF PARSE TREES :=-
 
-$4310|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$4418|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 1
 inClass: 0
 inInterface: 0
@@ -215,8 +218,11 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/warning_and_important.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/warning_and_important.test
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -359,4 +365,4 @@
 
 -=: HTML OUTPUT OF PARSE TREES :=-
 
-_$49|testsuite/parser_tests/warning_and_important.test$1|C$21|warning and important$1|C$6|parser
\ No newline at end of file
+_$103|/Users/dg/headerdoc-techpubs/Modules/HeaderDoc//../../testsuite/parser_tests/warning_and_important.test$1|C$21|warning and important$1|C$6|parser
\ No newline at end of file
diff -rNu headerdoc-8.9.14/testsuite/parser_tests/wrong_type_1.test headerdoc-8.9.20/testsuite/parser_tests/wrong_type_1.test
--- headerdoc-8.9.14/testsuite/parser_tests/wrong_type_1.test	2014-02-21 13:49:19.000000000 -0800
+++ headerdoc-8.9.20/testsuite/parser_tests/wrong_type_1.test	2013-05-14 15:12:54.000000000 -0700
@@ -5,7 +5,7 @@
 $70|/*! @enum enum_name_one
         This is a discussion for a class.
  */
-$0|$6153|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$0|$6261|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -33,9 +33,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/wrong_type_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/wrong_type_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
@@ -250,7 +253,7 @@
 
 
 
-$6153|-=: TOP LEVEL COMMENT PARSE VALUES :=-
+$6261|-=: TOP LEVEL COMMENT PARSE VALUES :=-
 inHeader: 0
 inClass: 0
 inInterface: 0
@@ -278,9 +281,12 @@
 blockOffset: 0
 fullpath: /test_suite_bogus_path/wrong_type_1.test
 -=: BLOCKPARSE PARSER STATE KEYS :=-
+$parserState->{ASLBRACEPRECURSOR} => 
+$parserState->{ASLBRACEPRECURSORTAG} => 
 $parserState->{FULLPATH} => /test_suite_bogus_path/wrong_type_1.test
 $parserState->{ISFORWARDDECLARATION} => 0
 $parserState->{NEXTTOKENNOCPP} => 0
+$parserState->{afterNL} => 2
 $parserState->{availability} => 
 $parserState->{backslashcount} => 0
 $parserState->{basetype} => 
diff -rNu headerdoc-8.9.14/testsuite/version headerdoc-8.9.20/testsuite/version
--- headerdoc-8.9.14/testsuite/version	1969-12-31 16:00:00.000000000 -0800
+++ headerdoc-8.9.20/testsuite/version	2013-05-14 12:32:56.000000000 -0700
@@ -0,0 +1 @@
+2
diff -rNu headerdoc-8.9.14/xmlman/Makefile headerdoc-8.9.20/xmlman/Makefile
--- headerdoc-8.9.14/xmlman/Makefile	2014-02-21 13:49:23.000000000 -0800
+++ headerdoc-8.9.20/xmlman/Makefile	2014-02-19 09:31:28.000000000 -0800
@@ -12,9 +12,9 @@
 
 COMPATIBILITY_BITS=
 VSTR=
-ifneq ($(strip $(VERS)),)
-	VSTR=-mmacosx-version-min=${VERS}
-endif
+# ifneq ($(strip $(VERS)),)
+	# VSTR=-mmacosx-version-min=${VERS}
+# endif
 ifeq (${ARCH},Darwin)
 	DARWIN_CFLAGS=${VSTR}
 	# For older versions of Mac OS X compilers, remove -pie.
diff -rNu headerdoc-8.9.14/xmlman/resolveLinks.c headerdoc-8.9.20/xmlman/resolveLinks.c
--- headerdoc-8.9.14/xmlman/resolveLinks.c	2014-02-21 13:49:23.000000000 -0800
+++ headerdoc-8.9.20/xmlman/resolveLinks.c	2013-05-14 12:32:56.000000000 -0700
@@ -2076,16 +2076,23 @@
 				pos = target;
 				while (*pos && *pos != '?' && *pos != '#')
 				    pos++;
-				if (pos < target + 10) {
-				    index = 0;
-				} else {
-				    pos -= 10;
-				    if (strncmp(pos, "index.html", 10))
+
+				char *endpos = pos;
+				while ((pos > target) && *pos != '/')
+				    pos--;
+				if (*pos == '/') pos++;
+
+				char *temp = malloc(endpos - pos + 1);
+				strncpy(temp, pos, endpos - pos);
+				temp[endpos - pos] = '\0';
+
+				if (strcmp(temp, "index.html") && strcmp(temp, "CompositePage.html")) {
 					index = 0;
 				}
 				if (index) {
 				    addAttribute(node, "target", "_top");
 				}
+				free(temp);
 			    }
 			    if (node->content) free(node->content);
 			    node->content = NULL;	/* @@@ LEAK? @@@ */