8814 Commits

Author SHA1 Message Date
Jiří Techet
73be5c644d lregex: add new flag processing
For 'b', 'e', 'i' keep the corresponding GRegex flags.
2016-10-12 22:39:24 +02:00
Jiří Techet
56936a8614 lregex: some harmless syncs 2016-10-12 17:55:59 +02:00
Jiří Techet
112f136a0a lregex: introduce findRegexTagsMainloop()
Does the same thing like the previous code.
2016-10-12 17:38:48 +02:00
Jiří Techet
ca19e6e3b3 lregex: sync some function prototypes 2016-10-12 17:32:01 +02:00
Jiří Techet
017e1be502 lregex: Add missing fields to regexPattern 2016-10-12 17:13:32 +02:00
Jiří Techet
501ebe94d5 lregex: Initialize lregex structures the universal-ctags way
I didn't check in detail what the changes are but since no GRegex code is
involved and since everything seems to work after the patch, I think it's OK.
2016-10-12 17:09:19 +02:00
Jiří Techet
8c4c570eb6 lregex: remove unused functions
So it's easier to sync them by simply getting the uctags versions.
2016-10-12 13:26:45 +02:00
Jiří Techet
380a662a25 lregex: some simple syncs 2016-10-12 13:26:45 +02:00
Jiří Techet
ca1622412f lregex: replace regexBroken with regexAvailable 2016-10-12 13:26:39 +02:00
Jiří Techet
59d6375b09 lregex: sync includes 2016-10-12 11:48:57 +02:00
Jiří Techet
b6ca38712f parse: other small syncs 2016-10-11 23:40:20 +02:00
Jiří Techet
051b780745 parse: some simple syncs and include syncs
Addition of dependency.c/h and promise.c/h. Also moved tagEntryFunction
definitions to geany.c/h.
2016-10-11 23:04:13 +02:00
Jiří Techet
2f83d0d164 parse: remove things unused by Geany for simpler merge 2016-10-11 17:30:06 +02:00
Jiří Techet
8436b975ed read: add the remaining stuff from uctags 2016-10-11 17:15:34 +02:00
Jiří Techet
53f83e7cee read: add lineFposMap 2016-10-11 17:09:54 +02:00
Jiří Techet
ed03c2042d read: introduce langStack for source files 2016-10-11 17:05:56 +02:00
Jiří Techet
f89e9f8014 read: Add function to initialize common parts of input/source files and use it
Also correct input/source file usage in the file and initialize everything
like in universal-ctags.
2016-10-11 16:59:10 +02:00
Jiří Techet
aafb127024 read: implement openBuffer() using openInputFile()
In addition, add automatic memory MIO opening to read.c for small files
and remove the same optimization from Geany. Simplify tm_ctags_parse()
as the memory/file branches are identical now.
2016-10-11 12:26:51 +02:00
Jiří Techet
2f4d43ac93 read: Some function renaming 2016-10-11 00:45:15 +02:00
Jiří Techet
dac3afbbfa read: use makeFileTag() 2016-10-11 00:24:33 +02:00
Jiří Techet
eecfff0da7 read: Add some extra data structures 2016-10-11 00:22:48 +02:00
Jiří Techet
c1acde7eff read: move sInputFileInfo, sInputFile and File to read.c 2016-10-11 00:13:25 +02:00
Jiří Techet
63fbe2f6a2 c.c, lcpp.c: Avoid using File.mio
In uctags File is made private and mio gets inaccessible. At the moment
it's used by c.c and lcpp.c to get the parameter list. The C parser
"marks" the position where the argument list starts and once the right
")" is reached, string corresponding to this range is read from MIO,
filtered and used for parameter list.

For macro parameters the end of parameter list is handled in a slightly
obfuscated way - since the code from read.c reads the code by lines,
getInputFilePosition() returns the position of EOL so the parameter list
is read between '(' and EOL.

The code had to be modified to collect the potential parameter string
on the way - vString *signature has been added to lcpp.c and every
getcFromInputFile() and ungetcToInputFile() has been converted to
getcAndCollect() and ungetcAndCollect(), respectively, which in addition
perform the parameter collection when needed. Unfortunately this involves
many places in lcpp.c and we must be careful to always use these instead
of the standard ones from read.c.

We cannot rely on the implicit reading of whole lines and must add such
a code ourselves: just plain reading and collecting is enough. In addition
I added handling of multi-line signatures which was missing before.

In tests "bug1585745.cpp" and "cpp_destructor.cpp" the new code fixes
missing () in destructors when there's a space between tilde and name.
In "simple.d" test it fixes wrong function prototype.

The output of test "bug507864.c" seems to be worse than before but it was
already broken before and apparently the compiler is confused by it.
2016-10-11 00:03:18 +02:00
Jiří Techet
b36c5c54ed read: change macros into functions and move them into c
Still with commented-out code at some places and using "source" instead
of "input".

Also syncs includes and some minor stuff.
2016-10-09 22:58:59 +02:00
Jiří Techet
8e804b3145 entry: Add the remaining code from uctags
Also enable compilation of forgotten kind.c
2016-10-09 19:58:24 +02:00
Jiří Techet
00920360da entry: Sync initTagEntry() code
For now use "source" instead of "input" for various functions inside
read.c which we need as we don't initialize "input" yet.
2016-10-09 16:49:13 +02:00
Jiří Techet
f23b56b027 entry: make makeTakEntry() implementation closer to uctags
For now, comment-out code that we don't use and that doesn't work.
2016-10-09 15:22:42 +02:00
Jiří Techet
6ce628da2c entry: Some more or less formal changes 2016-10-09 14:47:54 +02:00
Jiří Techet
3f52bfb4ab entry: Take over uctags tag writing code
We don't use it so we can grab whatever is there.
2016-10-09 12:48:49 +02:00
Jiří Techet
4cde630dd7 Sync the beginning of entry.c/h
Mostly sTagEntryInfo and eTagFile taken from uctags and sync of includes.
2016-10-09 12:40:08 +02:00
Jiří Techet
848fa0dce3 Move eTagFile from entry.h to entry.c
Add access functions and use them outside entry.c. In addition to functions
defined in uctags setMaxTagsLine() had to be added because it is needed
in parser.c (at the moment, will be probably gone in some of the next
commits).
2016-10-09 11:56:49 +02:00
Jiří Techet
e685d956d6 Some sync of lcpp.c/h
Sync things which are possible to sync from lcpp.c/h. This file is heavily
dependent on c.c and since our c.c differs quite significantly, it's
not possible to use the universal-ctags implementation right now.
2016-10-09 11:04:51 +02:00
Jiří Techet
1a43ee2afa Grab uctags kind.c/h 2016-10-08 17:38:31 +02:00
Jiří Techet
2a9f473d78 Sync options.c/h (and introduce a lot of new garbage)
This commit started innocently as an attempt to grab options.c/h from
uctags. However it started referencing other files (which started
referencing other files) so the result is lots of new files are added.

When trying to make it compile, I run into many differences of existing
code which would have to be resolved. As all the added code is more or
less garbage for Geany, I just simply commented-out various function
bodies so it compiles without additional modifications. Should get fixed
once more files get synced with uctags.
2016-10-08 15:48:42 +02:00
Jiří Techet
0a0ed51792 Create geany.c/h and put isIgnoreToken()
This is a (hopefully) temporary file where we put geany-specific code
that for some reason has to be still in ctags. Put isIgnoreToken()
in this file.
2016-10-08 14:13:41 +02:00
Jiří Techet
f1dbf2cb7b Grab ctags implementation of sort.c/h
I haven't studies the changes much but this file is responsible for sorting
tag files which isn't interesing for us.
2016-10-08 14:13:41 +02:00
Jiří Techet
88cbe3871c Grab ctags version of general.h and make related changes
Added e_msoft.h, changed configure.ac to make more checks for header files
so we have corresponding macros defined, drop HAVE_REGEX macro check which
isn't defined any more, drop debugging function from lua parser (complains
about missing definition of errout).

Tested only on Linux (TODO: Windows, OS X)
2016-10-08 14:13:41 +02:00
Jiří Techet
37f015d993 Implement iFileGetLine() using gets() 2016-10-08 14:13:41 +02:00
Jiří Techet
a5dea8091b Grab all MIO changes from uctags 2016-10-08 14:13:41 +02:00
Jiří Techet
580beba0c7 Remove all unused code from main.c 2016-10-08 14:13:41 +02:00
Jiří Techet
ded5ea3eea Move debug related code to debug.c/h 2016-10-08 14:13:41 +02:00
Jiří Techet
7ebcfb77dc Define gcc attributes inside gcc-attr.h 2016-10-08 14:13:36 +02:00
Jiří Techet
85a894b097 Grab args.c/h uctags implementation
Basically dead code for us.
2016-10-08 14:12:45 +02:00
Jiří Techet
c6294e37c9 Grab uctags ctags.h and add repoinfo.c/h 2016-10-08 14:12:45 +02:00
Jiří Techet
2b8c7ae5ad Sync the rest of routines.c/h
Requires checking for errno.h limits.h in autoconf as there are ifdefs
around those in routines.c.
2016-10-08 14:12:45 +02:00
Jiří Techet
65f782b6d2 Don't initialize ExecutableProgram and ExecutableName
We shouldn't need it.
2016-10-08 14:12:45 +02:00
Jiří Techet
d5b60d2f21 Use uctags implementation of strstr() 2016-10-08 14:12:45 +02:00
Jiří Techet
3219d9783c Make sure that file extension is taken from file (not preceding directory) 2016-10-08 14:12:45 +02:00
Jiří Techet
9e7eade7c0 Use parse separator utilities in routines.c 2016-10-08 14:12:45 +02:00
Jiří Techet
f0e7af2c32 Make combinePathAndFile() return char * instead of vString
Also move eStrdup() to the correct position in the header.

In addition add the same includes into debug.h as those in uctags (the
removal of vstring inclusion inside routines.h causes compilation errors -
it would be best to explicitly include all needed files in every source to
avoid problems like this but let's do just syncing the two implementations
for now).
2016-10-08 14:12:45 +02:00