summaryrefslogtreecommitdiff
path: root/src/scripts/pyolian
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2019-05-21 16:01:07 +0200
committerDaniel Kolesa <d.kolesa@samsung.com>2019-05-21 16:04:35 +0200
commit5ea0195661e88395ee3e7384db7acc3f03d52dc1 (patch)
tree395a85fe0bd2147a9d22311162fc5cd2d22384fd /src/scripts/pyolian
parent34ef9c313989402d523951b2c20c7141d3bdce78 (diff)
eolian: remove @nullable keyword
This was an experiment that never properly took off and was never used by any generator. Its use was highly variable, so it could not be relied upon. We will still want to reverse the current behavior eventually (no null by default), but that will be done with eo file versioning in the future. @feature
Diffstat (limited to 'src/scripts/pyolian')
-rw-r--r--src/scripts/pyolian/eolian.py6
-rw-r--r--src/scripts/pyolian/eolian_lib.py4
-rwxr-xr-xsrc/scripts/pyolian/test_eolian.py1
3 files changed, 1 insertions, 10 deletions
diff --git a/src/scripts/pyolian/eolian.py b/src/scripts/pyolian/eolian.py
index 4dce2e6d4b..bd92075565 100644
--- a/src/scripts/pyolian/eolian.py
+++ b/src/scripts/pyolian/eolian.py
@@ -963,7 +963,7 @@ class Function(Object):
963class Function_Parameter(Object): 963class Function_Parameter(Object):
964 def __repr__(self): 964 def __repr__(self):
965 return "<eolian.Function_Parameter '{0.name}', type={0.type}," \ 965 return "<eolian.Function_Parameter '{0.name}', type={0.type}," \
966 " optional={0.is_optional}, nullable={0.is_nullable}>".format(self) 966 " optional={0.is_optional}>".format(self)
967 967
968 @cached_property 968 @cached_property
969 def direction(self): 969 def direction(self):
@@ -979,10 +979,6 @@ class Function_Parameter(Object):
979 return bool(lib.eolian_parameter_is_nonull(self)) 979 return bool(lib.eolian_parameter_is_nonull(self))
980 980
981 @cached_property 981 @cached_property
982 def is_nullable(self):
983 return bool(lib.eolian_parameter_is_nullable(self))
984
985 @cached_property
986 def is_optional(self): 982 def is_optional(self):
987 return bool(lib.eolian_parameter_is_optional(self)) 983 return bool(lib.eolian_parameter_is_optional(self))
988 984
diff --git a/src/scripts/pyolian/eolian_lib.py b/src/scripts/pyolian/eolian_lib.py
index 622486ebdf..4fe2dc54fb 100644
--- a/src/scripts/pyolian/eolian_lib.py
+++ b/src/scripts/pyolian/eolian_lib.py
@@ -403,10 +403,6 @@ lib.eolian_parameter_documentation_get.restype = c_void_p
403lib.eolian_parameter_is_nonull.argtypes = (c_void_p,) 403lib.eolian_parameter_is_nonull.argtypes = (c_void_p,)
404lib.eolian_parameter_is_nonull.restype = c_bool 404lib.eolian_parameter_is_nonull.restype = c_bool
405 405
406# EAPI Eina_Bool eolian_parameter_is_nullable(const Eolian_Function_Parameter *param_desc);
407lib.eolian_parameter_is_nullable.argtypes = (c_void_p,)
408lib.eolian_parameter_is_nullable.restype = c_bool
409
410# EAPI Eina_Bool eolian_parameter_is_optional(const Eolian_Function_Parameter *param_desc); 406# EAPI Eina_Bool eolian_parameter_is_optional(const Eolian_Function_Parameter *param_desc);
411lib.eolian_parameter_is_optional.argtypes = (c_void_p,) 407lib.eolian_parameter_is_optional.argtypes = (c_void_p,)
412lib.eolian_parameter_is_optional.restype = c_bool 408lib.eolian_parameter_is_optional.restype = c_bool
diff --git a/src/scripts/pyolian/test_eolian.py b/src/scripts/pyolian/test_eolian.py
index 3695330cc6..2a59349386 100755
--- a/src/scripts/pyolian/test_eolian.py
+++ b/src/scripts/pyolian/test_eolian.py
@@ -381,7 +381,6 @@ class TestEolianFunction(unittest.TestCase):
381 self.assertEqual(p.name, 'add') 381 self.assertEqual(p.name, 'add')
382 self.assertIsNone(p.default_value) 382 self.assertIsNone(p.default_value)
383 self.assertFalse(p.is_nonull) # TODO is correct ?? 'add' can be null? 383 self.assertFalse(p.is_nonull) # TODO is correct ?? 'add' can be null?
384 self.assertFalse(p.is_nullable)
385 self.assertFalse(p.is_optional) 384 self.assertFalse(p.is_optional)
386 self.assertEqual(p.type.name, 'double') 385 self.assertEqual(p.type.name, 'double')
387 self.assertIsInstance(p.documentation, eolian.Documentation) 386 self.assertIsInstance(p.documentation, eolian.Documentation)