← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/execute/parser.yy

  • Committer: Mark Atwood
  • Date: 2011-07-07 02:23:07 UTC
  • mfrom: (2318.6.116 refactor18)
  • Revision ID: me@mark.atwood.name-20110707022307-4db00nqaaczzc3jv
merge lp:~olafvdspek/drizzle/refactor18

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/execute/parser.yy
70
70
#define YYLTYPE_IS_TRIVIAL 0
71
71
 
72
72
int execute_lex(YYSTYPE* lvalp, void* scanner);
73
 
std::vector<std::string> parsed_queries;
74
73
std::string query;
75
 
size_t pos= std::string::npos;
76
74
#define parser_abort(A, B) do { parser::abort_func((A), (B)); YYABORT; } while (0) 
77
75
 
78
76
inline void execute_error(::drizzled::execute::Context *context, yyscan_t *scanner, const char *error)
82
80
    /* TODO: FIX ME!!! */
83
81
    /*
84
82
    context->abort(context, error);*/
85
 
    (void)scanner; (void)error;
86
83
  }
87
84
}
88
85
 
119
116
std::vector<std::string> Context::start() 
120
117
{
121
118
  execute_parse(this, (void **)scanner);
122
 
  parsed_queries.clear();
 
119
  std::vector<std::string> parsed_queries;
123
120
  while ((pos= query.find(';')) != std::string::npos)
124
121
  {
125
122
    parsed_queries.push_back(query.substr(0, pos));