Index: src/Parser/TypeData.cc
===================================================================
--- src/Parser/TypeData.cc	(revision cbaee0da9351cb4132c3c4b8bce4a1112819e565)
+++ src/Parser/TypeData.cc	(revision 926af747ff7dac04cacef082cdd822ede9e85c2d)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 15 20:48:52 2016
-// Update Count     : 62
+// Last Modified On : Wed Aug 17 08:47:48 2016
+// Update Count     : 63
 //
 
@@ -908,6 +908,6 @@
 	buildList( enumeration->constants, ret->get_members() );
 	std::list< Declaration * >::iterator members = ret->get_members().begin();
-	for ( const DeclarationNode *cur = enumeration->constants; cur != NULL; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) {
-		if ( cur->get_enumeratorValue() != NULL ) {
+	for ( const DeclarationNode *cur = enumeration->constants; cur != nullptr; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) {
+		if ( cur->get_enumeratorValue() != nullptr ) {
 			ObjectDecl *member = dynamic_cast< ObjectDecl * >(*members);
 			member->set_init( new SingleInit( maybeBuild< Expression >( cur->get_enumeratorValue() ), std::list< Expression * >() ) );
Index: src/Parser/lex.cc
===================================================================
--- src/Parser/lex.cc	(revision cbaee0da9351cb4132c3c4b8bce4a1112819e565)
+++ src/Parser/lex.cc	(revision 926af747ff7dac04cacef082cdd822ede9e85c2d)
@@ -1468,7 +1468,7 @@
  * Author           : Peter A. Buhr
  * Created On       : Sat Sep 22 08:58:10 2001
- * Last Modified By : 
- * Last Modified On : Sun Jul 31 07:19:36 2016
- * Update Count     : 459
+ * Last Modified By : Peter A. Buhr
+ * Last Modified On : Tue Aug 16 22:34:31 2016
+ * Update Count     : 460
  */
 #line 20 "lex.ll"
@@ -1491,5 +1491,5 @@
 #define RETURN_LOCN(x)		yylval.tok.loc.file = yyfilename; yylval.tok.loc.line = yylineno; return( x )
 #define RETURN_VAL(x)		yylval.tok.str = new std::string( yytext ); RETURN_LOCN( x )
-#define RETURN_CHAR(x)		yylval.tok.str = NULL; RETURN_LOCN( x )
+#define RETURN_CHAR(x)		yylval.tok.str = nullptr; RETURN_LOCN( x )
 #define RETURN_STR(x)		yylval.tok.str = strtext; RETURN_LOCN( x )
 
Index: src/Parser/lex.ll
===================================================================
--- src/Parser/lex.ll	(revision cbaee0da9351cb4132c3c4b8bce4a1112819e565)
+++ src/Parser/lex.ll	(revision 926af747ff7dac04cacef082cdd822ede9e85c2d)
@@ -9,7 +9,7 @@
  * Author           : Peter A. Buhr
  * Created On       : Sat Sep 22 08:58:10 2001
- * Last Modified By : 
- * Last Modified On : Sun Jul 31 07:19:36 2016
- * Update Count     : 459
+ * Last Modified By : Peter A. Buhr
+ * Last Modified On : Tue Aug 16 22:34:31 2016
+ * Update Count     : 460
  */
 
@@ -36,5 +36,5 @@
 #define RETURN_LOCN(x)		yylval.tok.loc.file = yyfilename; yylval.tok.loc.line = yylineno; return( x )
 #define RETURN_VAL(x)		yylval.tok.str = new std::string( yytext ); RETURN_LOCN( x )
-#define RETURN_CHAR(x)		yylval.tok.str = NULL; RETURN_LOCN( x )
+#define RETURN_CHAR(x)		yylval.tok.str = nullptr; RETURN_LOCN( x )
 #define RETURN_STR(x)		yylval.tok.str = strtext; RETURN_LOCN( x )
 
Index: src/Parser/parser.cc
===================================================================
--- src/Parser/parser.cc	(revision cbaee0da9351cb4132c3c4b8bce4a1112819e565)
+++ src/Parser/parser.cc	(revision 926af747ff7dac04cacef082cdd822ede9e85c2d)
@@ -5709,5 +5709,5 @@
 #line 700 "parser.yy"
     {	// mark all fields in list
-			for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_next() )
+			for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
 				iter->set_extension( true );
 			(yyval.sn) = new StatementNode( (yyvsp[(2) - (2)].decl) );
@@ -7047,5 +7047,5 @@
 #line 1494 "parser.yy"
     {	// mark all fields in list
-			for ( DeclarationNode *iter = (yyvsp[(2) - (3)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_next() )
+			for ( DeclarationNode *iter = (yyvsp[(2) - (3)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
 				iter->set_extension( true );
 			(yyval.decl) = (yyvsp[(2) - (3)].decl);
@@ -7772,5 +7772,5 @@
 /* Line 1806 of yacc.c  */
 #line 1972 "parser.yy"
-    { parseTree = parseTree ? parseTree->appendList( (yyvsp[(1) - (1)].decl) ) : (yyvsp[(1) - (1)].decl);	}
+    { parseTree = parseTree != nullptr ? parseTree->appendList( (yyvsp[(1) - (1)].decl) ) : (yyvsp[(1) - (1)].decl);	}
     break;
 
@@ -7779,5 +7779,5 @@
 /* Line 1806 of yacc.c  */
 #line 1978 "parser.yy"
-    { (yyval.decl) = ( (yyvsp[(1) - (3)].decl) != NULL ) ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl) != nullptr ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
     break;
 
@@ -7822,5 +7822,5 @@
 #line 2004 "parser.yy"
     {	// mark all fields in list
-			for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_next() )
+			for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
 				iter->set_extension( true );
 			(yyval.decl) = (yyvsp[(2) - (2)].decl);
Index: src/Parser/parser.yy
===================================================================
--- src/Parser/parser.yy	(revision cbaee0da9351cb4132c3c4b8bce4a1112819e565)
+++ src/Parser/parser.yy	(revision 926af747ff7dac04cacef082cdd822ede9e85c2d)
@@ -10,6 +10,6 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 16 21:31:46 2016
-// Update Count     : 1906
+// Last Modified On : Tue Aug 16 21:59:35 2016
+// Update Count     : 1907
 //
 
@@ -699,5 +699,5 @@
 	| EXTENSION declaration								// GCC
 		{	// mark all fields in list
-			for ( DeclarationNode *iter = $2; iter != NULL; iter = (DeclarationNode *)iter->get_next() )
+			for ( DeclarationNode *iter = $2; iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
 				iter->set_extension( true );
 			$$ = new StatementNode( $2 );
@@ -1493,5 +1493,5 @@
 	| EXTENSION field_declaring_list ';'				// GCC
 		{	// mark all fields in list
-			for ( DeclarationNode *iter = $2; iter != NULL; iter = (DeclarationNode *)iter->get_next() )
+			for ( DeclarationNode *iter = $2; iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
 				iter->set_extension( true );
 			$$ = $2;
@@ -1970,5 +1970,5 @@
 		{}												// empty input file
 	| external_definition_list
-		{ parseTree = parseTree ? parseTree->appendList( $1 ) : $1;	}
+		{ parseTree = parseTree != nullptr ? parseTree->appendList( $1 ) : $1;	}
 	;
 
@@ -1976,5 +1976,5 @@
 	external_definition
 	| external_definition_list push external_definition
-		{ $$ = ( $1 != NULL ) ? $1->appendList( $3 ) : $3; }
+		{ $$ = $1 != nullptr ? $1->appendList( $3 ) : $3; }
 	;
 
@@ -2003,5 +2003,5 @@
 	| EXTENSION external_definition
 		{	// mark all fields in list
-			for ( DeclarationNode *iter = $2; iter != NULL; iter = (DeclarationNode *)iter->get_next() )
+			for ( DeclarationNode *iter = $2; iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
 				iter->set_extension( true );
 			$$ = $2;