[{"id":37594,"web_url":"https://patchwork.libcamera.org/comment/37594/","msgid":"","date":"2026-01-13T09:43:29","subject":"Re: [PATCH 14/36] libcamera: yaml_parser: Un-friend\n\tYamlParserContext from YamlObject","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/people/216/","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"content":"2026. 01. 13. 1:07 keltezéssel, Laurent Pinchart írta:\n> YamlParserContext is a friend of the YamlObject class to access private\n> member variables. Now that YamlObject exposes functions to set a value\n> and add children, this is not needed anymore. Decouple the two classes.\n> \n> Signed-off-by: Laurent Pinchart \n> ---\n> include/libcamera/internal/yaml_parser.h | 1 -\n> src/libcamera/yaml_parser.cpp | 56 +++++++++---------------\n> 2 files changed, 21 insertions(+), 36 deletions(-)\n> \n> diff --git a/include/libcamera/internal/yaml_parser.h b/include/libcamera/internal/yaml_parser.h\n> index ede2c3de687c..02e39e4cd7a1 100644\n> --- a/include/libcamera/internal/yaml_parser.h\n> +++ b/include/libcamera/internal/yaml_parser.h\n> @@ -204,7 +204,6 @@ private:\n> \n> \ttemplate\n> \tfriend struct Accessor;\n> -\tfriend class YamlParserContext;\n> \n> \tenum class Type {\n> \t\tDictionary,\n> diff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/yaml_parser.cpp\n> index 7462e2d74179..fa1a487a13dc 100644\n> --- a/src/libcamera/yaml_parser.cpp\n> +++ b/src/libcamera/yaml_parser.cpp\n> @@ -530,8 +530,8 @@ private:\n> \n> \tEventPtr nextEvent();\n> \n> -\tvoid readValue(std::string &value, EventPtr event);\n> -\tint parseDictionaryOrList(YamlObject::Type type,\n> +\tstd::string readValue(EventPtr event);\n> +\tint parseDictionaryOrList(yaml_event_type_t endEventType,\n> \t\t\t\t const std::function &parseItem);\n> \tint parseNextYamlObject(YamlObject &yamlObject, EventPtr event);\n> \n> @@ -673,22 +673,22 @@ int YamlParserContext::parseContent(YamlObject &yamlObject)\n> /**\n> * \\fn YamlParserContext::readValue()\n> * \\brief Parse event scalar and fill its content into a string\n> - * \\param[in] value The string reference to fill value\n> *\n> * A helper function to parse a scalar event as string. The caller needs to\n> - * guarantee the event is of scaler type.\n> + * guarantee the event is of scalar type.\n> + *\n> + * \\return The scalar event value as a string\n> */\n> -void YamlParserContext::readValue(std::string &value, EventPtr event)\n> +std::string YamlParserContext::readValue(EventPtr event)\n> {\n> -\tvalue.assign(reinterpret_cast(event->data.scalar.value),\n> -\t\t event->data.scalar.length);\n> +\treturn std::string{ reinterpret_cast(event->data.scalar.value),\n> +\t\t\t event->data.scalar.length };\n> }\n> \n> /**\n> * \\fn YamlParserContext::parseDictionaryOrList()\n> * \\brief A helper function to abstract the common part of parsing dictionary or list\n> - *\n> - * \\param[in] isDictionary True for parsing a dictionary, and false for a list\n> + * \\param[in] endEventType The YAML end event type (sequence or mapping)\n> * \\param[in] parseItem The callback to handle an item\n> *\n> * A helper function to abstract parsing an item from a dictionary or a list.\n> @@ -703,13 +703,9 @@ void YamlParserContext::readValue(std::string &value, EventPtr event)\n> * \\return 0 on success or a negative error code otherwise\n> * \\retval -EINVAL The parser is failed to initialize\n> */\n> -int YamlParserContext::parseDictionaryOrList(YamlObject::Type type,\n> +int YamlParserContext::parseDictionaryOrList(yaml_event_type_t endEventType,\n> \t\t\t\t\t const std::function &parseItem)\n> {\n> -\tyaml_event_type_t endEventType = YAML_SEQUENCE_END_EVENT;\n> -\tif (type == YamlObject::Type::Dictionary)\n> -\t\tendEventType = YAML_MAPPING_END_EVENT;\n> -\n> \t/*\n> \t * Add a safety counter to make sure we don't loop indefinitely in case\n> \t * the YAML file is malformed.\n> @@ -751,24 +747,19 @@ int YamlParserContext::parseNextYamlObject(YamlObject &yamlObject, EventPtr even\n> \n> \tswitch (event->type) {\n> \tcase YAML_SCALAR_EVENT:\n> -\t\tyamlObject.type_ = YamlObject::Type::Value;\n> -\t\treadValue(yamlObject.value_, std::move(event));\n> +\t\tyamlObject.set(readValue(std::move(event)));\n> \t\treturn 0;\n> \n> \tcase YAML_SEQUENCE_START_EVENT: {\n> -\t\tyamlObject.type_ = YamlObject::Type::List;\n> -\t\tauto &list = yamlObject.list_;\n> -\t\tauto handler = [this, &list](EventPtr evt) {\n> -\t\t\tlist.emplace_back(std::string{}, std::make_unique());\n> -\t\t\treturn parseNextYamlObject(*list.back().value, std::move(evt));\n> +\t\tauto handler = [this, &yamlObject](EventPtr evt) {\n> +\t\t\tYamlObject *child = yamlObject.add(std::make_unique());\n> +\t\t\treturn parseNextYamlObject(*child, std::move(evt));\n> \t\t};\n> -\t\treturn parseDictionaryOrList(YamlObject::Type::List, handler);\n> +\t\treturn parseDictionaryOrList(YAML_SEQUENCE_END_EVENT, handler);\n> \t}\n> \n> \tcase YAML_MAPPING_START_EVENT: {\n> -\t\tyamlObject.type_ = YamlObject::Type::Dictionary;\n> -\t\tauto &list = yamlObject.list_;\n> -\t\tauto handler = [this, &list](EventPtr evtKey) {\n> +\t\tauto handler = [this, &yamlObject](EventPtr evtKey) {\n> \t\t\t/* Parse key */\n> \t\t\tif (evtKey->type != YAML_SCALAR_EVENT) {\n> \t\t\t\tLOG(YamlParser, Error) << \"Expect key at line: \"\n> @@ -778,26 +769,21 @@ int YamlParserContext::parseNextYamlObject(YamlObject &yamlObject, EventPtr even\n> \t\t\t\treturn -EINVAL;\n> \t\t\t}\n> \n> -\t\t\tstd::string key;\n> -\t\t\treadValue(key, std::move(evtKey));\n> +\t\t\tstd::string key = readValue(std::move(evtKey));\n> \n> \t\t\t/* Parse value */\n> \t\t\tEventPtr evtValue = nextEvent();\n> \t\t\tif (!evtValue)\n> \t\t\t\treturn -EINVAL;\n> \n> -\t\t\tauto &elem = list.emplace_back(std::move(key),\n> -\t\t\t\t\t\t std::make_unique());\n> -\t\t\treturn parseNextYamlObject(*elem.value, std::move(evtValue));\n> +\t\t\tYamlObject *child = yamlObject.add(std::move(key),\n> +\t\t\t\t\t\t\t std::make_unique());\n\nI think the return value should be checked here and in the list case. Even if only with ASSERT().\nA simple duplicate key will cause an issue here.\n\n\n> +\t\t\treturn parseNextYamlObject(*child, std::move(evtValue));\n> \t\t};\n> -\t\tint ret = parseDictionaryOrList(YamlObject::Type::Dictionary, handler);\n> +\t\tint ret = parseDictionaryOrList(YAML_MAPPING_END_EVENT, handler);\n> \t\tif (ret)\n> \t\t\treturn ret;\n> \n> -\t\tauto &dictionary = yamlObject.dictionary_;\n> -\t\tfor (const auto &elem : list)\n> -\t\t\tdictionary.emplace(elem.key, elem.value.get());\n> -\n> \t\treturn 0;\n> \t}\n> \n> --\n> Regards,\n> \n> Laurent Pinchart\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 9664FBDCBF\n\tfor ;\n\tTue, 13 Jan 2026 09:43:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5293861FB7;\n\tTue, 13 Jan 2026 10:43:35 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 113F361FA0\n\tfor ;\n\tTue, 13 Jan 2026 10:43:33 +0100 (CET)","from [192.168.33.30] (185.221.143.114.nat.pool.zt.hu\n\t[185.221.143.114])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3610150A;\n\tTue, 13 Jan 2026 10:43:07 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ooFwRK6P\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1768297387;\n\tbh=AbfKWIYmaSbdjy64w9eOaLc0sCJ4FIX/T+tZ5BKb4rU=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=ooFwRK6PKXT4MTS0ri+2RkoGbfaK6u75pisoTkXM9Q3SK3JHdApQ7TXoUkKaAvr9F\n\tpDP9H9C+5/24nmN9G6lmlwBoiZzyuVBzjYeJGicB6wWQZLJDOddlIyZTYXxWXDcbQ4\n\t9xScV+aQAdnL13VBQK+LXfGvlVSc/KvrrpT87daE=","Message-ID":"","Date":"Tue, 13 Jan 2026 10:43:29 +0100","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH 14/36] libcamera: yaml_parser: Un-friend\n\tYamlParserContext from YamlObject","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20260113000808.15395-1-laurent.pinchart@ideasonboard.com>\n\t\n\t<20260113000808.15395-15-laurent.pinchart@ideasonboard.com>","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Content-Language":"en-US, hu-HU","In-Reply-To":"<20260113000808.15395-15-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":37608,"web_url":"https://patchwork.libcamera.org/comment/37608/","msgid":"<20260113140502.GJ6198@pendragon.ideasonboard.com>","date":"2026-01-13T14:05:02","subject":"Re: [PATCH 14/36] libcamera: yaml_parser: Un-friend\n\tYamlParserContext from YamlObject","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Tue, Jan 13, 2026 at 10:43:29AM +0100, Barnabás Pőcze wrote:\n> 2026. 01. 13. 1:07 keltezéssel, Laurent Pinchart írta:\n> > YamlParserContext is a friend of the YamlObject class to access private\n> > member variables. Now that YamlObject exposes functions to set a value\n> > and add children, this is not needed anymore. Decouple the two classes.\n> > \n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > include/libcamera/internal/yaml_parser.h | 1 -\n> > src/libcamera/yaml_parser.cpp | 56 +++++++++---------------\n> > 2 files changed, 21 insertions(+), 36 deletions(-)\n> > \n> > diff --git a/include/libcamera/internal/yaml_parser.h b/include/libcamera/internal/yaml_parser.h\n> > index ede2c3de687c..02e39e4cd7a1 100644\n> > --- a/include/libcamera/internal/yaml_parser.h\n> > +++ b/include/libcamera/internal/yaml_parser.h\n> > @@ -204,7 +204,6 @@ private:\n> > \n> > \ttemplate\n> > \tfriend struct Accessor;\n> > -\tfriend class YamlParserContext;\n> > \n> > \tenum class Type {\n> > \t\tDictionary,\n> > diff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/yaml_parser.cpp\n> > index 7462e2d74179..fa1a487a13dc 100644\n> > --- a/src/libcamera/yaml_parser.cpp\n> > +++ b/src/libcamera/yaml_parser.cpp\n> > @@ -530,8 +530,8 @@ private:\n> > \n> > \tEventPtr nextEvent();\n> > \n> > -\tvoid readValue(std::string &value, EventPtr event);\n> > -\tint parseDictionaryOrList(YamlObject::Type type,\n> > +\tstd::string readValue(EventPtr event);\n> > +\tint parseDictionaryOrList(yaml_event_type_t endEventType,\n> > \t\t\t\t const std::function &parseItem);\n> > \tint parseNextYamlObject(YamlObject &yamlObject, EventPtr event);\n> > \n> > @@ -673,22 +673,22 @@ int YamlParserContext::parseContent(YamlObject &yamlObject)\n> > /**\n> > * \\fn YamlParserContext::readValue()\n> > * \\brief Parse event scalar and fill its content into a string\n> > - * \\param[in] value The string reference to fill value\n> > *\n> > * A helper function to parse a scalar event as string. The caller needs to\n> > - * guarantee the event is of scaler type.\n> > + * guarantee the event is of scalar type.\n> > + *\n> > + * \\return The scalar event value as a string\n> > */\n> > -void YamlParserContext::readValue(std::string &value, EventPtr event)\n> > +std::string YamlParserContext::readValue(EventPtr event)\n> > {\n> > -\tvalue.assign(reinterpret_cast(event->data.scalar.value),\n> > -\t\t event->data.scalar.length);\n> > +\treturn std::string{ reinterpret_cast(event->data.scalar.value),\n> > +\t\t\t event->data.scalar.length };\n> > }\n> > \n> > /**\n> > * \\fn YamlParserContext::parseDictionaryOrList()\n> > * \\brief A helper function to abstract the common part of parsing dictionary or list\n> > - *\n> > - * \\param[in] isDictionary True for parsing a dictionary, and false for a list\n> > + * \\param[in] endEventType The YAML end event type (sequence or mapping)\n> > * \\param[in] parseItem The callback to handle an item\n> > *\n> > * A helper function to abstract parsing an item from a dictionary or a list.\n> > @@ -703,13 +703,9 @@ void YamlParserContext::readValue(std::string &value, EventPtr event)\n> > * \\return 0 on success or a negative error code otherwise\n> > * \\retval -EINVAL The parser is failed to initialize\n> > */\n> > -int YamlParserContext::parseDictionaryOrList(YamlObject::Type type,\n> > +int YamlParserContext::parseDictionaryOrList(yaml_event_type_t endEventType,\n> > \t\t\t\t\t const std::function &parseItem)\n> > {\n> > -\tyaml_event_type_t endEventType = YAML_SEQUENCE_END_EVENT;\n> > -\tif (type == YamlObject::Type::Dictionary)\n> > -\t\tendEventType = YAML_MAPPING_END_EVENT;\n> > -\n> > \t/*\n> > \t * Add a safety counter to make sure we don't loop indefinitely in case\n> > \t * the YAML file is malformed.\n> > @@ -751,24 +747,19 @@ int YamlParserContext::parseNextYamlObject(YamlObject &yamlObject, EventPtr even\n> > \n> > \tswitch (event->type) {\n> > \tcase YAML_SCALAR_EVENT:\n> > -\t\tyamlObject.type_ = YamlObject::Type::Value;\n> > -\t\treadValue(yamlObject.value_, std::move(event));\n> > +\t\tyamlObject.set(readValue(std::move(event)));\n> > \t\treturn 0;\n> > \n> > \tcase YAML_SEQUENCE_START_EVENT: {\n> > -\t\tyamlObject.type_ = YamlObject::Type::List;\n> > -\t\tauto &list = yamlObject.list_;\n> > -\t\tauto handler = [this, &list](EventPtr evt) {\n> > -\t\t\tlist.emplace_back(std::string{}, std::make_unique());\n> > -\t\t\treturn parseNextYamlObject(*list.back().value, std::move(evt));\n> > +\t\tauto handler = [this, &yamlObject](EventPtr evt) {\n> > +\t\t\tYamlObject *child = yamlObject.add(std::make_unique());\n> > +\t\t\treturn parseNextYamlObject(*child, std::move(evt));\n> > \t\t};\n> > -\t\treturn parseDictionaryOrList(YamlObject::Type::List, handler);\n> > +\t\treturn parseDictionaryOrList(YAML_SEQUENCE_END_EVENT, handler);\n> > \t}\n> > \n> > \tcase YAML_MAPPING_START_EVENT: {\n> > -\t\tyamlObject.type_ = YamlObject::Type::Dictionary;\n> > -\t\tauto &list = yamlObject.list_;\n> > -\t\tauto handler = [this, &list](EventPtr evtKey) {\n> > +\t\tauto handler = [this, &yamlObject](EventPtr evtKey) {\n> > \t\t\t/* Parse key */\n> > \t\t\tif (evtKey->type != YAML_SCALAR_EVENT) {\n> > \t\t\t\tLOG(YamlParser, Error) << \"Expect key at line: \"\n> > @@ -778,26 +769,21 @@ int YamlParserContext::parseNextYamlObject(YamlObject &yamlObject, EventPtr even\n> > \t\t\t\treturn -EINVAL;\n> > \t\t\t}\n> > \n> > -\t\t\tstd::string key;\n> > -\t\t\treadValue(key, std::move(evtKey));\n> > +\t\t\tstd::string key = readValue(std::move(evtKey));\n> > \n> > \t\t\t/* Parse value */\n> > \t\t\tEventPtr evtValue = nextEvent();\n> > \t\t\tif (!evtValue)\n> > \t\t\t\treturn -EINVAL;\n> > \n> > -\t\t\tauto &elem = list.emplace_back(std::move(key),\n> > -\t\t\t\t\t\t std::make_unique());\n> > -\t\t\treturn parseNextYamlObject(*elem.value, std::move(evtValue));\n> > +\t\t\tYamlObject *child = yamlObject.add(std::move(key),\n> > +\t\t\t\t\t\t\t std::make_unique());\n> \n> I think the return value should be checked here and in the list case. Even if only with ASSERT().\n> A simple duplicate key will cause an issue here.\n\nI'll test that and add error checking.\n\n> > +\t\t\treturn parseNextYamlObject(*child, std::move(evtValue));\n> > \t\t};\n> > -\t\tint ret = parseDictionaryOrList(YamlObject::Type::Dictionary, handler);\n> > +\t\tint ret = parseDictionaryOrList(YAML_MAPPING_END_EVENT, handler);\n> > \t\tif (ret)\n> > \t\t\treturn ret;\n> > \n> > -\t\tauto &dictionary = yamlObject.dictionary_;\n> > -\t\tfor (const auto &elem : list)\n> > -\t\t\tdictionary.emplace(elem.key, elem.value.get());\n> > -\n> > \t\treturn 0;\n> > \t}\n> >","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 756CCBDCBF\n\tfor ;\n\tTue, 13 Jan 2026 14:05:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1D6CF61FBC;\n\tTue, 13 Jan 2026 15:05:25 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 587A361FA0\n\tfor ;\n\tTue, 13 Jan 2026 15:05:23 +0100 (CET)","from pendragon.ideasonboard.com (81-175-209-152.bb.dnainternet.fi\n\t[81.175.209.152])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 3D3B650A;\n\tTue, 13 Jan 2026 15:04:57 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"s1TFO3Ev\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1768313097;\n\tbh=dBHMxmUpjpaZrxLsDq5RBN3oJIs12AONkC0nNLgXmHw=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=s1TFO3EvpcPaGxLajUfIV7e6XpCNTnCCm9ANIENb8c8NUVC74u9Wzf+ovTagONWeq\n\tOlGBMo5cecuVQpgCmmnNX76wxATwA75PbFZREtilRbnIazYmQxX1ltnE+Ldyf4+9TJ\n\t+ROxJmwtZ/mWxTgi8S326ynR0SYAAlGvl27PggIQ=","Date":"Tue, 13 Jan 2026 16:05:02 +0200","From":"Laurent Pinchart ","To":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH 14/36] libcamera: yaml_parser: Un-friend\n\tYamlParserContext from YamlObject","Message-ID":"<20260113140502.GJ6198@pendragon.ideasonboard.com>","References":"<20260113000808.15395-1-laurent.pinchart@ideasonboard.com>\n\t\n\t<20260113000808.15395-15-laurent.pinchart@ideasonboard.com>\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]