← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2011-07-25 14:24:19 UTC
  • mto: This revision was merged to the branch mainline in revision 2373.
  • Revision ID: brian@tangent.org-20110725142419-3vobv9u6k7jp4qej
Remove the typedef on lexkey

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
128
128
  unsigned long ulong_num;
129
129
  uint64_t ulonglong_number;
130
130
  int64_t longlong_number;
131
 
  drizzled::LEX_STRING lex_str;
132
 
  drizzled::LEX_STRING *lex_str_ptr;
 
131
  drizzled::lex_string_t lex_str;
 
132
  drizzled::lex_string_t *lex_str_ptr;
133
133
  drizzled::LEX_SYMBOL symbol;
134
134
  drizzled::Table_ident *table;
135
135
  char *simple_string;
1210
1210
        ;
1211
1211
 
1212
1212
opt_constraint:
1213
 
          /* empty */ { $$= null_lex_str; }
 
1213
          /* empty */ { $$= null_lex_string(); }
1214
1214
        | constraint { $$= $1; }
1215
1215
        ;
1216
1216
 
1794
1794
        ;
1795
1795
 
1796
1796
opt_ident:
1797
 
          /* empty */ { $$= null_lex_str; }
 
1797
          /* empty */ { $$= null_lex_string(); }
1798
1798
        | field_ident { $$= $1; }
1799
1799
        ;
1800
1800
 
1801
1801
opt_component:
1802
 
          /* empty */    { $$= null_lex_str; }
 
1802
          /* empty */    { $$= null_lex_string(); }
1803
1803
        | '.' ident      { $$= $2; }
1804
1804
        ;
1805
1805
 
1915
1915
            Lex.length= Lex.dec=0;
1916
1916
            Lex.type= 0;
1917
1917
            statement->default_value= statement->on_update_value= 0;
1918
 
            statement->comment= null_lex_str;
 
1918
            statement->comment= null_lex_string();
1919
1919
            Lex.charset= NULL;
1920
1920
            statement->alter_info.flags.set(ALTER_CHANGE_COLUMN);
1921
1921
            statement->column_format= COLUMN_FORMAT_TYPE_DEFAULT;
2362
2362
        ;
2363
2363
 
2364
2364
select_alias:
2365
 
          /* empty */ { $$=null_lex_str;}
 
2365
          /* empty */ { $$= null_lex_string();}
2366
2366
        | AS ident { $$=$2; }
2367
2367
        | AS TEXT_STRING_sys { $$=$2; }
2368
2368
        | ident { $$=$1; }
3886
3886
          /* empty */ { $$=0; }
3887
3887
        | table_alias ident
3888
3888
          {
3889
 
            $$= (drizzled::LEX_STRING*) memory::sql_memdup(&$2,sizeof(drizzled::LEX_STRING));
 
3889
            $$= (drizzled::lex_string_t*) memory::sql_memdup(&$2,sizeof(drizzled::lex_string_t));
3890
3890
          }
3891
3891
        ;
3892
3892
 
5062
5062
table_wild:
5063
5063
          ident '.' '*'
5064
5064
          {
5065
 
            $$= parser::buildTableWild(&Lex, NULL_LEX_STRING, $1);
 
5065
            $$= parser::buildTableWild(&Lex, null_lex_string(), $1);
5066
5066
          }
5067
5067
        | ident '.' ident '.' '*'
5068
5068
          {
5077
5077
simple_ident:
5078
5078
          ident
5079
5079
          {
5080
 
            $$= parser::buildIdent(&Lex, NULL_LEX_STRING, NULL_LEX_STRING, $1);
 
5080
            $$= parser::buildIdent(&Lex, null_lex_string(), null_lex_string(), $1);
5081
5081
          }
5082
5082
        | simple_ident_q { $$= $1; }
5083
5083
        ;
5085
5085
simple_ident_q:
5086
5086
          ident '.' ident
5087
5087
          {
5088
 
            $$= parser::buildIdent(&Lex, NULL_LEX_STRING, $1, $3);
 
5088
            $$= parser::buildIdent(&Lex, null_lex_string(), $1, $3);
5089
5089
          }
5090
5090
        | '.' ident '.' ident
5091
5091
          {
5092
 
            $$= parser::buildIdent(&Lex, NULL_LEX_STRING, $2, $4);
 
5092
            $$= parser::buildIdent(&Lex, null_lex_string(), $2, $4);
5093
5093
          }
5094
5094
        | ident '.' ident '.' ident
5095
5095
          {
5111
5111
          }
5112
5112
        | ident '.' ident
5113
5113
          {
5114
 
            if (not parser::checkFieldIdent(&Lex, NULL_LEX_STRING, $1))
 
5114
            if (not parser::checkFieldIdent(&Lex, null_lex_string(), $1))
5115
5115
              DRIZZLE_YYABORT;
5116
5116
 
5117
5117
            $$=$3;
5448
5448
            Lex.option_type= $1;
5449
5449
            Lex.var_list.push_back(SetVarPtr(new set_var(Lex.option_type,
5450
5450
                                              find_sys_var("tx_isolation"),
5451
 
                                              &null_lex_str,
 
5451
                                              &(null_lex_string()),
5452
5452
                                              new Item_int((int32_t)
5453
5453
                                              $5))));
5454
5454
          }
5490
5490
              if (!tmp)
5491
5491
                DRIZZLE_YYABORT;
5492
5492
              $$.var= tmp;
5493
 
              $$.base_name= null_lex_str;
 
5493
              $$.base_name= null_lex_string();
5494
5494
            }
5495
5495
          }
5496
5496
        ;