diff --git a/parse.y b/parse.y index cbe18aa35..156474d29 100644 --- a/parse.y +++ b/parse.y @@ -127,9 +127,6 @@ static void check_net_decl_assigns(const struct vlltype&loc, } } -static std::list * -make_dimensions(std::list *components); - static data_type_t *pform_make_parray_type(const struct vlltype&loc, data_type_t *base, std::list *pdims) @@ -143,14 +140,6 @@ static data_type_t *pform_make_parray_type(const struct vlltype&loc, return type; } -static data_type_t *pform_make_parray_type( - const struct vlltype &loc, - data_type_t *base, - std::list *components) -{ - return pform_make_parray_type(loc, base, make_dimensions(components)); -} - template static void set_type_id_range(T&value, data_type_t *type, char *id, const YYLTYPE&loc, @@ -162,22 +151,6 @@ static void set_type_id_range(T&value, data_type_t *type, char *id, value.ranges = ranges; } -template -static void set_type_id_range(T &value, data_type_t *type, char *id, - const YYLTYPE &loc, - std::list *components) -{ - set_type_id_range(value, type, id, loc, make_dimensions(components)); -} - -template -static void set_type_id_range(T &value, data_type_t *type, char *id, - const YYLTYPE &loc, std::nullptr_t) -{ - set_type_id_range(value, type, id, loc, - static_cast *>(nullptr)); -} - template static void delete_type_id_range(T&value) { @@ -3057,7 +3030,7 @@ data_type_or_implicit_plus_id : identifier_name { set_type_id_range($$, nullptr, $1, @1, nullptr); } - | identifier_name index_components_opt identifier_name + | identifier_name dimensions_opt identifier_name { if (!gn_system_verilog()) { yyerror(@1, "syntax error"); delete[]$1;