anon/sqlfun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

work on strings too

Browse Source
This commit is contained in:
anon 2024-02-13 18:20:25 +01:00
parent f1ca33fa3a
commit 5b82720814
4 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/lib.c
View File

@ -20,17 +20,24 @@ struct psql_state *psql_new(void)
return NULL; return NULL;
} }
st->buffer_state = NULL;
return st; return st;
} }
void psql_free(struct psql_state *st) void psql_free(struct psql_state *pstate)
{ {
if (!st) if (!pstate)
return; return;
yylex_destroy(st->scanner); if (pstate->buffer_state) {
yy_delete_buffer(pstate->buffer_state, pstate->scanner);
}
free(st); yylex_destroy(pstate->scanner);
free(pstate);
} }
void psql_set_input(struct psql_state *pstate, FILE *in_f) void psql_set_input(struct psql_state *pstate, FILE *in_f)
@ -38,6 +45,15 @@ void psql_set_input(struct psql_state *pstate, FILE *in_f)
yyset_in(in_f, pstate->scanner); yyset_in(in_f, pstate->scanner);
} }
void psql_set_string_input(struct psql_state *pstate, char *in_str)
{
if (pstate->buffer_state) {
yy_delete_buffer(pstate->buffer_state, pstate->scanner);
}
pstate->buffer_state = yy_scan_string(in_str, pstate->scanner);
}
int psql_parse(struct psql_state *pstate) int psql_parse(struct psql_state *pstate)
{ {
return yyparse(pstate->scanner, pstate); return yyparse(pstate->scanner, pstate);

1
source/main.c
View File

@ -25,7 +25,6 @@ main(int ac, char **av)
abort(); abort();
if(ac > 1) { if(ac > 1) {
puts("wut?");
if((in_f = fopen(av[1], "r")) == NULL) { if((in_f = fopen(av[1], "r")) == NULL) {
perror(av[1]); perror(av[1]);
exit(1); exit(1);

6
source/sql-parser.h
View File

@ -54,13 +54,19 @@ enum sqlp_date_intervals {
SDI_HOUR_SECOND = 8, SDI_HOUR_SECOND = 8,
}; };
#ifndef YY_TYPEDEF_YY_BUFFER_STATE
typedef void* YY_BUFFER_STATE;
#endif
struct psql_state { struct psql_state {
yyscan_t scanner; yyscan_t scanner;
YY_BUFFER_STATE buffer_state;
}; };
extern struct psql_state *psql_new(void); extern struct psql_state *psql_new(void);
extern void psql_free(struct psql_state *st); extern void psql_free(struct psql_state *st);
extern void psql_set_input(struct psql_state *st, FILE *f); extern void psql_set_input(struct psql_state *st, FILE *f);
extern void psql_set_string_input(struct psql_state *pstate, char *in_str);
extern int psql_parse(struct psql_state *st); extern int psql_parse(struct psql_state *st);
extern void sqlp_alias(struct psql_state *pstate, const char *alias); extern void sqlp_alias(struct psql_state *pstate, const char *alias);

5
source/sql.y
View File

@ -325,7 +325,7 @@ struct psql_state;
%start stmt_list %start stmt_list
%{ %{
void yyerror(YYLTYPE *, yyscan_t scanner, struct psql_state *pstate, const char *s, ...); void yyerror(YYLTYPE *t, yyscan_t scanner, struct psql_state *pstate, const char *s, ...);
void lyyerror(YYLTYPE t, const char *s, ...); void lyyerror(YYLTYPE t, const char *s, ...);
%} %}
/* free discarded tokens */ /* free discarded tokens */
@ -975,9 +975,10 @@ yyerror(YYLTYPE *t, yyscan_t scanner, struct psql_state *pstate, const char *s,
va_list ap; va_list ap;
va_start(ap, s); va_start(ap, s);
if(t->first_line) if (t->first_line) {
fprintf(stderr, "%s:%d.%d-%d.%d: error: ", t->filename, t->first_line, t->first_column, fprintf(stderr, "%s:%d.%d-%d.%d: error: ", t->filename, t->first_line, t->first_column,
t->last_line, t->last_column); t->last_line, t->last_column);
}
vfprintf(stderr, s, ap); vfprintf(stderr, s, ap);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
yyerrno = 1; yyerrno = 1;