summaryrefslogtreecommitdiff
path: root/src/scripts
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
parentedda05e4d0779f7c16d0995bab082cb7ad793e1b (diff)
eolian: return Eolian_Object_Type from ref resolver
This needs only one enum and allows for better interop.
Diffstat (limited to 'src/scripts')
-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):
234 MARK_TODO = 6 234 MARK_TODO = 6
235 MARKUP_MONOSPACE = 7 235 MARKUP_MONOSPACE = 7
236 236
237class Eolian_Doc_Ref_Type(IntEnum):
238 INVALID = 0
239 CLASS = 1
240 FUNC = 2
241 EVENT = 3
242 ALIAS = 4
243 STRUCT = 5
244 STRUCT_FIELD = 6
245 ENUM = 7
246 ENUM_FIELD = 8
247 VAR = 9
248
249 237
250### internal Classes ######################################################## 238### internal Classes ########################################################
251 239
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
831lib.eolian_doc_token_text_get.argtypes = [c_void_p,] 831lib.eolian_doc_token_text_get.argtypes = [c_void_p,]
832lib.eolian_doc_token_text_get.restype = c_void_p # char* TO BE FREED 832lib.eolian_doc_token_text_get.restype = c_void_p # char* TO BE FREED
833 833
834# 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); 834# EAPI Eolian_Object_Type eolian_doc_token_ref_get(const Eolian_Unit *unit, const Eolian_Doc_Token *tok, const void **data, const void **data2);
835# lib.eolian_doc_token_ref_get.argtypes = [c_void_p, c_void_p, ???, ???] 835# lib.eolian_doc_token_ref_get.argtypes = [c_void_p, c_void_p, ???, ???]
836# lib.eolian_doc_token_ref_get.restype = c_int 836# lib.eolian_doc_token_ref_get.restype = c_int
837 837
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):
129 'Documentation': eolian.Documentation, 129 'Documentation': eolian.Documentation,
130 'Documentation_Token': eolian.Documentation_Token, 130 'Documentation_Token': eolian.Documentation_Token,
131 # Eolian Enums 131 # Eolian Enums
132 'Eolian_Object_Type': eolian.Eolian_Object_Type,
132 'Eolian_Function_Type': eolian.Eolian_Function_Type, 133 'Eolian_Function_Type': eolian.Eolian_Function_Type,
133 'Eolian_Parameter_Dir': eolian.Eolian_Parameter_Dir, 134 'Eolian_Parameter_Dir': eolian.Eolian_Parameter_Dir,
134 'Eolian_Class_Type': eolian.Eolian_Class_Type, 135 'Eolian_Class_Type': eolian.Eolian_Class_Type,
@@ -142,9 +143,7 @@ class Template(pyratemp.Template):
142 'Eolian_Variable_Type': eolian.Eolian_Variable_Type, 143 'Eolian_Variable_Type': eolian.Eolian_Variable_Type,
143 'Eolian_Binary_Operator': eolian.Eolian_Binary_Operator, 144 'Eolian_Binary_Operator': eolian.Eolian_Binary_Operator,
144 'Eolian_Unary_Operator': eolian.Eolian_Unary_Operator, 145 'Eolian_Unary_Operator': eolian.Eolian_Unary_Operator,
145 'Eolian_Declaration_Type': eolian.Eolian_Declaration_Type,
146 'Eolian_Doc_Token_Type': eolian.Eolian_Doc_Token_Type, 146 'Eolian_Doc_Token_Type': eolian.Eolian_Doc_Token_Type,
147 'Eolian_Doc_Ref_Type': eolian.Eolian_Doc_Ref_Type,
148 }) 147 })
149 148
150 # Call the parent __init__ func 149 # Call the parent __init__ func