← 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-02-24 20:50:45 UTC
  • mto: This revision was merged to the branch mainline in revision 2204.
  • Revision ID: brian@tangent.org-20110224205045-lp3t4z8stuia3i4r
Add in an ANSI || operator.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
173
173
  Currently there are 70 shift/reduce conflicts.
174
174
  We should not introduce new conflicts any more.
175
175
*/
176
 
%expect 75
 
176
%expect 79
177
177
 
178
178
/*
179
179
   Comments for TOKENS.
569
569
%nonassoc IN_SYM
570
570
%nonassoc IS NULL_SYM TRUE_SYM FALSE_SYM
571
571
 
 
572
%nonassoc CONCAT
572
573
%nonassoc '|'
573
574
%nonassoc '&'
574
575
%nonassoc SHIFT_LEFT SHIFT_RIGHT
2517
2518
          {
2518
2519
            Lex->setSumExprUsed();
2519
2520
          }
 
2521
        | simple_expr CONCAT simple_expr
 
2522
          {
 
2523
            $$= new (YYSession->mem_root) Item_func_concat(*YYSession, $1, $3);
 
2524
          }
2520
2525
        | '+' simple_expr %prec UMINUS { $$= $2; }
2521
2526
        | '-' simple_expr %prec UMINUS
2522
2527
          {