simcop2387/DBD-SQLite-SQLcipher
1
0
Fork 0
mirror of https://github.com/DBD-SQLite/DBD-SQLite synced 2025-06-07 14:19:10 -04:00
Code Issues Releases Wiki Activity

better variable names and comments

Browse source
This commit is contained in:
dami 2021-05-11 09:40:24 +02:00
parent f68f79415f
commit 80c7c91ae6
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
dbdimp_tokenizer.inc
View file

@ -12,8 +12,8 @@ typedef struct perl_tokenizer_cursor {
/* members below are only used if the input string is in utf8 */ /* members below are only used if the input string is in utf8 */
const char *pInput; /* input we are tokenizing */ const char *pInput; /* input we are tokenizing */
const char *lastByteOffset; /* offset into pInput */ const char *currentByte; /* pointer into pInput */
int lastCharOffset; /* char offset corresponding to lastByteOffset */ int currentChar; /* char corresponding to currentByte */
} perl_tokenizer_cursor; } perl_tokenizer_cursor;
/* /*
@ -108,9 +108,9 @@ static int perl_tokenizer_Open(
/* special handling if working with utf8 strings */ /* special handling if working with utf8 strings */
if (MY_CXT.last_dbh_is_unicode) { if (MY_CXT.last_dbh_is_unicode) {
/* data to keep track of byte offsets */ /* data to keep track of byte positions */
c->lastByteOffset = c->pInput = pInput; c->currentByte = c->pInput = pInput;
c->lastCharOffset = 0; c->currentChar = 0;
/* string passed to Perl needs to be flagged as utf8 */ /* string passed to Perl needs to be flagged as utf8 */
flags |= SVf_UTF8; flags |= SVf_UTF8;
@ -174,7 +174,7 @@ static int perl_tokenizer_Next(
int result; int result;
int n_retval; int n_retval;
char *token; char *token;
char *byteOffset; char *nextByte;
STRLEN n_a; /* this is required for older perls < 5.8.8 */ STRLEN n_a; /* this is required for older perls < 5.8.8 */
I32 hop; I32 hop;
@ -215,19 +215,27 @@ static int perl_tokenizer_Next(
/* recompute *pnBytes in bytes, not in chars */ /* recompute *pnBytes in bytes, not in chars */
*pnBytes = strlen(token); *pnBytes = strlen(token);
/* recompute start offset in bytes, not in chars */ /* nb of chars from last position to the start of the token */
hop = *piStartOffset - c->lastCharOffset; hop = *piStartOffset - c->currentChar;
byteOffset = (char*)utf8_hop((U8*)c->lastByteOffset, hop);
/* advance to the first byte in token */
nextByte = (char*)utf8_hop((U8*)c->currentByte, hop);
/* nb of chars in token */
hop = *piEndOffset - *piStartOffset; hop = *piEndOffset - *piStartOffset;
*piStartOffset = byteOffset - c->pInput;
byteOffset = (char*)utf8_hop((U8*)byteOffset, hop); /* recompute start offset in bytes, not in chars */
*piStartOffset = nextByte - c->pInput;
/* advance past to the last byte in token */
nextByte = (char*)utf8_hop((U8*)nextByte, hop);
/* remember where we are for next round */ /* remember where we are for next round */
c->lastCharOffset = *piEndOffset; c->currentChar = *piEndOffset;
c->lastByteOffset = byteOffset; c->currentByte = nextByte;
/* recompute end offset in bytes, not in chars */ /* recompute end offset in bytes, not in chars */
*piEndOffset = byteOffset - c->pInput; *piEndOffset = nextByte - c->pInput;
#ifdef DEBUG_OFFSETS #ifdef DEBUG_OFFSETS
warn("FIX: token: %s, start=%d, end=%d, nBytes=%d\n", token, *piStartOffset, *piEndOffset, *pnBytes); warn("FIX: token: %s, start=%d, end=%d, nBytes=%d\n", token, *piStartOffset, *piEndOffset, *pnBytes);