optionpool: Use 'get_enum' for getting the option typebschubert/new-node-enum

This improves the consistency of our error reporting

1 files changed, 12 insertions, 7 deletions

diff --git a/src/buildstream/_options/optionpool.py b/src/buildstream/_options/optionpool.py
index d6b1b1614..4172d5fcd 100644
--- a/src/buildstream/_options/optionpool.py
+++ b/src/buildstream/_options/optionpool.py
@@ -22,6 +22,7 @@ import jinja2
 
 from .._exceptions import LoadError, LoadErrorReason
 from ..node import MappingNode, SequenceNode, _assert_symbol_name
+from ..types import FastEnum
 from .optionbool import OptionBool
 from .optionenum import OptionEnum
 from .optionflags import OptionFlags
@@ -40,6 +41,15 @@ _OPTION_TYPES = {
 }
 
 
+class OptionTypes(FastEnum):
+    OptionBool.OPTION_TYPE = OptionBool.OPTION_TYPE
+    OptionEnum.OPTION_TYPE = OptionEnum.OPTION_TYPE
+    OptionFlags.OPTION_TYPE = OptionFlags.OPTION_TYPE
+    OptionEltMask.OPTION_TYPE = OptionEltMask.OPTION_TYPE
+    OptionArch.OPTION_TYPE = OptionArch.OPTION_TYPE
+    OptionOS.OPTION_TYPE = OptionOS.OPTION_TYPE
+
+
 class OptionPool():
 
     def __init__(self, element_path):
@@ -80,13 +90,8 @@ class OptionPool():
             # Assert that the option name is a valid symbol
             _assert_symbol_name(option_name, "option name", ref_node=option_definition, allow_dashes=False)
 
-            opt_type_name = option_definition.get_str('type')
-            try:
-                opt_type = _OPTION_TYPES[opt_type_name]
-            except KeyError:
-                p = option_definition.get_scalar('type').get_provenance()
-                raise LoadError("{}: Invalid option type '{}'".format(p, opt_type_name),
-                                LoadErrorReason.INVALID_DATA)
+            opt_type_name = option_definition.get_enum('type', OptionTypes)
+            opt_type = _OPTION_TYPES[opt_type_name.value]
 
             option = opt_type(option_name, option_definition, self)
             self._options[option_name] = option