aboutsummaryrefslogtreecommitdiffstats
path: root/src/scripts/pyolian
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2018-03-09 15:19:53 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2018-03-09 15:25:36 +0100
commitc7fd43ad4ed8d4a8067326ff727fa69681bd9101 (patch)
treedf2276a72adc5c2a9b2649d849b2f5a2233e843e /src/scripts/pyolian
parentecore: do not remove a timer that has already been removed. (diff)
downloadefl-c7fd43ad4ed8d4a8067326ff727fa69681bd9101.tar.gz
eolian: return Eolian_Object_Type from ref resolver
This needs only one enum and allows for better interop.
Diffstat (limited to 'src/scripts/pyolian')
-rw-r--r--src/scripts/pyolian/eolian.py12
-rw-r--r--src/scripts/pyolian/eolian_lib.py2
-rwxr-xr-xsrc/scripts/pyolian/generator.py3
3 files changed, 2 insertions, 15 deletions
diff --git a/src/scripts/pyolian/eolian.py b/src/scripts/pyolian/eolian.py
index e3ce9d68e2..998006b54f 100644
--- a/src/scripts/pyolian/eolian.py
+++ b/src/scripts/pyolian/eolian.py
@@ -234,18 +234,6 @@ class Eolian_Doc_Token_Type(IntEnum):
MARK_TODO = 6
MARKUP_MONOSPACE = 7
-class Eolian_Doc_Ref_Type(IntEnum):
- INVALID = 0
- CLASS = 1
- FUNC = 2
- EVENT = 3
- ALIAS = 4
- STRUCT = 5
- STRUCT_FIELD = 6
- ENUM = 7
- ENUM_FIELD = 8
- VAR = 9
-
### internal Classes ########################################################
diff --git a/src/scripts/pyolian/eolian_lib.py b/src/scripts/pyolian/eolian_lib.py
index e226bc1763..30d124fc05 100644
--- a/src/scripts/pyolian/eolian_lib.py
+++ b/src/scripts/pyolian/eolian_lib.py
@@ -831,7 +831,7 @@ lib.eolian_doc_token_type_get.restype = c_int
lib.eolian_doc_token_text_get.argtypes = [c_void_p,]
lib.eolian_doc_token_text_get.restype = c_void_p # char* TO BE FREED
-# EAPI Eolian_Doc_Ref_Type eolian_doc_token_ref_get(const Eolian_Unit *unit, const Eolian_Doc_Token *tok, const void **data, const void **data2);
+# EAPI Eolian_Object_Type eolian_doc_token_ref_get(const Eolian_Unit *unit, const Eolian_Doc_Token *tok, const void **data, const void **data2);
# lib.eolian_doc_token_ref_get.argtypes = [c_void_p, c_void_p, ???, ???]
# lib.eolian_doc_token_ref_get.restype = c_int
diff --git a/src/scripts/pyolian/generator.py b/src/scripts/pyolian/generator.py
index 067d7b52c6..64e6abe5ce 100755
--- a/src/scripts/pyolian/generator.py
+++ b/src/scripts/pyolian/generator.py
@@ -129,6 +129,7 @@ class Template(pyratemp.Template):
'Documentation': eolian.Documentation,
'Documentation_Token': eolian.Documentation_Token,
# Eolian Enums
+ 'Eolian_Object_Type': eolian.Eolian_Object_Type,
'Eolian_Function_Type': eolian.Eolian_Function_Type,
'Eolian_Parameter_Dir': eolian.Eolian_Parameter_Dir,
'Eolian_Class_Type': eolian.Eolian_Class_Type,
@@ -142,9 +143,7 @@ class Template(pyratemp.Template):
'Eolian_Variable_Type': eolian.Eolian_Variable_Type,
'Eolian_Binary_Operator': eolian.Eolian_Binary_Operator,
'Eolian_Unary_Operator': eolian.Eolian_Unary_Operator,
- 'Eolian_Declaration_Type': eolian.Eolian_Declaration_Type,
'Eolian_Doc_Token_Type': eolian.Eolian_Doc_Token_Type,
- 'Eolian_Doc_Ref_Type': eolian.Eolian_Doc_Ref_Type,
})
# Call the parent __init__ func