From 6953049e5f67dcc940cc4edc228c1be13a4624d1 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 31 Jul 2018 23:13:55 +0300 Subject: [PATCH] Rename VALUE_PARAMETER -> PARAM --- src/grammar.ron | 2 +- src/parser/grammar/params.rs | 2 +- src/syntax_kinds/generated.rs | 4 ++-- tests/data/parser/inline/0055_self_param.txt | 2 +- tests/data/parser/inline/0063_lambda_expr.txt | 4 ++-- tests/data/parser/inline/0064_param_list.txt | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/grammar.ron b/src/grammar.ron index 24f11f63ee9..a9a3847c94f 100644 --- a/src/grammar.ron +++ b/src/grammar.ron @@ -165,7 +165,7 @@ Grammar( "ASSOC_TYPE_ARG", "PARAM_LIST", - "VALUE_PARAMETER", + "PARAM", "SELF_PARAM", "ARG_LIST", ] diff --git a/src/parser/grammar/params.rs b/src/parser/grammar/params.rs index 1ef2cea8856..99fedfc219d 100644 --- a/src/parser/grammar/params.rs +++ b/src/parser/grammar/params.rs @@ -37,7 +37,7 @@ fn value_parameter(p: &mut Parser, require_type: bool) { if p.at(COLON) || require_type { types::ascription(p) } - m.complete(p, VALUE_PARAMETER); + m.complete(p, PARAM); } // test self_param diff --git a/src/syntax_kinds/generated.rs b/src/syntax_kinds/generated.rs index 93a3250a453..2f7c290088e 100644 --- a/src/syntax_kinds/generated.rs +++ b/src/syntax_kinds/generated.rs @@ -152,7 +152,7 @@ pub enum SyntaxKind { TYPE_ARG, ASSOC_TYPE_ARG, PARAM_LIST, - VALUE_PARAMETER, + PARAM, SELF_PARAM, ARG_LIST, // Technical SyntaxKinds: they appear temporally during parsing, @@ -314,7 +314,7 @@ impl SyntaxKind { TYPE_ARG => &SyntaxInfo { name: "TYPE_ARG" }, ASSOC_TYPE_ARG => &SyntaxInfo { name: "ASSOC_TYPE_ARG" }, PARAM_LIST => &SyntaxInfo { name: "PARAM_LIST" }, - VALUE_PARAMETER => &SyntaxInfo { name: "VALUE_PARAMETER" }, + PARAM => &SyntaxInfo { name: "PARAM" }, SELF_PARAM => &SyntaxInfo { name: "SELF_PARAM" }, ARG_LIST => &SyntaxInfo { name: "ARG_LIST" }, TOMBSTONE => &SyntaxInfo { name: "TOMBSTONE" }, diff --git a/tests/data/parser/inline/0055_self_param.txt b/tests/data/parser/inline/0055_self_param.txt index 9ea55f589f8..96114d4ccf8 100644 --- a/tests/data/parser/inline/0055_self_param.txt +++ b/tests/data/parser/inline/0055_self_param.txt @@ -76,7 +76,7 @@ FILE@[0; 106) WHITESPACE@[86; 87) SELF_KW@[87; 91) COMMA@[91; 92) - VALUE_PARAMETER@[92; 99) + PARAM@[92; 99) BIND_PAT@[92; 94) NAME@[92; 94) WHITESPACE@[92; 93) diff --git a/tests/data/parser/inline/0063_lambda_expr.txt b/tests/data/parser/inline/0063_lambda_expr.txt index b1edffc1477..b1be9e5bca1 100644 --- a/tests/data/parser/inline/0063_lambda_expr.txt +++ b/tests/data/parser/inline/0063_lambda_expr.txt @@ -49,7 +49,7 @@ FILE@[0; 74) LAMBDA_EXPR@[48; 53) PARAM_LIST@[48; 52) PIPE@[48; 49) - VALUE_PARAMETER@[49; 50) + PARAM@[49; 50) BIND_PAT@[49; 50) NAME@[49; 50) IDENT@[49; 50) "x" @@ -66,7 +66,7 @@ FILE@[0; 74) LAMBDA_EXPR@[59; 70) PARAM_LIST@[59; 69) PIPE@[59; 60) - VALUE_PARAMETER@[60; 66) + PARAM@[60; 66) BIND_PAT@[60; 61) NAME@[60; 61) IDENT@[60; 61) "x" diff --git a/tests/data/parser/inline/0064_param_list.txt b/tests/data/parser/inline/0064_param_list.txt index 96e03d71aed..eebed8177cb 100644 --- a/tests/data/parser/inline/0064_param_list.txt +++ b/tests/data/parser/inline/0064_param_list.txt @@ -19,7 +19,7 @@ FILE@[0; 67) IDENT@[13; 14) "b" PARAM_LIST@[14; 23) L_PAREN@[14; 15) - VALUE_PARAMETER@[15; 21) + PARAM@[15; 21) BIND_PAT@[15; 16) NAME@[15; 16) IDENT@[15; 16) "x" @@ -43,7 +43,7 @@ FILE@[0; 67) IDENT@[29; 30) "c" PARAM_LIST@[30; 41) L_PAREN@[30; 31) - VALUE_PARAMETER@[31; 37) + PARAM@[31; 37) BIND_PAT@[31; 32) NAME@[31; 32) IDENT@[31; 32) "x" @@ -69,7 +69,7 @@ FILE@[0; 67) IDENT@[47; 48) "d" PARAM_LIST@[48; 64) L_PAREN@[48; 49) - VALUE_PARAMETER@[49; 55) + PARAM@[49; 55) BIND_PAT@[49; 50) NAME@[49; 50) IDENT@[49; 50) "x" @@ -81,7 +81,7 @@ FILE@[0; 67) WHITESPACE@[51; 52) IDENT@[52; 55) "i32" COMMA@[55; 56) - VALUE_PARAMETER@[56; 62) + PARAM@[56; 62) BIND_PAT@[56; 58) NAME@[56; 58) WHITESPACE@[56; 57)