Index: src/Parser/ParseNode.h
===================================================================
--- src/Parser/ParseNode.h	(revision 61fc4f680f705e73db121612bf6434f3dd95ce97)
+++ src/Parser/ParseNode.h	(revision 6d539f8348db00c2e61be02b77866018e11ad20f)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Apr 29 14:04:05 2018
-// Update Count     : 830
+// Last Modified On : Mon Apr 30 09:19:17 2018
+// Update Count     : 831
 //
 
@@ -416,6 +416,6 @@
 Statement * build_finally( StatementNode * stmt );
 Statement * build_compound( StatementNode * first );
-Statement * build_asmstmt( bool voltile, Expression * instruction, ExpressionNode * output = nullptr, ExpressionNode * input = nullptr, ExpressionNode * clobber = nullptr, LabelNode * gotolabels = nullptr );
-Statement * build_dirstmt( std::string * directive );
+Statement * build_asm( bool voltile, Expression * instruction, ExpressionNode * output = nullptr, ExpressionNode * input = nullptr, ExpressionNode * clobber = nullptr, LabelNode * gotolabels = nullptr );
+Statement * build_directive( std::string * directive );
 WaitForStmt * build_waitfor( ExpressionNode * target, StatementNode * stmt, ExpressionNode * when );
 WaitForStmt * build_waitfor( ExpressionNode * target, StatementNode * stmt, ExpressionNode * when, WaitForStmt * existing );
Index: src/Parser/StatementNode.cc
===================================================================
--- src/Parser/StatementNode.cc	(revision 61fc4f680f705e73db121612bf6434f3dd95ce97)
+++ src/Parser/StatementNode.cc	(revision 6d539f8348db00c2e61be02b77866018e11ad20f)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Apr 29 14:21:45 2018
-// Update Count     : 353
+// Last Modified On : Mon Apr 30 09:21:16 2018
+// Update Count     : 354
 //
 
@@ -310,5 +310,5 @@
 }
 
-Statement * build_asmstmt( bool voltile, Expression * instruction, ExpressionNode * output, ExpressionNode * input, ExpressionNode * clobber, LabelNode * gotolabels ) {
+Statement * build_asm( bool voltile, Expression * instruction, ExpressionNode * output, ExpressionNode * input, ExpressionNode * clobber, LabelNode * gotolabels ) {
 	std::list< Expression * > out, in;
 	std::list< ConstantExpr * > clob;
@@ -320,5 +320,5 @@
 }
 
-Statement * build_dirstmt( string * directive ) {
+Statement * build_directive( string * directive ) {
 	cout << *directive << endl;
 	return nullptr;
Index: src/Parser/parser.yy
===================================================================
--- src/Parser/parser.yy	(revision 61fc4f680f705e73db121612bf6434f3dd95ce97)
+++ src/Parser/parser.yy	(revision 6d539f8348db00c2e61be02b77866018e11ad20f)
@@ -10,6 +10,6 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Apr 29 14:20:17 2018
-// Update Count     : 3206
+// Last Modified On : Mon Apr 30 09:20:47 2018
+// Update Count     : 3207
 //
 
@@ -877,5 +877,5 @@
 	| asm_statement
 	| DIRECTIVE
-		{ $$ = new StatementNode( build_dirstmt( $1 ) ); }
+		{ $$ = new StatementNode( build_directive( $1 ) ); }
 	;
 
@@ -1207,13 +1207,13 @@
 asm_statement:
 	ASM asm_volatile_opt '(' string_literal ')' ';'
-		{ $$ = new StatementNode( build_asmstmt( $2, $4, 0 ) ); }
+		{ $$ = new StatementNode( build_asm( $2, $4, 0 ) ); }
 	| ASM asm_volatile_opt '(' string_literal ':' asm_operands_opt ')' ';' // remaining GCC
-		{ $$ = new StatementNode( build_asmstmt( $2, $4, $6 ) ); }
+		{ $$ = new StatementNode( build_asm( $2, $4, $6 ) ); }
 	| ASM asm_volatile_opt '(' string_literal ':' asm_operands_opt ':' asm_operands_opt ')' ';'
-		{ $$ = new StatementNode( build_asmstmt( $2, $4, $6, $8 ) ); }
+		{ $$ = new StatementNode( build_asm( $2, $4, $6, $8 ) ); }
 	| ASM asm_volatile_opt '(' string_literal ':' asm_operands_opt ':' asm_operands_opt ':' asm_clobbers_list_opt ')' ';'
-		{ $$ = new StatementNode( build_asmstmt( $2, $4, $6, $8, $10 ) ); }
+		{ $$ = new StatementNode( build_asm( $2, $4, $6, $8, $10 ) ); }
 	| ASM asm_volatile_opt GOTO '(' string_literal ':' ':' asm_operands_opt ':' asm_clobbers_list_opt ':' label_list ')' ';'
-		{ $$ = new StatementNode( build_asmstmt( $2, $5, 0, $8, $10, $12 ) ); }
+		{ $$ = new StatementNode( build_asm( $2, $5, 0, $8, $10, $12 ) ); }
 	;
 
@@ -2405,5 +2405,5 @@
 	| ASM '(' string_literal ')' ';'					// GCC, global assembler statement
 		{
-			$$ = DeclarationNode::newAsmStmt( new StatementNode( build_asmstmt( false, $3, 0 ) ) );
+			$$ = DeclarationNode::newAsmStmt( new StatementNode( build_asm( false, $3, 0 ) ) );
 		}
 	| EXTERN STRINGliteral								// C++-style linkage specifier