[{"id":23388,"web_url":"https://patchwork.libcamera.org/comment/23388/","msgid":"<20220613041112.GC2369877@pyrite.rasen.tech>","date":"2022-06-13T04:11:12","subject":"Re: [libcamera-devel] [RFC PATCH v2 01/14] libcamera: yaml_object:\n\tTurn Type into an enum class","submitter":{"id":97,"url":"https://patchwork.libcamera.org/api/people/97/","name":"Nicolas Dufresne via libcamera-devel","email":"libcamera-devel@lists.libcamera.org"},"content":"Hi Laurent,\n\nOn Sat, Jun 04, 2022 at 09:59:26PM +0300, Laurent Pinchart via libcamera-devel wrote:\n> Turn the Type enum into an enum class to force qualifying 'List' and\n> 'Dictionary' in the YamlObject namespace scope. This will help avoiding\n> ambiguities when adding iterator support.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Paul Elder \n\n> ---\n> include/libcamera/internal/yaml_parser.h | 8 +++---\n> src/libcamera/yaml_parser.cpp | 32 ++++++++++++------------\n> 2 files changed, 20 insertions(+), 20 deletions(-)\n> \n> diff --git a/include/libcamera/internal/yaml_parser.h b/include/libcamera/internal/yaml_parser.h\n> index 3a4f3052fb65..e002fcf59278 100644\n> --- a/include/libcamera/internal/yaml_parser.h\n> +++ b/include/libcamera/internal/yaml_parser.h\n> @@ -28,15 +28,15 @@ public:\n> \n> \tbool isValue() const\n> \t{\n> -\t\treturn type_ == Value;\n> +\t\treturn type_ == Type::Value;\n> \t}\n> \tbool isList() const\n> \t{\n> -\t\treturn type_ == List;\n> +\t\treturn type_ == Type::List;\n> \t}\n> \tbool isDictionary() const\n> \t{\n> -\t\treturn type_ == Dictionary;\n> +\t\treturn type_ == Type::Dictionary;\n> \t}\n> \n> #ifndef __DOXYGEN__\n> @@ -65,7 +65,7 @@ private:\n> \n> \tfriend class YamlParserContext;\n> \n> -\tenum Type {\n> +\tenum class Type {\n> \t\tDictionary,\n> \t\tList,\n> \t\tValue,\n> diff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/yaml_parser.cpp\n> index 92fedaebebfd..4b5ea427bf45 100644\n> --- a/src/libcamera/yaml_parser.cpp\n> +++ b/src/libcamera/yaml_parser.cpp\n> @@ -47,7 +47,7 @@ void setOk(bool *ok, bool result)\n> */\n> \n> YamlObject::YamlObject()\n> -\t: type_(Value)\n> +\t: type_(Type::Value)\n> {\n> }\n> \n> @@ -99,7 +99,7 @@ bool YamlObject::get(const bool &defaultValue, bool *ok) const\n> {\n> \tsetOk(ok, false);\n> \n> -\tif (type_ != Value)\n> +\tif (type_ != Type::Value)\n> \t\treturn defaultValue;\n> \n> \tif (value_ == \"true\") {\n> @@ -118,7 +118,7 @@ int32_t YamlObject::get(const int32_t &defaultValue, bool *ok) const\n> {\n> \tsetOk(ok, false);\n> \n> -\tif (type_ != Value)\n> +\tif (type_ != Type::Value)\n> \t\treturn defaultValue;\n> \n> \tif (value_ == \"\")\n> @@ -141,7 +141,7 @@ uint32_t YamlObject::get(const uint32_t &defaultValue, bool *ok) const\n> {\n> \tsetOk(ok, false);\n> \n> -\tif (type_ != Value)\n> +\tif (type_ != Type::Value)\n> \t\treturn defaultValue;\n> \n> \tif (value_ == \"\")\n> @@ -175,7 +175,7 @@ double YamlObject::get(const double &defaultValue, bool *ok) const\n> {\n> \tsetOk(ok, false);\n> \n> -\tif (type_ != Value)\n> +\tif (type_ != Type::Value)\n> \t\treturn defaultValue;\n> \n> \tif (value_ == \"\")\n> @@ -198,7 +198,7 @@ std::string YamlObject::get(const std::string &defaultValue, bool *ok) const\n> {\n> \tsetOk(ok, false);\n> \n> -\tif (type_ != Value)\n> +\tif (type_ != Type::Value)\n> \t\treturn defaultValue;\n> \n> \tsetOk(ok, true);\n> @@ -210,7 +210,7 @@ Size YamlObject::get(const Size &defaultValue, bool *ok) const\n> {\n> \tsetOk(ok, false);\n> \n> -\tif (type_ != List)\n> +\tif (type_ != Type::List)\n> \t\treturn defaultValue;\n> \n> \tif (list_.size() != 2)\n> @@ -248,7 +248,7 @@ Size YamlObject::get(const Size &defaultValue, bool *ok) const\n> */\n> std::size_t YamlObject::size() const\n> {\n> -\tif (type_ != List)\n> +\tif (type_ != Type::List)\n> \t\treturn 0;\n> \n> \treturn list_.size();\n> @@ -266,7 +266,7 @@ std::size_t YamlObject::size() const\n> */\n> const YamlObject &YamlObject::operator[](std::size_t index) const\n> {\n> -\tif (type_ != List || index >= size())\n> +\tif (type_ != Type::List || index >= size())\n> \t\treturn empty;\n> \n> \treturn *list_[index];\n> @@ -326,7 +326,7 @@ std::vector YamlObject::memberNames() const\n> */\n> const YamlObject &YamlObject::operator[](const std::string &key) const\n> {\n> -\tif (type_ != Dictionary || !contains(key))\n> +\tif (type_ != Type::Dictionary || !contains(key))\n> \t\treturn empty;\n> \n> \tauto iter = dictionary_.find(key);\n> @@ -510,7 +510,7 @@ int YamlParserContext::parseDictionaryOrList(YamlObject::Type type,\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::Dictionary)\n> +\tif (type == YamlObject::Type::Dictionary)\n> \t\tendEventType = YAML_MAPPING_END_EVENT;\n> \n> \t/*\n> @@ -554,22 +554,22 @@ int YamlParserContext::parseNextYamlObject(YamlObject &yamlObject, EventPtr even\n> \n> \tswitch (event->type) {\n> \tcase YAML_SCALAR_EVENT:\n> -\t\tyamlObject.type_ = YamlObject::Value;\n> +\t\tyamlObject.type_ = YamlObject::Type::Value;\n> \t\treadValue(yamlObject.value_, std::move(event));\n> \t\treturn 0;\n> \n> \tcase YAML_SEQUENCE_START_EVENT: {\n> -\t\tyamlObject.type_ = YamlObject::List;\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(new YamlObject());\n> \t\t\treturn parseNextYamlObject(*list.back(), std::move(evt));\n> \t\t};\n> -\t\treturn parseDictionaryOrList(YamlObject::List, handler);\n> +\t\treturn parseDictionaryOrList(YamlObject::Type::List, handler);\n> \t}\n> \n> \tcase YAML_MAPPING_START_EVENT: {\n> -\t\tyamlObject.type_ = YamlObject::Dictionary;\n> +\t\tyamlObject.type_ = YamlObject::Type::Dictionary;\n> \t\tauto &dictionary = yamlObject.dictionary_;\n> \t\tauto handler = [this, &dictionary](EventPtr evtKey) {\n> \t\t\t/* Parse key */\n> @@ -592,7 +592,7 @@ int YamlParserContext::parseNextYamlObject(YamlObject &yamlObject, EventPtr even\n> \t\t\tauto elem = dictionary.emplace(key, std::make_unique());\n> \t\t\treturn parseNextYamlObject(*elem.first->second.get(), std::move(evtValue));\n> \t\t};\n> -\t\treturn parseDictionaryOrList(YamlObject::Dictionary, handler);\n> +\t\treturn parseDictionaryOrList(YamlObject::Type::Dictionary, handler);\n> \t}\n> \n> \tdefault:\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 79860BD161\n\tfor ;\n\tMon, 13 Jun 2022 04:11:24 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9EF8965635;\n\tMon, 13 Jun 2022 06:11:23 +0200 (CEST)","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 0E7EA600F0\n\tfor ;\n\tMon, 13 Jun 2022 06:11:22 +0200 (CEST)","from pyrite.rasen.tech (softbank036240126034.bbtec.net\n\t[36.240.126.34])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 765FE440;\n\tMon, 13 Jun 2022 06:11:20 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1655093483;\n\tbh=gE+jczuqsaZ4vi/TX8OSSRrLquqEyN3R8I+SarIMkmg=;\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=kLbc7XjdK4i6qijzztuSk8OSaArh8Ldr3OnbGeV9+M9m/v9Ypf8IRIxbeYHnbNrsx\n\tTHh9jGWAiVAnAdMqp+AmJAoZD+2+JoydsFT4zGggoCJudlpNg05j50gcmb5cpdLeA/\n\tvSrFehfPBHvLgxYKCcULxo7j/8QKhfFdchKOpZdE3x35k/mM3BM/g/YLAj4oDolU9s\n\tEBcUpzDBZifpSPU4Rc02kuHuqvzpm4DPtwcYYCNrh2w+70Qyhb3cAgzwrsebwvdfri\n\tPB8SasLMUM3J9+dzRrzd9CrkGjaCjoZK3GTCVR7d5WLMRlySCBASxRJkAm1M2gAOkk\n\tyjKe9PqWV7zEQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1655093481;\n\tbh=gE+jczuqsaZ4vi/TX8OSSRrLquqEyN3R8I+SarIMkmg=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=eBjRr0M0D1JhR41d7sLO5yue4L5gLKYIQWcTyoY5FATBd/1wf2dJ5KwfDyKWN0eKe\n\t71NqQTUEUA+eqYSEJdibXcuDTPLXbu4gNCEUdzQk7/yaNuvvlzUIQPShORLWbigobq\n\tvACXicG9BUBuPKA5/hLBezUbvxDmTrUQrrHY4Fkk="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"eBjRr0M0\"; dkim-atps=neutral","Date":"Mon, 13 Jun 2022 13:11:12 +0900","To":"Laurent Pinchart ","Message-ID":"<20220613041112.GC2369877@pyrite.rasen.tech>","References":"<20220604185939.29163-1-laurent.pinchart@ideasonboard.com>\n\t<20220604185939.29163-2-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20220604185939.29163-2-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [RFC PATCH v2 01/14] libcamera: yaml_object:\n\tTurn Type into an enum class","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":"Paul Elder via libcamera-devel ","Reply-To":"paul.elder@ideasonboard.com","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]