Commit8f67860

committed

Avoid confusion start_parse_str function with tsearch V1

1 parent59b1a23 commit8f67860Copy full SHA for 8f67860

File tree

-8

lines changed

-8

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`#ifndef__PARSER_H__`
`2`	`2`	`#define__PARSER_H__`
`3`	`3`
`4`		`-char*token;`
`5`		`-inttokenlen;`
	`4`	`+externchar*token;`
	`5`	`+externinttokenlen;`
`6`	`6`	`inttsearch2_yylex(void);`
`7`		`-voidstart_parse_str(char*,int);`
`8`		`-voidend_parse(void);`
	`7`	`+voidtsearch2_start_parse_str(char*,int);`
	`8`	`+voidtsearch2_end_parse(void);`
`9`	`9`
`10`	`10`	`#endif`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`#definefprintf(file, fmt, msg) ts_error(ERROR, fmt, msg)`
`10`	`10`
`11`	`11`	`char token =NULL;/ pointer to token*/`
	`12`	`+int tokenlen;`
`12`	`13`	`char s =NULL;/ to return WHOLE hyphenated-word*/`
`13`	`14`
`14`	`15`	`YY_BUFFER_STATE buf =NULL;/* buffer to parse; it need for parse from string*/`
`@@ -280,14 +281,14 @@ ftp"://" {`
`280`	`281`	`%%`
`281`	`282`
`282`	`283`	`/* clearing after parsing from string */`
`283`		`-voidend_parse() {`
	`284`	`+voidtsearch2_end_parse() {`
`284`	`285`	`if (s) {free(s); s=NULL; }`
`285`	`286`	`tsearch2_yy_delete_buffer( buf );`
`286`	`287`	`buf =NULL;`
`287`	`288`	`}`
`288`	`289`
`289`	`290`	`/* start parse from string */`
`290`		`-voidstart_parse_str(char* str,int limit) {`
	`291`	`+voidtsearch2_start_parse_str(char* str,int limit) {`
`291`	`292`	`if (buf)end_parse();`
`292`	`293`	`buf =tsearch2_yy_scan_bytes( str, limit );`
`293`	`294`	`tsearch2_yy_switch_to_buffer( buf );`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ Datumprsd_start(PG_FUNCTION_ARGS);`
`42`	`42`	`Datum`
`43`	`43`	`prsd_start(PG_FUNCTION_ARGS)`
`44`	`44`	`{`
`45`		`-start_parse_str((char*)PG_GETARG_POINTER(0),PG_GETARG_INT32(1));`
	`45`	`+tsearch2_start_parse_str((char*)PG_GETARG_POINTER(0),PG_GETARG_INT32(1));`
`46`	`46`	`PG_RETURN_POINTER(NULL);`
`47`	`47`	`}`
`48`	`48`
`@@ -67,7 +67,7 @@ Datum`
`67`	`67`	`prsd_end(PG_FUNCTION_ARGS)`
`68`	`68`	`{`
`69`	`69`	`/* ParserState p=(ParserState)PG_GETARG_POINTER(0); */`
`70`		`-end_parse();`
	`70`	`+tsearch2_end_parse();`
`71`	`71`	`PG_RETURN_VOID();`
`72`	`72`	`}`
`73`	`73`

Comments

(0)