@@ -835,7 +835,7 @@ alterextensioncontentsstmt:
835835 | KW_ALTER KW_EXTENSION name add_drop KW_OPERATOR KW_CLASS any_name KW_USING name
836836 | KW_ALTER KW_EXTENSION name add_drop KW_OPERATOR KW_FAMILY any_name KW_USING name
837837 | KW_ALTER KW_EXTENSION name add_drop KW_PROCEDURE procedure_with_argtypes
838- | KW_ALTER KW_EXTENSION name add_drop KW_ROUTINE function_with_argtypes
838+ | KW_ALTER KW_EXTENSION name add_drop KW_ROUTINE routine_with_argtypes
839839 | KW_ALTER KW_EXTENSION name add_drop KW_TRANSFORM KW_FOR typename KW_LANGUAGE name
840840 | KW_ALTER KW_EXTENSION name add_drop KW_TYPE typename;
841841
@@ -1236,7 +1236,7 @@ commentstmt:
12361236 | KW_COMMENT KW_ON KW_RULE name KW_ON any_name KW_IS comment_text
12371237 | KW_COMMENT KW_ON KW_TRIGGER name KW_ON any_name KW_IS comment_text
12381238 | KW_COMMENT KW_ON KW_PROCEDURE procedure_with_argtypes KW_IS comment_text
1239- | KW_COMMENT KW_ON KW_ROUTINE function_with_argtypes KW_IS comment_text
1239+ | KW_COMMENT KW_ON KW_ROUTINE routine_with_argtypes KW_IS comment_text
12401240 | KW_COMMENT KW_ON KW_TRANSFORM KW_FOR typename KW_LANGUAGE name KW_IS comment_text
12411241 | KW_COMMENT KW_ON KW_OPERATOR KW_CLASS any_name KW_USING name KW_IS comment_text
12421242 | KW_COMMENT KW_ON KW_OPERATOR KW_FAMILY any_name KW_USING name KW_IS comment_text
@@ -1255,7 +1255,7 @@ seclabelstmt:
12551255 | KW_SECURITY KW_LABEL opt_provider? KW_ON KW_FUNCTION function_with_argtypes KW_IS security_label
12561256 | KW_SECURITY KW_LABEL opt_provider? KW_ON KW_LARGE KW_OBJECT numericonly KW_IS security_label
12571257 | KW_SECURITY KW_LABEL opt_provider? KW_ON KW_PROCEDURE procedure_with_argtypes KW_IS security_label
1258- | KW_SECURITY KW_LABEL opt_provider? KW_ON KW_ROUTINE function_with_argtypes KW_IS security_label;
1258+ | KW_SECURITY KW_LABEL opt_provider? KW_ON KW_ROUTINE routine_with_argtypes KW_IS security_label;
12591259
12601260opt_provider : KW_FOR nonreservedword_or_sconst;
12611261
@@ -1335,7 +1335,7 @@ privilege_target:
13351335 | KW_FOREIGN KW_SERVER name_list
13361336 | KW_FUNCTION function_with_argtypes_list
13371337 | KW_PROCEDURE procedure_with_argtypes_list
1338- | KW_ROUTINE usual_with_argtypes_list
1338+ | KW_ROUTINE routine_with_argtypes_list
13391339 | KW_DATABASE database_nameList
13401340 | KW_DOMAIN any_name_list
13411341 | KW_LANGUAGE name_list
@@ -1444,11 +1444,11 @@ func_args: OPEN_PAREN func_args_list? CLOSE_PAREN;
14441444
14451445func_args_list : func_arg (COMMA func_arg)*;
14461446
1447- usual_with_argtypes_list :
1448- usual_with_argtypes (COMMA usual_with_argtypes )*;
1447+ routine_with_argtypes_list :
1448+ routine_with_argtypes (COMMA routine_with_argtypes )*;
14491449
1450- usual_with_argtypes :
1451- usual_name func_args
1450+ routine_with_argtypes :
1451+ routine_name func_args
14521452 | type_func_name_keyword
14531453 | colid indirection?;
14541454
@@ -1560,7 +1560,7 @@ table_func_column_list:
15601560alterfunctionstmt :
15611561 KW_ALTER alterFunctionTypeClause alterfunc_opt_list opt_restrict?;
15621562
1563- alterFunctionTypeClause : KW_FUNCTION function_with_argtypes | KW_PROCEDURE procedure_with_argtypes | KW_ROUTINE usual_with_argtypes ;
1563+ alterFunctionTypeClause : KW_FUNCTION function_with_argtypes | KW_PROCEDURE procedure_with_argtypes | KW_ROUTINE routine_with_argtypes ;
15641564
15651565alterfunc_opt_list : common_func_opt_item+;
15661566
@@ -1569,7 +1569,7 @@ opt_restrict: KW_RESTRICT;
15691569removefuncstmt :
15701570 KW_DROP KW_FUNCTION opt_if_exists? function_with_argtypes_list opt_drop_behavior?
15711571 | KW_DROP KW_PROCEDURE opt_if_exists? procedure_with_argtypes_list opt_drop_behavior?
1572- | KW_DROP KW_ROUTINE opt_if_exists? usual_with_argtypes_list opt_drop_behavior?;
1572+ | KW_DROP KW_ROUTINE opt_if_exists? routine_with_argtypes_list opt_drop_behavior?;
15731573
15741574removeaggrstmt :
15751575 KW_DROP KW_AGGREGATE opt_if_exists? aggregate_with_argtypes_list opt_drop_behavior?;
@@ -1653,7 +1653,7 @@ renamestmt:
16531653 | KW_ALTER KW_POLICY opt_if_exists? name KW_ON qualified_name KW_RENAME KW_TO name
16541654 | KW_ALTER KW_PROCEDURE procedure_with_argtypes KW_RENAME KW_TO procedure_name_create
16551655 | KW_ALTER KW_PUBLICATION name KW_RENAME KW_TO name
1656- | KW_ALTER KW_ROUTINE function_with_argtypes KW_RENAME KW_TO name
1656+ | KW_ALTER KW_ROUTINE routine_with_argtypes KW_RENAME KW_TO name
16571657 | KW_ALTER KW_SCHEMA schema_name KW_RENAME KW_TO schema_name_create
16581658 | KW_ALTER KW_SERVER name KW_RENAME KW_TO name
16591659 | KW_ALTER KW_SUBSCRIPTION name KW_RENAME KW_TO name
@@ -1689,7 +1689,7 @@ opt_set_data: KW_SET KW_DATA;
16891689alterobjectdependsstmt :
16901690 KW_ALTER KW_FUNCTION function_with_argtypes opt_no? KW_DEPENDS KW_ON KW_EXTENSION name
16911691 | KW_ALTER KW_PROCEDURE procedure_with_argtypes opt_no? KW_DEPENDS KW_ON KW_EXTENSION name
1692- | KW_ALTER KW_ROUTINE function_with_argtypes opt_no? KW_DEPENDS KW_ON KW_EXTENSION name
1692+ | KW_ALTER KW_ROUTINE routine_with_argtypes opt_no? KW_DEPENDS KW_ON KW_EXTENSION name
16931693 | KW_ALTER KW_TRIGGER name KW_ON qualified_name opt_no? KW_DEPENDS KW_ON KW_EXTENSION name
16941694 | KW_ALTER KW_MATERIALIZED KW_VIEW view_name opt_no? KW_DEPENDS KW_ON KW_EXTENSION name
16951695 | KW_ALTER KW_INDEX qualified_name opt_no? KW_DEPENDS KW_ON KW_EXTENSION name;
@@ -1707,7 +1707,7 @@ alterobjectschemastmt:
17071707 | KW_ALTER KW_OPERATOR KW_CLASS any_name KW_USING name KW_SET KW_SCHEMA schema_name_create
17081708 | KW_ALTER KW_OPERATOR KW_FAMILY any_name KW_USING name KW_SET KW_SCHEMA schema_name_create
17091709 | KW_ALTER KW_PROCEDURE procedure_with_argtypes KW_SET KW_SCHEMA schema_name_create
1710- | KW_ALTER KW_ROUTINE function_with_argtypes KW_SET KW_SCHEMA schema_name_create
1710+ | KW_ALTER KW_ROUTINE routine_with_argtypes KW_SET KW_SCHEMA schema_name_create
17111711 | KW_ALTER KW_TABLE opt_if_exists? relation_expr KW_SET KW_SCHEMA schema_name_create
17121712 | KW_ALTER KW_STATISTICS any_name KW_SET KW_SCHEMA schema_name_create
17131713 | KW_ALTER KW_TEXT KW_SEARCH KW_PARSER any_name KW_SET KW_SCHEMA schema_name_create
@@ -1752,7 +1752,7 @@ alterownerstmt:
17521752 | KW_ALTER KW_OPERATOR KW_CLASS any_name KW_USING name KW_OWNER KW_TO rolespec
17531753 | KW_ALTER KW_OPERATOR KW_FAMILY any_name KW_USING name KW_OWNER KW_TO rolespec
17541754 | KW_ALTER KW_PROCEDURE procedure_with_argtypes KW_OWNER KW_TO rolespec
1755- | KW_ALTER KW_ROUTINE function_with_argtypes KW_OWNER KW_TO rolespec
1755+ | KW_ALTER KW_ROUTINE routine_with_argtypes KW_OWNER KW_TO rolespec
17561756 | KW_ALTER KW_SCHEMA schema_name KW_OWNER KW_TO rolespec
17571757 | KW_ALTER KW_TYPE any_name KW_OWNER KW_TO rolespec
17581758 | KW_ALTER KW_TABLESPACE tablespace_name KW_OWNER KW_TO rolespec
0 commit comments