Merge pull request #1005 from ethereum/modifierbody

Require ";" after "_"

libsolidity/grammar.txt

@@ -41,8 +41,9 @@ ArrayTypeName = TypeName StorageLocation? '[' Expression? ']'
 StorageLocation = 'memory' | 'storage'
 
 Block = '{' Statement* '}'
-Statement = IfStatement | WhileStatement | ForStatement | Block | PlaceholderStatement |
-            ( Continue | Break | Return | Throw | SimpleStatement | ExpressionStatement ) ';'
+Statement = IfStatement | WhileStatement | ForStatement | Block |
+            ( PlaceholderStatement | Continue | Break | Return |
+              Throw | SimpleStatement | ExpressionStatement ) ';'
 
 ExpressionStatement = Expression | VariableDefinition
 IfStatement = 'if' '(' Expression ')' Statement ( 'else' Statement )?

libsolidity/parsing/Parser.cpp

@@ -753,7 +753,7 @@ ASTPointer<Statement> Parser::parseStatement()
 		{
 			statement = ASTNodeFactory(*this).createNode<PlaceholderStatement>(docString);
 			m_scanner->next();
-			return statement;
+			break;
 		}
 	// fall-through
 	default: