diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-01-16 16:26:38 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-01-16 17:18:30 +0100 |
| commit | 48105ab649120ec7c4e848479b31bcc3c8c76ac8 (patch) | |
| tree | 948d11a874bd062c985d359cfe0184dc5970421e /src/wkt2_grammar.y | |
| parent | 29fd61fc61d2f509e1aca34004b9c96ab26037c4 (diff) | |
| download | PROJ-48105ab649120ec7c4e848479b31bcc3c8c76ac8.tar.gz PROJ-48105ab649120ec7c4e848479b31bcc3c8c76ac8.zip | |
wkt2_grammar: update to changes of 19162_draft_2019-01-16
Diffstat (limited to 'src/wkt2_grammar.y')
| -rw-r--r-- | src/wkt2_grammar.y | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/wkt2_grammar.y b/src/wkt2_grammar.y index 6377ec43..2c018198 100644 --- a/src/wkt2_grammar.y +++ b/src/wkt2_grammar.y @@ -1035,13 +1035,12 @@ ellipsoidal_cs_unit: angle_unit map_projection: map_projection_keyword left_delimiter map_projection_name wkt_separator map_projection_method - wkt_separator - parameter_list_identifier_list + opt_separator_parameter_list_identifier_list right_delimiter -parameter_list_identifier_list: - map_projection_parameter opt_separator_identifier_list - | map_projection_parameter wkt_separator parameter_list_identifier_list +opt_separator_parameter_list_identifier_list: + | wkt_separator identifier opt_separator_identifier_list + | wkt_separator map_projection_parameter opt_separator_parameter_list_identifier_list map_projection_keyword: T_CONVERSION @@ -1192,16 +1191,15 @@ calendar_identifier: quoted_latin_text deriving_conversion: deriving_conversion_keyword left_delimiter deriving_conversion_name wkt_separator operation_method - wkt_separator parameter_or_parameter_file - opt_separator_deriving_conversion_end + opt_separator_parameter_or_parameter_file_identifier_list right_delimiter parameter_or_parameter_file: operation_parameter | operation_parameter_file -opt_separator_deriving_conversion_end: - | wkt_separator operation_parameter opt_separator_deriving_conversion_end - | wkt_separator operation_parameter_file opt_separator_deriving_conversion_end - | wkt_separator identifier opt_separator_identifier +opt_separator_parameter_or_parameter_file_identifier_list: + | wkt_separator operation_parameter opt_separator_parameter_or_parameter_file_identifier_list + | wkt_separator operation_parameter_file opt_separator_parameter_or_parameter_file_identifier_list + | wkt_separator identifier opt_separator_identifier_list deriving_conversion_keyword: T_DERIVINGCONVERSION |