Merge pull request antlr#592 from endrebjorsvik/master

teverett · web-flow · commit 3ca9f36f6609 · 2017-04-03T05:31:14.000+03:00
Improving Python compatibility, and adding indexing capabilities.
diff --git a/vhdl/vhdl.g4 b/vhdl/vhdl.g4
@@ -550,7 +550,7 @@ disconnection_specification
   ;
 
 discrete_range
-  : range
+  : range_decl
   | subtype_indication
   ;
 
@@ -975,7 +975,7 @@ name_function_call_or_indexed_part
    ;
 
 name_slice_part
-   : LPAREN explicit_range ( COMMA explicit_range )* RPAREN
+   : ( LPAREN explicit_range ( COMMA explicit_range )* RPAREN )+
    ;
 
 selected_name
@@ -1198,17 +1198,17 @@ quantity_specification
   : quantity_list COLON name
   ;
 
-range
+range_decl
   : explicit_range
   | name
   ;
 
 explicit_range
-  : simple_expression direction simple_expression
+  : simple_expression ( direction simple_expression )?
   ;
 
 range_constraint
-  : RANGE range
+  : RANGE range_decl
   ;
 
 record_nature_definition

Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,7 @@ disconnection_specification`
`550`	`550`	`;`
`551`	`551`
`552`	`552`	`discrete_range`
`553`		`- : range`
	`553`	`+ : range_decl`
`554`	`554`	`\| subtype_indication`
`555`	`555`	`;`
`556`	`556`
`@@ -975,7 +975,7 @@ name_function_call_or_indexed_part`
`975`	`975`	`;`
`976`	`976`
`977`	`977`	`name_slice_part`
`978`		`- : LPAREN explicit_range ( COMMA explicit_range )* RPAREN`
	`978`	`+ : ( LPAREN explicit_range ( COMMA explicit_range )* RPAREN )+`
`979`	`979`	`;`
`980`	`980`
`981`	`981`	`selected_name`
`@@ -1198,17 +1198,17 @@ quantity_specification`
`1198`	`1198`	`: quantity_list COLON name`
`1199`	`1199`	`;`
`1200`	`1200`
`1201`		`-range`
	`1201`	`+range_decl`
`1202`	`1202`	`: explicit_range`
`1203`	`1203`	`\| name`
`1204`	`1204`	`;`
`1205`	`1205`
`1206`	`1206`	`explicit_range`
`1207`		`- : simple_expression direction simple_expression`
	`1207`	`+ : simple_expression ( direction simple_expression )?`
`1208`	`1208`	`;`
`1209`	`1209`
`1210`	`1210`	`range_constraint`
`1211`		`- : RANGE range`
	`1211`	`+ : RANGE range_decl`
`1212`	`1212`	`;`
`1213`	`1213`
`1214`	`1214`	`record_nature_definition`