Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix two more warnings in fts5 code. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | amalg-json1-fts5 |
Files: | files | file ages | folders |
SHA1: |
5343e601fb6f0f24f4e4d5d442f7b5b0 |
User & Date: | dan 2015-10-08 20:28:33.424 |
Context
2015-10-08
| ||
20:40 | Fix further fts5 compilation issues. (check-in: 0d7f301fb0 user: dan tags: amalg-json1-fts5) | |
20:28 | Fix two more warnings in fts5 code. (check-in: 5343e601fb 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: e9e76e1281 user: dan tags: amalg-json1-fts5) | |
Changes
Changes to ext/fts5/fts5_aux.c.
︙ | ︙ | |||
9 10 11 12 13 14 15 | ** May you share freely, never taking more than you give. ** ****************************************************************************** */ #include "fts5Int.h" | | | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | ** May you share freely, never taking more than you give. ** ****************************************************************************** */ #include "fts5Int.h" #include <math.h> /* amalgamator: keep */ /* ** Object used to iterate through all "coalesced phrase instances" in ** a single column of the current row. If the phrase instances in the ** column being considered do not overlap, this object simply iterates ** through them. Or, if they do overlap (share one or more tokens in ** common), each set of overlapping instances is treated as a single |
︙ | ︙ |
Changes to ext/fts5/fts5parse.y.
︙ | ︙ | |||
63 64 65 66 67 68 69 70 71 72 73 74 75 76 | %left OR. %left AND. %left NOT. %left TERM. %left COLON. input ::= expr(X). { sqlite3Fts5ParseFinished(pParse, X); } %type cnearset {Fts5ExprNode*} %type expr {Fts5ExprNode*} %type exprlist {Fts5ExprNode*} %destructor cnearset { sqlite3Fts5ParseNodeFree($$); } %destructor expr { sqlite3Fts5ParseNodeFree($$); } %destructor exprlist { sqlite3Fts5ParseNodeFree($$); } | > | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | %left OR. %left AND. %left NOT. %left TERM. %left COLON. input ::= expr(X). { sqlite3Fts5ParseFinished(pParse, X); } %destructor input { (void)pParse; } %type cnearset {Fts5ExprNode*} %type expr {Fts5ExprNode*} %type exprlist {Fts5ExprNode*} %destructor cnearset { sqlite3Fts5ParseNodeFree($$); } %destructor expr { sqlite3Fts5ParseNodeFree($$); } %destructor exprlist { sqlite3Fts5ParseNodeFree($$); } |
︙ | ︙ |