From 9cb7b8070be9aa25fd373b51bd9482c9c95f91fa Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 9 Jun 2020 14:43:22 +0200
Subject: [PATCH] Grammar fixes.

---
 docs/Solidity.g4 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/Solidity.g4 b/docs/Solidity.g4
index a415c19f9..fdc80822b 100644
--- a/docs/Solidity.g4
+++ b/docs/Solidity.g4
@@ -124,7 +124,11 @@ userDefinedTypeName
   : identifier ( '.' identifier )* ;
 
 mapping
-  : 'mapping' '(' (elementaryTypeName | userDefinedTypeName) '=>' typeName ')' ;
+  : 'mapping' '(' mappingKey '=>' typeName ')' ;
+
+mappingKey
+  : elementaryTypeName
+  | userDefinedTypeName ;
 
 functionTypeName
   : 'function' parameterList modifierList returnParameters? ;
@@ -470,7 +474,7 @@ SingleQuotedStringCharacter
   : ~['\r\n\\] | ('\\' .) ;
 
 VersionLiteral
-  : [0-9]+ '.' [0-9]+ ('.' [0-9]+)? ;
+  : [0-9]+ ( '.' [0-9]+ ('.' [0-9]+)? )? ;
 
 WS
   : [ \t\r\n\u000C]+ -> skip ;