summaryrefslogtreecommitdiff
path: root/src/scripts
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2018-03-14 16:51:11 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2018-03-14 16:51:11 +0100
commit2d0a25c9953c28d8c4a8c7e1bcc9034bb565384a (patch)
treeb2e586797677e906168a21ae777bacea9bbce693 /src/scripts
parent425a4473792ca854c36a5b7eadf232f5521abe4f (diff)
eolian: refactor doc ref resolution API
Diffstat (limited to 'src/scripts')
-rw-r--r--src/scripts/elua/apps/docgen/doctree.lua7
-rw-r--r--src/scripts/elua/apps/docgen/writer.lua2
-rw-r--r--src/scripts/pyolian/eolian_lib.py6
3 files changed, 7 insertions, 8 deletions
diff --git a/src/scripts/elua/apps/docgen/doctree.lua b/src/scripts/elua/apps/docgen/doctree.lua
index 825ac7365e..bad0e68637 100644
--- a/src/scripts/elua/apps/docgen/doctree.lua
+++ b/src/scripts/elua/apps/docgen/doctree.lua
@@ -670,8 +670,7 @@ M.Type = Node:clone {
670 end, 670 end,
671 671
672 class_get = function(self) 672 class_get = function(self)
673 -- FIXME: unit 673 return self._obj:class_get()
674 return self._obj:class_get(eos:unit_get())
675 end, 674 end,
676 675
677 is_owned = function(self) 676 is_owned = function(self)
@@ -1347,9 +1346,9 @@ M.DocTokenizer = util.Object:clone {
1347 return self.tok:type_get() 1346 return self.tok:type_get()
1348 end, 1347 end,
1349 1348
1350 ref_get = function(self, root) 1349 ref_resolve = function(self, root)
1351 -- FIXME: unit 1350 -- FIXME: unit
1352 local tp, d1, d2 = self.tok:ref_get(eos:unit_get()) 1351 local tp, d1, d2 = self.tok:ref_resolve(eos:unit_get())
1353 local reft = eolian.doc_ref_type 1352 local reft = eolian.doc_ref_type
1354 local ret = {} 1353 local ret = {}
1355 if tp == reft.CLASS or tp == reft.FUNC or tp == reft.EVENT then 1354 if tp == reft.CLASS or tp == reft.FUNC or tp == reft.EVENT then
diff --git a/src/scripts/elua/apps/docgen/writer.lua b/src/scripts/elua/apps/docgen/writer.lua
index 92be2f1adf..2aeadf8da7 100644
--- a/src/scripts/elua/apps/docgen/writer.lua
+++ b/src/scripts/elua/apps/docgen/writer.lua
@@ -345,7 +345,7 @@ writers["dokuwiki"] = util.Object:clone {
345 hasraw = true 345 hasraw = true
346 end 346 end
347 if tp == tokp.REF then 347 if tp == tokp.REF then
348 local reft = tokp:ref_get(true) 348 local reft = tokp:ref_resolve(true)
349 local str = tokp:text_get() 349 local str = tokp:text_get()
350 if str:sub(1, 1) == "[" then 350 if str:sub(1, 1) == "[" then
351 str = str:sub(2, #str - 1) 351 str = str:sub(2, #str - 1)
diff --git a/src/scripts/pyolian/eolian_lib.py b/src/scripts/pyolian/eolian_lib.py
index 9fb0a33142..c16ef5ce5e 100644
--- a/src/scripts/pyolian/eolian_lib.py
+++ b/src/scripts/pyolian/eolian_lib.py
@@ -759,7 +759,7 @@ lib.eolian_doc_token_type_get.restype = c_int
759lib.eolian_doc_token_text_get.argtypes = [c_void_p,] 759lib.eolian_doc_token_text_get.argtypes = [c_void_p,]
760lib.eolian_doc_token_text_get.restype = c_void_p # char* TO BE FREED 760lib.eolian_doc_token_text_get.restype = c_void_p # char* TO BE FREED
761 761
762# EAPI Eolian_Object_Type eolian_doc_token_ref_get(const Eolian_Unit *unit, const Eolian_Doc_Token *tok, const Eolian_Object **data, const Eolian_Object **data2); 762# EAPI Eolian_Object_Type eolian_doc_token_ref_resolve(const Eolian_Doc_Token *tok, const Eolian_Unit *unit, const Eolian_Object **data, const Eolian_Object **data2);
763# lib.eolian_doc_token_ref_get.argtypes = [c_void_p, c_void_p, ???, ???] 763# lib.eolian_doc_token_ref_resolve.argtypes = [c_void_p, c_void_p, ???, ???]
764# lib.eolian_doc_token_ref_get.restype = c_int 764# lib.eolian_doc_token_ref_resolve.restype = c_int
765 765