[{"id":24199,"web_url":"https://patchwork.libcamera.org/comment/24199/","msgid":"","date":"2022-07-27T21:17:33","subject":"Re: [libcamera-devel] [PATCH v4 1/5] libcamera: yaml_parser: Add\n\tgetList() function","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Florian,\n\nOn Wed, Jul 27, 2022 at 10:40:48AM +0200, Florian Sylvestre wrote:\n> Allow to retrieve a YAML list of any already supported types in a std::vector.\n> \n> Signed-off-by: Florian Sylvestre \n> Reviewed-by: Laurent Pinchart \n> Reviewed-by: Paul Elder \n\nI've rebased this patch on top of \"[PATCH v7 01/14] libcamera:\nyaml_parser: Replace ok flag to get() with std::optional\". I'll send a\nv5 of your pending series rebased on top of that change.\n\n> ---\n> include/libcamera/internal/yaml_parser.h | 16 ++++++\n> src/libcamera/yaml_parser.cpp | 66 ++++++++++++++++++++++++\n> test/yaml-parser.cpp | 6 +++\n> 3 files changed, 88 insertions(+)\n> \n> diff --git a/include/libcamera/internal/yaml_parser.h b/include/libcamera/internal/yaml_parser.h\n> index 064cf443..39161bbb 100644\n> --- a/include/libcamera/internal/yaml_parser.h\n> +++ b/include/libcamera/internal/yaml_parser.h\n> @@ -167,6 +167,22 @@ public:\n> #endif\n> \tT get(const T &defaultValue, bool *ok = nullptr) const;\n> \n> +#ifndef __DOXYGEN__\n> +\ttemplate +\t\t typename std::enable_if_t<\n> +\t\t\t std::is_same_v ||\n> +\t\t\t std::is_same_v ||\n> +\t\t\t std::is_same_v ||\n> +\t\t\t std::is_same_v ||\n> +\t\t\t std::is_same_v ||\n> +\t\t\t std::is_same_v ||\n> +\t\t\t std::is_same_v ||\n> +\t\t\t std::is_same_v> * = nullptr>\n> +#else\n> +\ttemplate\n> +#endif\n> +\tstd::vector getList(bool *ok = nullptr) const;\n> +\n> \tDictAdapter asDict() const { return DictAdapter{ dictionary_ }; }\n> \tListAdapter asList() const { return ListAdapter{ list_ }; }\n> \n> diff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/yaml_parser.cpp\n> index 5c45e44e..125a348e 100644\n> --- a/src/libcamera/yaml_parser.cpp\n> +++ b/src/libcamera/yaml_parser.cpp\n> @@ -325,6 +325,72 @@ Size YamlObject::get(const Size &defaultValue, bool *ok) const\n> \n> #endif /* __DOXYGEN__ */\n> \n> +/**\n> + * \\fn template YamlObject::getList(bool *ok) const\n> + * \\brief Parse the YamlObject as a list of \\a T\n> + * \\param[out] ok The result of whether the parse succeeded\n> + *\n> + * This function parses the value of the YamlObject as a list of \\a T objects,\n> + * and returns the value as a \\a std::vector. If parsing fails \\a ok is set\n> + * to false and a default empty vector is returned. Otherwise, the\n> + * YamlObject list of values is returned, and \\a ok is set to true.\n> + *\n> + * The \\a ok pointer is optional and can be a nullptr if the caller doesn't\n> + * need to know if parsing succeeded.\n> + *\n> + * \\return Value as a std::vector type\n> + */\n> +\n> +#ifndef __DOXYGEN__\n> +\n> +template +\t typename std::enable_if_t<\n> +\t\t std::is_same_v ||\n> +\t\t std::is_same_v ||\n> +\t\t std::is_same_v ||\n> +\t\t std::is_same_v ||\n> +\t\t std::is_same_v ||\n> +\t\t std::is_same_v ||\n> +\t\t std::is_same_v ||\n> +\t\t std::is_same_v> *>\n> +std::vector YamlObject::getList(bool *ok) const\n> +{\n> +\tsetOk(ok, false);\n> +\n> +\tif (type_ != Type::List)\n> +\t\treturn {};\n> +\n> +\tstd::vector value;\n> +\tvalue.reserve(list_.size());\n> +\n> +\t/*\n> +\t * Provide somme dummy defaultValue to get() function and rely on the\n> +\t * ok variable to know if the parsing was correct.\n> +\t */\n> +\tT defaultValue{};\n> +\n> +\tfor (const YamlObject &entry : asList()) {\n> +\t\tbool result;\n> +\t\tvalue.emplace_back(entry.get(defaultValue, &result));\n> +\t\tif (!result)\n> +\t\t\treturn {};\n> +\t}\n> +\n> +\tsetOk(ok, true);\n> +\treturn value;\n> +}\n> +\n> +template std::vector YamlObject::getList(bool *ok) const;\n> +template std::vector YamlObject::getList(bool *ok) const;\n> +template std::vector YamlObject::getList(bool *ok) const;\n> +template std::vector YamlObject::getList(bool *ok) const;\n> +template std::vector YamlObject::getList(bool *ok) const;\n> +template std::vector YamlObject::getList(bool *ok) const;\n> +template std::vector YamlObject::getList(bool *ok) const;\n> +template std::vector YamlObject::getList(bool *ok) const;\n> +\n> +#endif /* __DOXYGEN__ */\n> +\n> /**\n> * \\fn YamlObject::asDict() const\n> * \\brief Wrap a dictionary YamlObject in an adapter that exposes iterators\n> diff --git a/test/yaml-parser.cpp b/test/yaml-parser.cpp\n> index 38f84823..bb96a11b 100644\n> --- a/test/yaml-parser.cpp\n> +++ b/test/yaml-parser.cpp\n> @@ -524,6 +524,12 @@ protected:\n> \t\t\treturn TestFail;\n> \t\t}\n> \n> +\t\tstd::vector values = firstElement.getList();\n> +\t\tif (values.size() != 2 || values[0] != 1 || values[1] != 2) {\n> +\t\t\tcerr << \"getList() failed to return correct vector\" << std::endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> \t\tauto &secondElement = level2Obj[1];\n> \t\tif (!secondElement.isDictionary() ||\n> \t\t !secondElement.contains(\"one\") ||","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 C46C5C3275\n\tfor ;\n\tWed, 27 Jul 2022 21:17:37 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4006763311;\n\tWed, 27 Jul 2022 23:17:37 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E7D0863309\n\tfor ;\n\tWed, 27 Jul 2022 23:17:35 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 30AFA56D;\n\tWed, 27 Jul 2022 23:17:35 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1658956657;\n\tbh=3qrItgIl0B4PVJ7BihzbatC+fYoXoqpT/2iQ3pExEHs=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=V+RpZMfr0U1MyWqjksA6EWJihdXhYueOmEcdc8NpGLSoYHHsscXhmdiOPvXbbnbUC\n\tdcWD/ufC+KUcAWYOHIKfuoKh9R+0XTN9IvKwUNjsnkB9CqLI/IXN858+/HBJyHbdL8\n\tZQZR506e2M60UIru624Ke2AM45g6q06cbYwo62b6F+B7TRStMlTQnVocDe7N4YjnAO\n\tlxS59nBTCj8yOmGrBKuVvjVusG9bwUXAq0sBFhy1in1sbD0jgeOZN+IG506GYiyI2S\n\txHmoewA6IKEo67VUKM+L+NKNq751KSA+5tGGbsTMnbVJL6TKH9dC1nT9Fokl52J8r+\n\tYmND2K8NCD2tA==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1658956655;\n\tbh=3qrItgIl0B4PVJ7BihzbatC+fYoXoqpT/2iQ3pExEHs=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=O7xLwCuZIeV9pra6B91wZ7NxV3PQ+kpK0BV0HJAi86be2KAHUfOd8LdosP1dNKXJK\n\tfE9RXmNUr4+w+wcVT2g6kIZUoddP8O2vo9S8qPBvFwN0al31yidiGYQ8ZrN4p4PMhl\n\tp735i8Ps4GqC6iQruM1UJ3WVyY7lrXxkbSrZPmX4="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"O7xLwCuZ\"; dkim-atps=neutral","Date":"Thu, 28 Jul 2022 00:17:33 +0300","To":"Florian Sylvestre ","Message-ID":"","References":"<20220727084052.590421-1-fsylvestre@baylibre.com>\n\t<20220727084052.590421-2-fsylvestre@baylibre.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20220727084052.590421-2-fsylvestre@baylibre.com>","Subject":"Re: [libcamera-devel] [PATCH v4 1/5] libcamera: yaml_parser: Add\n\tgetList() function","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","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]