Skip to content
Snippets Groups Projects
Commit c7a3e0df authored by Michael Meskes's avatar Michael Meskes
Browse files

Sync preproc.y with gram.y.

parent c5873820
Branches
Tags
No related merge requests found
......@@ -995,5 +995,9 @@ Son Oct 29 11:26:06 CET 2000
- Removed multibyte stuff since client does not know about encoding
in the backend.
- Fixed quoting bug reported by Sascha Demetrio (sd@b-comp.de).
Mon Oct 30 15:27:12 CET 2000
- Synced gram.y and preproc.y.
- Set ecpg version to 2.8.0.
- Set library version to 3.2.0.
......@@ -271,7 +271,6 @@ make_name(void)
%left '+' '-'
%left '*' '/' '%'
%left '^'
%left '|'
/* Unary Operators */
%right UMINUS
%left '.'
......@@ -3235,7 +3234,6 @@ MathOp: '+' { $$ = make_str("+"); }
| '*' { $$ = make_str("*"); }
| '%' { $$ = make_str("%"); }
| '^' { $$ = make_str("^"); }
| '|' { $$ = make_str("|"); }
| '/' { $$ = make_str("/"); }
| '<' { $$ = make_str("<"); }
| '>' { $$ = make_str(">"); }
......@@ -3279,14 +3277,10 @@ a_expr: c_expr
{ $$ = cat2_str(make_str("%"), $2); }
| '^' a_expr
{ $$ = cat2_str(make_str("^"), $2); }
| '|' a_expr
{ $$ = cat2_str(make_str("|"), $2); }
| a_expr '%'
{ $$ = cat2_str($1, make_str("%")); }
| a_expr '^'
{ $$ = cat2_str($1, make_str("^")); }
| a_expr '|'
{ $$ = cat2_str($1, make_str("|")); }
| a_expr '+' a_expr
{ $$ = cat_str(3, $1, make_str("+"), $3); }
| a_expr '-' a_expr
......@@ -3299,8 +3293,6 @@ a_expr: c_expr
{ $$ = cat_str(3, $1, make_str("%"), $3); }
| a_expr '^' a_expr
{ $$ = cat_str(3, $1, make_str("^"), $3); }
| a_expr '|' a_expr
{ $$ = cat_str(3, $1, make_str("|"), $3); }
| a_expr '<' a_expr
{ $$ = cat_str(3, $1, make_str("<"), $3); }
| a_expr '>' a_expr
......@@ -3402,14 +3394,10 @@ b_expr: c_expr
{ $$ = cat2_str(make_str("%"), $2); }
| '^' b_expr
{ $$ = cat2_str(make_str("^"), $2); }
| '|' b_expr
{ $$ = cat2_str(make_str("|"), $2); }
| b_expr '%'
{ $$ = cat2_str($1, make_str("%")); }
| b_expr '^'
{ $$ = cat2_str($1, make_str("^")); }
| b_expr '|'
{ $$ = cat2_str($1, make_str("|")); }
| b_expr '+' b_expr
{ $$ = cat_str(3, $1, make_str("+"), $3); }
| b_expr '-' b_expr
......@@ -3422,8 +3410,6 @@ b_expr: c_expr
{ $$ = cat_str(3, $1, make_str("%"), $3); }
| b_expr '^' b_expr
{ $$ = cat_str(3, $1, make_str("^"), $3); }
| b_expr '|' b_expr
{ $$ = cat_str(3, $1, make_str("|"), $3); }
| b_expr '<' b_expr
{ $$ = cat_str(3, $1, make_str("<"), $3); }
| b_expr '>' b_expr
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment