Index: src/Parser/cfa.y
===================================================================
--- src/Parser/cfa.y	(revision 367e082669bed759f36ff590dedd54bd4eb7b398)
+++ src/Parser/cfa.y	(revision e15b0a0a9821f03a5e9e64303812ae5d57b22548)
@@ -10,6 +10,6 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 11:55:39 2015
-// Update Count     : 975
+// Last Modified On : Tue May 26 22:38:42 2015
+// Update Count     : 995
 // 
 
@@ -1009,10 +1009,18 @@
 					$$ = $1;
 				}
-		| declaration_qualifier_list new_function_specifier
-				// declaration_qualifier_list also includes type_qualifier_list, so a semantic check is
-				// necessary to preclude them as a type_qualifier cannot appear in this context.
+		| type_qualifier_list new_function_specifier
 				{
 					typedefTable.addToEnclosingScope( TypedefTable::ID );
 					$$ = $2->addQualifiers( $1 );
+				}
+		| declaration_qualifier_list new_function_specifier
+				{
+					typedefTable.addToEnclosingScope( TypedefTable::ID );
+					$$ = $2->addQualifiers( $1 );
+				}
+		| declaration_qualifier_list type_qualifier_list new_function_specifier
+				{
+					typedefTable.addToEnclosingScope( TypedefTable::ID );
+					$$ = $3->addQualifiers( $1 )->addQualifiers( $2 );
 				}
 		| new_function_declaration pop ',' push identifier_or_typedef_name
@@ -1904,5 +1912,5 @@
 
 function_definition:
-		new_function_specifier compound_statement		// CFA
+		new_function_declaration compound_statement		// CFA
 				{
 					typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -1910,13 +1918,12 @@
 					$$ = $1->addFunctionBody( $2 );
 				}
-		| declaration_qualifier_list new_function_specifier compound_statement // CFA
-				// declaration_qualifier_list also includes type_qualifier_list, so a semantic check is
-				// necessary to preclude them as a type_qualifier cannot appear in this context.
-				{
-					typedefTable.addToEnclosingScope( TypedefTable::ID );
-					typedefTable.leaveScope();
-					$$ = $2->addFunctionBody( $3 )->addQualifiers( $1 );
-				}
-
+//		| declaration_qualifier_list new_function_specifier compound_statement // CFA
+//				// declaration_qualifier_list also includes type_qualifier_list, so a semantic check is
+//				// necessary to preclude them as a type_qualifier cannot appear in this context.
+//				{
+//					typedefTable.addToEnclosingScope( TypedefTable::ID );
+//					typedefTable.leaveScope();
+//					$$ = $2->addFunctionBody( $3 )->addQualifiers( $1 );
+//				}
 		| declaration_specifier function_declarator compound_statement
 				{