database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

MCOL-05 Modify the DDL parser to not use (even more) global variables.

Browse Source
This commit is contained in:
David Hall
2016-08-16 18:25:09 -05:00
parent 53abd78979
commit 0d2f496389
6 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dbcon/ddlpackage/ddl.l
View File

@ -21,6 +21,7 @@
#include <iostream>
#include <vector>
#include <stdio.h>
#include "sqlparser.h"
#include "ddlpkg.h"
#ifdef _MSC_VER
@ -29,8 +30,9 @@
#include "ddl-gram.h"
#endif
using namespace ddlpackage;
int lineno = 1;
void ddlerror(yyscan_t yyscanner, char *s);
void ddlerror(struct pass_to_bison* x, char const *s);
static char* scanner_copy(char *str, yyscan_t yyscanner);
@ -173,15 +175,14 @@ VARBINARY {return VARBINARY;}
%%
void ddlerror(yyscan_t yyscanner, char const *s)
void ddlerror(struct pass_to_bison* x, char const *s)
{
printf("yyerror: %d: %s at %s\n", lineno, s, ddlget_text(yyscanner));
printf("yyerror: %d: %s at %s\n", lineno, s, ddlget_text(x->scanner));
}
typedef std::vector<char*> valbuf_t;
#include <pthread.h>
#include "sqlparser.h"
using namespace ddlpackage;
/*