Commit1e844b3

Nikita Glukhov

committed

Extract lex_peek_value()

1 parent4c51772 commit1e844b3Copy full SHA for 1e844b3

File tree

+17

-15

lines changed

+17

-15

lines changed

Lines changed: 17 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,22 @@ lex_peek(JsonLexContext *lex)`
`125`	`125`	`returnlex->token_type;`
`126`	`126`	`}`
`127`	`127`
	`128`	`+staticinlinechar*`
	`129`	`+lex_peek_value(JsonLexContext*lex)`
	`130`	`+{`
	`131`	`+if (lex->token_type==JSON_TOKEN_STRING)`
	`132`	`+returnlex->strval ?pstrdup(lex->strval->data) :NULL;`
	`133`	`+else`
	`134`	`+{`
	`135`	`+intlen= (lex->token_terminator-lex->token_start);`
	`136`	`+char*tokstr=palloc(len+1);`
	`137`	`+`
	`138`	`+memcpy(tokstr,lex->token_start,len);`
	`139`	`+tokstr[len]='\0';`
	`140`	`+returntokstr;`
	`141`	`+}`
	`142`	`+}`
	`143`	`+`
`128`	`144`	`/*`
`129`	`145`	`* lex_accept`
`130`	`146`	`*`
`@@ -140,22 +156,8 @@ lex_accept(JsonLexContext lex, JsonTokenType token, char *lexeme)`
`140`	`156`	`if (lex->token_type==token)`
`141`	`157`	`{`
`142`	`158`	`if (lexeme!=NULL)`
`143`		`-{`
`144`		`-if (lex->token_type==JSON_TOKEN_STRING)`
`145`		`-{`
`146`		`-if (lex->strval!=NULL)`
`147`		`-*lexeme=pstrdup(lex->strval->data);`
`148`		`-}`
`149`		`-else`
`150`		`-{`
`151`		`-intlen= (lex->token_terminator-lex->token_start);`
`152`		`-char*tokstr=palloc(len+1);`
	`159`	`+*lexeme=lex_peek_value(lex);`
`153`	`160`
`154`		`-memcpy(tokstr,lex->token_start,len);`
`155`		`-tokstr[len]='\0';`
`156`		`-*lexeme=tokstr;`
`157`		`-}`
`158`		`-}`
`159`	`161`	`json_lex(lex);`
`160`	`162`	`return true;`
`161`	`163`	`}`

Comments

(0)