summaryrefslogtreecommitdiff
path: root/src/scripts
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2018-04-18 16:34:49 +0200
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2018-04-18 16:38:14 +0200
commit543902f2ba13b69b052eb21a4a36324d96f5eeba (patch)
tree1e8319b39e6de8fd942ca7ecd2de28fe107067fb /src/scripts
parentd13cfe1b83f594238f199e590bfc50fa7fd8c945 (diff)
eolian: make doc ref resolution global
Doc refs no longer introduce new dependencies into files. Instead, they're parsed globally, and any doc ref lookup is also made globally. This allows unit based dependencies to correspond more to what files actually really need at compile time/runtime, with docs being irrelevant to that; it also simplifies the API. The doc resolution API now takes Eolian_State instead of Eolian_Unit, too.
Diffstat (limited to 'src/scripts')
-rw-r--r--src/scripts/elua/apps/docgen/doctree.lua2
-rw-r--r--src/scripts/pyolian/eolian_lib.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/scripts/elua/apps/docgen/doctree.lua b/src/scripts/elua/apps/docgen/doctree.lua
index f5657d5bfc..91f1bd1389 100644
--- a/src/scripts/elua/apps/docgen/doctree.lua
+++ b/src/scripts/elua/apps/docgen/doctree.lua
@@ -1348,7 +1348,7 @@ M.DocTokenizer = util.Object:clone {
1348 1348
1349 ref_resolve = function(self, root) 1349 ref_resolve = function(self, root)
1350 -- FIXME: unit 1350 -- FIXME: unit
1351 local tp, d1, d2 = self.tok:ref_resolve(eos:unit_get()) 1351 local tp, d1, d2 = self.tok:ref_resolve(eos)
1352 local reft = eolian.doc_ref_type 1352 local reft = eolian.doc_ref_type
1353 local ret = {} 1353 local ret = {}
1354 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/pyolian/eolian_lib.py b/src/scripts/pyolian/eolian_lib.py
index 285064265a..3cd7bad285 100644
--- a/src/scripts/pyolian/eolian_lib.py
+++ b/src/scripts/pyolian/eolian_lib.py
@@ -714,7 +714,7 @@ lib.eolian_doc_token_type_get.restype = c_int
714lib.eolian_doc_token_text_get.argtypes = (c_void_p,) 714lib.eolian_doc_token_text_get.argtypes = (c_void_p,)
715lib.eolian_doc_token_text_get.restype = c_void_p # char* TO BE FREED 715lib.eolian_doc_token_text_get.restype = c_void_p # char* TO BE FREED
716 716
717# 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); 717# EAPI Eolian_Object_Type eolian_doc_token_ref_resolve(const Eolian_Doc_Token *tok, const Eolian_State *state, const Eolian_Object **data, const Eolian_Object **data2);
718# lib.eolian_doc_token_ref_resolve.argtypes = (c_void_p, c_void_p, ???, ???) 718# lib.eolian_doc_token_ref_resolve.argtypes = (c_void_p, c_void_p, ???, ???)
719# lib.eolian_doc_token_ref_resolve.restype = c_int 719# lib.eolian_doc_token_ref_resolve.restype = c_int
720 720