Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0aff929

Browse files
committed
Use grammar symbol function_with_argtypes consistently
Instead of sometimes referring to a function signature like func_namefunc_args, use the existing function_with_argtypes symbol, whichcombines the two.Reviewed-by: Alvaro Herrera <alvherre@2ndquadrant.com>Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
1 parent11003eb commit0aff929

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

‎src/backend/parser/gram.y

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5414,21 +5414,21 @@ opclass_item:
54145414
n->order_family =$5;
54155415
$$ = (Node *) n;
54165416
}
5417-
|FUNCTIONIconstfunc_namefunc_args
5417+
|FUNCTIONIconstfunction_with_argtypes
54185418
{
54195419
CreateOpClassItem *n = makeNode(CreateOpClassItem);
54205420
n->itemtype = OPCLASS_ITEM_FUNCTION;
5421-
n->name =$3;
5422-
n->args =extractArgTypes($4);
5421+
n->name =$3->funcname;
5422+
n->args =$3->funcargs;
54235423
n->number =$2;
54245424
$$ = (Node *) n;
54255425
}
5426-
|FUNCTIONIconst'('type_list')'func_namefunc_args
5426+
|FUNCTIONIconst'('type_list')'function_with_argtypes
54275427
{
54285428
CreateOpClassItem *n = makeNode(CreateOpClassItem);
54295429
n->itemtype = OPCLASS_ITEM_FUNCTION;
5430-
n->name =$6;
5431-
n->args =extractArgTypes($7);
5430+
n->name =$6->funcname;
5431+
n->args =$6->funcargs;
54325432
n->number =$2;
54335433
n->class_args =$4;
54345434
$$ = (Node *) n;
@@ -5828,13 +5828,13 @@ CommentStmt:
58285828
n->comment =$7;
58295829
$$ = (Node *) n;
58305830
}
5831-
|COMMENTONFUNCTIONfunc_namefunc_argsIScomment_text
5831+
|COMMENTONFUNCTIONfunction_with_argtypesIScomment_text
58325832
{
58335833
CommentStmt *n = makeNode(CommentStmt);
58345834
n->objtype = OBJECT_FUNCTION;
5835-
n->objname =$4;
5836-
n->objargs =extractArgTypes($5);
5837-
n->comment =$7;
5835+
n->objname =$4->funcname;
5836+
n->objargs =$4->funcargs;
5837+
n->comment =$6;
58385838
$$ = (Node *) n;
58395839
}
58405840
|COMMENTONOPERATORany_operatoroper_argtypesIScomment_text
@@ -6046,15 +6046,15 @@ SecLabelStmt:
60466046
n->label =$9;
60476047
$$ = (Node *) n;
60486048
}
6049-
|SECURITYLABELopt_providerONFUNCTIONfunc_namefunc_args
6049+
|SECURITYLABELopt_providerONFUNCTIONfunction_with_argtypes
60506050
ISsecurity_label
60516051
{
60526052
SecLabelStmt *n = makeNode(SecLabelStmt);
60536053
n->provider =$3;
60546054
n->objtype = OBJECT_FUNCTION;
6055-
n->objname =$6;
6056-
n->objargs =extractArgTypes($7);
6057-
n->label =$9;
6055+
n->objname =$6->funcname;
6056+
n->objargs =$6->funcargs;
6057+
n->label =$8;
60586058
$$ = (Node *) n;
60596059
}
60606060
|SECURITYLABELopt_providerONLARGE_POBJECT_PNumericOnly
@@ -7284,24 +7284,24 @@ opt_restrict:
72847284
*****************************************************************************/
72857285

72867286
RemoveFuncStmt:
7287-
DROPFUNCTIONfunc_namefunc_argsopt_drop_behavior
7287+
DROPFUNCTIONfunction_with_argtypesopt_drop_behavior
72887288
{
72897289
DropStmt *n = makeNode(DropStmt);
72907290
n->removeType = OBJECT_FUNCTION;
7291-
n->objects = list_make1($3);
7292-
n->arguments = list_make1(extractArgTypes($4));
7293-
n->behavior =$5;
7291+
n->objects = list_make1($3->funcname);
7292+
n->arguments = list_make1($3->funcargs);
7293+
n->behavior =$4;
72947294
n->missing_ok =false;
72957295
n->concurrent =false;
72967296
$$ = (Node *)n;
72977297
}
7298-
|DROPFUNCTIONIF_PEXISTSfunc_namefunc_argsopt_drop_behavior
7298+
|DROPFUNCTIONIF_PEXISTSfunction_with_argtypesopt_drop_behavior
72997299
{
73007300
DropStmt *n = makeNode(DropStmt);
73017301
n->removeType = OBJECT_FUNCTION;
7302-
n->objects = list_make1($5);
7303-
n->arguments = list_make1(extractArgTypes($6));
7304-
n->behavior =$7;
7302+
n->objects = list_make1($5->funcname);
7303+
n->arguments = list_make1($5->funcargs);
7304+
n->behavior =$6;
73057305
n->missing_ok =true;
73067306
n->concurrent =false;
73077307
$$ = (Node *)n;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp