Re: [PATCH 08/13] dtc: Move labelled-reference handling out of the grammar

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 3901 bytes --]

On Sun, Nov 01, 2026 at 09:37:02AM -0700, Simon Glass wrote:
> The grammar action for a top-level label: &ref { ... } holds its merge
> logic, which adds the label to the node referred to.
> 
> Move it into a new merge_labelled_ref(), passing it a struct fragment
> from fragment_ref, with the label and node added.
> 
> The output does not change.
> 
> Assisted-by: Claude:claude-opus-5-5
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
> 
>  dtc-parser.y | 18 +++++++-----------
>  dtc.h        |  2 ++
>  livetree.c   | 28 ++++++++++++++++++++++++++++
>  3 files changed, 37 insertions(+), 11 deletions(-)
> 
> diff --git a/dtc-parser.y b/dtc-parser.y
> index cca3ce1..0e6c4c2 100644
> --- a/dtc-parser.y
> +++ b/dtc-parser.y
> @@ -190,18 +190,14 @@ devicetree:
>  						  ""),
>  					$2, $1);
>  		}
> -	| devicetree DT_LABEL dt_ref nodedef
> +	| devicetree DT_LABEL fragment_ref nodedef

Usual comments on fragment_ref.

>  		{
> -			struct node *target = get_node_by_ref($1, $3);
> -
> -			if (($<flags>-1 & DTSF_PLUGIN) && is_ref_relative($3))
> -				ERROR(&@2, "Label-relative reference %s not supported in plugin", $3);
> -
> -			if (target) {
> -				add_label(&target->labels, $2);
> -				merge_nodes(target, $4);
> -			} else
> -				ERROR(&@3, "Label or path %s not found", $3);
> +			$3->label = $2;
> +			$3->label_srcpos = srcpos_copy(&@2);
> +			$3->node = $4;
> +			if (merge_labelled_ref($1, $3,
> +					       $<flags>-1 & DTSF_PLUGIN))
> +				treesource_error = true;
>  			$$ = $1;
>  		}
>  	| devicetree DT_PATH_REF nodedef
> diff --git a/dtc.h b/dtc.h
> index 5af1d1f..75b1c0f 100644
> --- a/dtc.h
> +++ b/dtc.h
> @@ -369,6 +369,8 @@ struct fragment *build_fragment_ref(char *ref, bool path_ref,
>  struct fragment *append_fragment(struct fragment *list, struct fragment *new);
>  void free_fragment(struct fragment *f);
>  bool is_ref_relative(const char *ref);
> +bool merge_labelled_ref(struct node *dt, struct fragment *f,
> +			bool plugin);
>  bool merge_path_ref(struct node *dt, struct fragment *f, bool plugin);
>  bool merge_label_ref(struct node *dt, struct fragment *f, bool plugin);
>  bool merge_delete_node(struct node *dt, struct fragment *f);
> diff --git a/livetree.c b/livetree.c
> index b0362e4..76474cd 100644
> --- a/livetree.c
> +++ b/livetree.c
> @@ -548,6 +548,34 @@ bool is_ref_relative(const char *ref)
>  	return ref[0] != '/' && strchr(&ref[1], '/');
>  }
>  
> +/*
> + * Merge a fragment of the form 'label: &ref { ... }' into the node which ref
> + * refers to, adding the label to that node
> + *
> + * Returns true if there is an error, which has been reported.
> + */
> +bool merge_labelled_ref(struct node *dt, struct fragment *f, bool plugin)

This again seems like the fragment itself contains the information to
do the right thing for path/label or labelled fragments, rather than
having separate functions for each case.

> +{
> +	struct node *target = get_node_by_ref(dt, f->ref);
> +	bool error = false;
> +
> +	if (plugin && is_ref_relative(f->ref)) {
> +		srcpos_error(f->label_srcpos, "Error",
> +			     "Label-relative reference %s not supported in plugin",
> +			     f->ref);
> +		error = true;
> +	}
> +	if (!target) {
> +		srcpos_error(f->ref_srcpos, "Error",
> +			     "Label or path %s not found", f->ref);
> +		return true;
> +	}
> +	add_label(&target->labels, f->label);
> +	merge_nodes(target, f->node);
> +
> +	return error;
> +}
> +
>  /*
>   * Merge a fragment which refers to a path into the node at that path. In a
>   * plugin, the fragment becomes an overlay fragment instead.
> -- 
> 2.43.0
> 
> 

-- 
David Gibson (he or they)	| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you, not the other way
				| around.
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]