From 35182c7305dcc92ec49c76c57a98296178459707 Mon Sep 17 00:00:00 2001 From: Nicolai Date: Sat, 30 Jul 2016 15:34:46 +0200 Subject: [PATCH] Remove TypeParameterList --- libsolidity/grammar.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libsolidity/grammar.txt b/libsolidity/grammar.txt index e38fdb544..f06f04796 100644 --- a/libsolidity/grammar.txt +++ b/libsolidity/grammar.txt @@ -20,15 +20,15 @@ StructDefinition = 'struct' Identifier '{' ModifierDefinition = 'modifier' Identifier ParameterList? Block FunctionDefinition = 'function' Identifier ParameterList ( FunctionCall | Identifier | 'constant' | 'external' | 'public' | 'internal' | 'private' )* - ( 'returns' (ParameterList | TypeParameterList) )? Block -EventDefinition = 'event' Identifier (ParameterList | TypeParameterList | IndexedTypeParameterList) 'anonymous'? ';' + ( 'returns' ParameterList )? Block +EventDefinition = 'event' Identifier (ParameterList | IndexedTypeParameterList) 'anonymous'? ';' EnumValue = Identifier EnumDefinition = 'enum' Identifier '{' EnumValue? (',' EnumValue)* '}' IndexedTypeParameterList = '(' ( TypeName 'indexed'? Identifier? (',' TypeName 'indexed'? Identifier?)* )? ')' -TypeParameterList = '(' ( TypeName (',' TypeName)* )? ')' -ParameterList = '(' ( VariableDeclaration (',' VariableDeclaration)* )? ')' +ParameterList = '(' ( TypeName Identifier? (',' TypeName Identifier?)* )? ')' + // semantic restriction: mappings and structs (recursively) containing mappings // are not allowed in argument lists VariableDeclaration = TypeName Identifier