/ Check-in [5343e601]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix two more warnings in fts5 code.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | amalg-json1-fts5
Files: files | file ages | folders
SHA1: 5343e601fb6f0f24f4e4d5d442f7b5b074734143
User & Date: dan 2015-10-08 20:28:33
Context
2015-10-08
20:40
Fix further fts5 compilation issues. check-in: 0d7f301f user: dan tags: amalg-json1-fts5
20:28
Fix two more warnings in fts5 code. check-in: 5343e601 user: dan tags: amalg-json1-fts5
20:11
Fix a couple of errors in fts5 compilation. This branch still does not build with -Wall -Werror. check-in: e9e76e12 user: dan tags: amalg-json1-fts5
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/fts5/fts5_aux.c.

     9      9   **    May you share freely, never taking more than you give.
    10     10   **
    11     11   ******************************************************************************
    12     12   */
    13     13   
    14     14   
    15     15   #include "fts5Int.h"
    16         -#include <math.h>
           16  +#include <math.h>                 /* amalgamator: keep */
    17     17   
    18     18   /*
    19     19   ** Object used to iterate through all "coalesced phrase instances" in 
    20     20   ** a single column of the current row. If the phrase instances in the
    21     21   ** column being considered do not overlap, this object simply iterates
    22     22   ** through them. Or, if they do overlap (share one or more tokens in
    23     23   ** common), each set of overlapping instances is treated as a single

Changes to ext/fts5/fts5parse.y.

    63     63   %left OR.
    64     64   %left AND.
    65     65   %left NOT.
    66     66   %left TERM.
    67     67   %left COLON.
    68     68   
    69     69   input ::= expr(X). { sqlite3Fts5ParseFinished(pParse, X); }
           70  +%destructor input { (void)pParse; }
    70     71   
    71     72   %type cnearset    {Fts5ExprNode*}
    72     73   %type expr        {Fts5ExprNode*}
    73     74   %type exprlist    {Fts5ExprNode*}
    74     75   %destructor cnearset { sqlite3Fts5ParseNodeFree($$); }
    75     76   %destructor expr     { sqlite3Fts5ParseNodeFree($$); }
    76     77   %destructor exprlist { sqlite3Fts5ParseNodeFree($$); }