language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 06:14:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Replace references to "global tag" with "tag"

Browse source
This commit is contained in:
Richard Feldman 2022-04-25 15:46:32 -04:00
parent 470dddc17b
commit 85e7969c2d
No known key found for this signature in database
GPG key ID: 7E4127D1E4241798
61 changed files with 229 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

20
compiler/parse/src/expr.rs
View file

@ -604,7 +604,7 @@ fn append_body_definition<'a>(
// UserId x = UserId 42
// We optimistically parsed the first line as an alias; we now turn it
// into an annotation.
let loc_name = arena.alloc(header.name.map(|x| Pattern::GlobalTag(x)));
let loc_name = arena.alloc(header.name.map(|x| Pattern::Tag(x)));
let ann_pattern = Pattern::Apply(loc_name, header.vars);
let vars_region = Region::across_all(header.vars.iter().map(|v| &v.region));
let region_ann_pattern = Region::span_across(&loc_name.region, &vars_region);
@ -698,7 +698,7 @@ fn append_annotation_definition<'a>(
match &loc_pattern.value {
Pattern::Apply(
Loc {
value: Pattern::GlobalTag(name),
value: Pattern::Tag(name),
..
},
alias_arguments,
@ -712,7 +712,7 @@ fn append_annotation_definition<'a>(
loc_ann,
kind,
),
Pattern::GlobalTag(name) => append_type_definition(
Pattern::Tag(name) => append_type_definition(
arena,
defs,
region,
@ -873,12 +873,12 @@ fn parse_defs_end<'a>(
{
Pattern::Apply(
Loc {
value: Pattern::GlobalTag(name),
value: Pattern::Tag(name),
region,
},
args,
) => Some((name, *region, args)),
Pattern::GlobalTag(name) => Some((name, loc_pattern.region, &[])),
Pattern::Tag(name) => Some((name, loc_pattern.region, &[])),
_ => None,
};
@ -1020,7 +1020,7 @@ fn finish_parsing_alias_or_opaque<'a>(
.map_err(|fail| (MadeProgress, fail, state.clone()))?;
let (loc_def, state) = match &expr.value {
Expr::GlobalTag(name) => {
Expr::Tag(name) => {
let mut type_arguments = Vec::with_capacity_in(arguments.len(), arena);
for argument in arguments {
@ -1543,11 +1543,11 @@ fn parse_expr_end<'a>(
..
},
state,
)) if matches!(expr_state.expr.value, Expr::GlobalTag(..)) => {
)) if matches!(expr_state.expr.value, Expr::Tag(..)) => {
// This is an ability definition, `Ability arg1 ... has ...`.
let name = expr_state.expr.map_owned(|e| match e {
Expr::GlobalTag(name) => name,
Expr::Tag(name) => name,
_ => unreachable!(),
});
@ -1763,7 +1763,7 @@ fn expr_to_pattern_help<'a>(arena: &'a Bump, expr: &Expr<'a>) -> Result<Pattern<
}
}
Expr::Underscore(opt_name) => Ok(Pattern::Underscore(opt_name)),
Expr::GlobalTag(value) => Ok(Pattern::GlobalTag(value)),
Expr::Tag(value) => Ok(Pattern::Tag(value)),
Expr::OpaqueRef(value) => Ok(Pattern::OpaqueRef(value)),
Expr::Apply(loc_val, loc_args, _) => {
let region = loc_val.region;
@ -2436,7 +2436,7 @@ where
fn ident_to_expr<'a>(arena: &'a Bump, src: Ident<'a>) -> Expr<'a> {
match src {
Ident::GlobalTag(string) => Expr::GlobalTag(string),
Ident::Tag(string) => Expr::Tag(string),
Ident::OpaqueRef(string) => Expr::OpaqueRef(string),
Ident::Access { module_name, parts } => {
let mut iter = parts.iter();