Skip to content

Assortment of fixes - particularly for reading saved cctree.out #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qais-yousef wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Assortment of fixes - particularly for reading saved cctree.out #17

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2413a65
Fix issue with loading file from disk
qais-yousef Jan 28, 2023
98b0f78
Fix sorting of sym_ids
qais-yousef Jan 28, 2023
78fd72a
Fix errors when "Failed to locate" a symId
qais-yousef Jan 29, 2023
46ce8c4
Fix mPruneTree()
qais-yousef Jan 29, 2023
f3ce676
Get off by 1 errors when growing/building a tree
qais-yousef Jan 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 26 additions & 17 deletions plugin/cctree.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1533,7 +1533,7 @@ function! s:GenericDbSerializer.mWriteSymsToFile(dstVFile,
\ "items")
call a:gWriter.mInitWriting()
" write syms
for asymid in sort(self.xrefdb.mGetSymbolIds())
for asymid in sort(self.xrefdb.mGetSymbolIds(), 'N')
let acctreesym = self.xrefdb.mGetSymbolFromId(asymid)
call a:dstVFile.mWriteLine(a:gWriter.mBuildTagLine(acctreesym,
\ asymid))
Expand Down Expand Up @@ -1566,7 +1566,7 @@ endfunction
function! s:CCTreeTagDbWriter.mBuildHeader() dict
let hdr = []
call add(hdr, "!_TAG_FILE_FORMAT\t2\t/extended format; --format=1 will not append ;\" to lines/")
call add(hdr, "!_TAG_FILE_SORTED\t1\t/0=unsorted, 1=sorted, 2=foldcase/")
call add(hdr, "!_TAG_FILE_SORTED\t0\t/0=unsorted, 1=sorted, 2=foldcase/")
call add(hdr, "!_TAG_PROGRAM_NAME\t\tCCTree (Vim plugin)//")
call add(hdr, "!_TAG_PROGRAM_URL\thttp://vim.sourceforge.net/scripts/script.php?script_id=2368\t/site/")
return hdr
Expand Down Expand Up @@ -1812,31 +1812,38 @@ endfunction

function! s:XRefTracer.mGetSymbolIdXRef(symid, direction) dict
let acctreesym = self.xrefdb.mGetSymbolFromId(a:symid)
if empty(acctreesym)
return []
endif
let symidslist = split(
\s:CCTreeMakeCommaListUnique(acctreesym[a:direction]), ",")
return symidslist
endfunction

function! s:XRefTracer.mGrowTree(rtree,
function! s:XRefTracer.mGrowTree(rtree, curdepth, maxdepth,
\ direction, pbar) dict
if !has_key(a:rtree, 'childlinks')
call self.mBuildTree(a:rtree, 1, 1,
call self.mBuildTree(a:rtree, 0, 1,
\ a:direction, a:pbar)
else
for entry in a:rtree['childlinks']
call self.mGrowTree(entry,
call self.mGrowTree(entry, a:curdepth+1, a:maxdepth,
\ a:direction, a:pbar)
endfor
endif
endfunction

function! s:XRefTracer.mPruneTree(rtree,
function! s:XRefTracer.mPruneTree(rtree, curdepth, maxdepth,
\ direction, pbar) dict
if !has_key(a:rtree, 'childlinks')
return -1
if a:curdepth > a:maxdepth
return -1
else
return 0
endif
else
for entry in a:rtree['childlinks']
if (self.mPruneTree(entry,
if (self.mPruneTree(entry, a:curdepth+1, a:maxdepth,
\ a:direction, a:pbar) == -1)
call remove(a:rtree['childlinks'], 0)
endif
Expand All @@ -1850,7 +1857,7 @@ endfunction

function! s:XRefTracer.mBuildTree(rtree, curdepth, maxdepth,
\ direction, pbar) dict
if (a:curdepth > a:maxdepth)
if (a:curdepth >= a:maxdepth)
return {}
endif

Expand All @@ -1859,10 +1866,12 @@ function! s:XRefTracer.mBuildTree(rtree, curdepth, maxdepth,
for entry in self.mGetSymbolIdXRef(a:rtree.symid, a:direction)
call a:pbar.mTick(1)
let symname = self.xrefdb.mGetSymbolFromId(entry)
let ctree = s:CallTreeNode.mCreate(symname['n'], entry)
call self.mBuildTree(ctree, a:curdepth+1, a:maxdepth,
\a:direction, a:pbar)
call s:CallTreeUtils.mAddChildLink(a:rtree, ctree)
if !empty(symname)
let ctree = s:CallTreeNode.mCreate(symname['n'], entry)
call self.mBuildTree(ctree, a:curdepth+1, a:maxdepth,
\a:direction, a:pbar)
call s:CallTreeUtils.mAddChildLink(a:rtree, ctree)
endif
endfor
endfunction

Expand Down Expand Up @@ -3137,10 +3146,10 @@ function! s:CCTreeGlobals.mGetCallsForTreeNode(rtree, action, depth, direction)
call xtracer.mBuildTree(a:rtree, 0, a:depth,
\ a:direction, pbar)
elseif a:action == 'expand'
call xtracer.mGrowTree(a:rtree,
call xtracer.mGrowTree(a:rtree, 0, a:depth,
\ a:direction, pbar)
elseif a:action == 'prune'
call xtracer.mPruneTree(a:rtree,
call xtracer.mPruneTree(a:rtree, 0, a:depth,
\ a:direction, pbar)
endif
call xtracer.mDoneTracing()
Expand Down Expand Up @@ -3210,7 +3219,7 @@ endfunction

function! s:CCTreeGlobals.mRecursiveDepthModify(action) dict
call self.mGetCallsForTreeNode(self.PreviewState.rootNode,
\ a:action, 1, self.PreviewState.direction)
\ a:action, self.PreviewState.depth, self.PreviewState.direction)
call self.Window.mDisplayTree(self.PreviewState.rootNode,
\ self.PreviewState.direction)
endfunction
Expand Down Expand Up @@ -3277,7 +3286,7 @@ function! s:CCTreeGlobals.mWriteXRefDbToFile(fname) dict
" create db serializer and writer
let gDbSz = s:GenericDbSerializer.mCreate(self.XRefDb)
let gDbWriter = s:CCTreeTagDbWriter.mCreate(
\ s:CCTreeGetXRefDbMaps('Compress', 'Alpha'))
\ s:CCTreeGetXRefDbMaps('Uncompress', 'Numeric'))
call gDbSz.mWriteXRefDbToFile(a:fname, gDbWriter)
endfunction

Expand Down