<p><b>@b4n</b> requested changes on this pull request.</p>
<p>I didn't review the changes on U-CTags side, so some comments might be slightly irrelevant (e.g. alignment, while nice, doesn't make much sense if it's not kept on U-CTags side), or on the contrary relevant to apply to U-CTags.</p><hr>
<p>In <a href="https://github.com/geany/geany/pull/1251#pullrequestreview-2445607">ctags/main/entry.h</a>:</p>
<pre style='color:#555'>> unsigned long lineNumber; /* line number of tag */
MIOPos filePosition; /* file position of line containing tag */
const char* language; /* language of source file */
- boolean isFileScope; /* is tag visible only within source file? */
- boolean isFileEntry; /* is this just an entry for a file name? */
- boolean truncateLine; /* truncate tag line at end of tag name? */
+ bool isFileScope; /* is tag visible only within source file? */
+ bool isFileEntry; /* is this just an entry for a file name? */
+ bool truncateLine; /* truncate tag line at end of tag name? */
</pre>
<p>maybe keep alignment</p>
<hr>
<p>In <a href="https://github.com/geany/geany/pull/1251#pullrequestreview-2445607">ctags/main/main.c</a>:</p>
<pre style='color:#555'>> @@ -46,7 +46,7 @@
# include <sys/types.h> /* required by dirent.h */
# endif
# include <dirent.h> /* to declare opendir() */
-# undef boolean
+# undef bool
</pre>
<p>as <a href="https://github.com/codebrainz" class="user-mention">@codebrainz</a> pointed out, that's not good as the C standard explicitly states that <code>bool</code> is a macro. So while here this probably restored the <code>typedef</code> from <em>general.h</em>, now it removes any definition.<br>
I think it must be safe to drop this <code>undef</code> altogether, as <em>stdbool.h</em> being standard there's no reason for <em>dirent.h</em> to mess it up.</p>
<hr>
<p>In <a href="https://github.com/geany/geany/pull/1251#pullrequestreview-2445607">ctags/main/mio.c</a>:</p>
<pre style='color:#555'>> @@ -225,8 +225,8 @@ MIO *mio_new_memory (unsigned char *data,
mio->impl.mem.allocated_size = size;
mio->impl.mem.realloc_func = realloc_func;
mio->impl.mem.free_func = free_func;
- mio->impl.mem.eof = FALSE;
- mio->impl.mem.error = FALSE;
+ mio->impl.mem.eof = false;
+ mio->impl.mem.error = false;
</pre>
<p>(I definitely need to do something about MIO sync)</p>
<hr>
<p>In <a href="https://github.com/geany/geany/pull/1251#pullrequestreview-2445607">ctags/main/options.h</a>:</p>
<pre style='color:#555'>> } extensionFields;
stringList* ignore; /* -I name of file containing tokens to ignore */
- boolean append; /* -a append to "tags" file */
- boolean backward; /* -B regexp patterns search backwards */
+ bool append; /* -a append to "tags" file */
+ bool backward; /* -B regexp patterns search backwards */
</pre>
<p>comment alignment? :) (continues below)</p>
<hr>
<p>In <a href="https://github.com/geany/geany/pull/1251#pullrequestreview-2445607">ctags/main/parse.h</a>:</p>
<pre style='color:#555'>> @@ -71,7 +71,7 @@ typedef struct {
/* used internally */
unsigned int id; /* id assigned to language */
- boolean enabled; /* currently enabled? */
+ bool enabled; /* currently enabled? */
</pre>
<p>alignment</p>
<hr>
<p>In <a href="https://github.com/geany/geany/pull/1251#pullrequestreview-2445607">ctags/main/read.c</a>:</p>
<pre style='color:#555'>> @@ -294,10 +294,10 @@ extern boolean fileOpen (const char *const fileName, const langType language)
* This func is NOT THREAD SAFE.
* The user should not tamper with the buffer while this func is executing.
*/
-extern boolean bufferOpen (unsigned char *buffer, size_t buffer_size,
+extern bool bufferOpen (unsigned char *buffer, size_t buffer_size,
const char *const fileName, const langType language )
</pre>
<p>parenthesis alignment (ok, it's not very visible here)</p>
<hr>
<p>In <a href="https://github.com/geany/geany/pull/1251#pullrequestreview-2445607">ctags/main/read.h</a>:</p>
<pre style='color:#555'>> @@ -113,7 +113,7 @@ extern void ungetcToInputFile (int c);
extern const unsigned char *readLineFromInputFile (void);
extern char *readLineRaw (vString *const vLine, MIO *const mio);
extern char *readSourceLine (vString *const vLine, MIOPos location, long *const pSeekValue);
-extern boolean bufferOpen (unsigned char *buffer, size_t buffer_size,
+extern bool bufferOpen (unsigned char *buffer, size_t buffer_size,
const char *const fileName, const langType language );
</pre>
<p>alignment</p>
<hr>
<p>In <a href="https://github.com/geany/geany/pull/1251#pullrequestreview-2445607">ctags/main/xtag.c</a>:</p>
<pre style='color:#555'>> @@ -103,7 +103,7 @@ static void printXtag (xtagType i)
printf((Option.machinable? "%c\t%s\t%s\t%s\n": MAKE_XTAG_FMT(c)),
xtagDescs[i].letter,
xtagDescs[i].name,
- getXtagDesc (i)->enabled? "TRUE": "FALSE",
+ getXtagDesc (i)->enabled? "true": "false",
</pre>
<p>that's probably wrong</p>
<hr>
<p>In <a href="https://github.com/geany/geany/pull/1251#pullrequestreview-2445607">ctags/parsers/c.c</a>:</p>
<pre style='color:#555'>> @@ -404,7 +404,7 @@ static const keywordDesc KeywordTable [] = {
{ "bind_var", KEYWORD_BIND_VAR, { 0, 0, 0, 0, 1, 0, 0 } },
{ "bit", KEYWORD_BIT, { 0, 0, 0, 0, 1, 0, 0 } },
{ "body", KEYWORD_BODY, { 0, 0, 0, 0, 0, 0, 1 } },
- { "boolean", KEYWORD_BOOLEAN, { 0, 0, 0, 1, 0, 0, 0 } },
+ { "bool", KEYWORD_BOOLEAN, { 0, 0, 0, 1, 0, 0, 0 } },
</pre>
<p>Nope!</p>
<hr>
<p>In <a href="https://github.com/geany/geany/pull/1251#pullrequestreview-2445607">ctags/parsers/c.c</a>:</p>
<pre style='color:#555'>> @@ -689,7 +689,7 @@ static const char *implementationString (const impType imp)
#ifdef DEBUG
-#define boolString(c) ((c) ? "TRUE" : "FALSE")
+#define boolString(c) ((c) ? "true" : "false")
</pre>
<p>this should probably be left out (although well, it's only used in debugging output, so doesn't matter so much)</p>
<hr>
<p>In <a href="https://github.com/geany/geany/pull/1251#pullrequestreview-2445607">ctags/parsers/c.c</a>:</p>
<pre style='color:#555'>> else if (isType (token, TOKEN_BRACE_CLOSE))
/* Java, D, C#, Vala do not require semicolons to end a block. Neither do
* C++ namespaces. All other blocks require a semicolon to terminate them.
*/
- isEnd = (boolean) (isInputLanguage (Lang_java) || isInputLanguage (Lang_d) ||
+ isEnd = (bool) (isInputLanguage (Lang_java) || isInputLanguage (Lang_d) ||
isInputLanguage (Lang_csharp) || isInputLanguage (Lang_vala) ||
! isContextualStatement (st));
</pre>
<p>alignment</p>
<hr>
<p>In <a href="https://github.com/geany/geany/pull/1251#pullrequestreview-2445607">ctags/parsers/json.c</a>:</p>
<pre style='color:#555'>> @@ -70,12 +70,12 @@ typedef enum {
static langType Lang_json;
static kindOption JsonKinds [] = {
- { TRUE, 'o', "object", "objects" },
- { TRUE, 'a', "array", "arrays" },
- { TRUE, 'n', "number", "numbers" },
- { TRUE, 's', "string", "strings" },
- { TRUE, 'b', "boolean", "booleans" },
- { TRUE, 'z', "null", "nulls" }
+ { true, 'o', "object", "objects" },
+ { true, 'a', "array", "arrays" },
+ { true, 'n', "number", "numbers" },
+ { true, 's', "string", "strings" },
+ { true, 'b', "bool", "booleans" },
</pre>
<p>not the string</p>
<hr>
<p>In <a href="https://github.com/geany/geany/pull/1251#pullrequestreview-2445607">ctags/parsers/txt2tags.c</a>:</p>
<pre style='color:#555'>> @@ -87,7 +87,7 @@ static boolean isTxt2tagsLine (const unsigned char *line)
return len >= 20 && *line == 0;
}
-static boolean parseTxt2tagsTitle (const unsigned char *line,
+static bool parseTxt2tagsTitle (const unsigned char *line,
vString *const title,
int *const depth_)
</pre>
<p>alignment</p>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/geany/geany/pull/1251#pullrequestreview-2445607">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABDrJxVsjAGbk3zQnjW_UvdMOow8zX43ks5qv3LZgaJpZM4KL4iS">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABDrJxxZXZ7szgx_9H6SWOxyqXCkZ3Vvks5qv3LZgaJpZM4KL4iS.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
<link itemprop="url" href="https://github.com/geany/geany/pull/1251#pullrequestreview-2445607"></link>
<meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>
<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/geany/geany","title":"geany/geany","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/geany/geany"}},"updates":{"snippets":[{"icon":"PERSON","message":"@b4n requested changes on #1251"}],"action":{"name":"View Pull Request","url":"https://github.com/geany/geany/pull/1251#pullrequestreview-2445607"}}}</script>