aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1999-09-28 14:49:36 +0000
committerBruce Momjian <bruce@momjian.us>1999-09-28 14:49:36 +0000
commit8ccebab8bd332d62fa0b92818e90aa0d083e0836 (patch)
tree0a2f7089b4412c5186f1ac9e581a615b638606a1 /src
parent77bef41c7fcc93926b9bae20e52a2f377e1a1db2 (diff)
downloadpostgresql-8ccebab8bd332d62fa0b92818e90aa0d083e0836.tar.gz
postgresql-8ccebab8bd332d62fa0b92818e90aa0d083e0836.zip
More cleanup for | and ^.
Diffstat (limited to 'src')
-rw-r--r--src/backend/parser/gram.y22
1 files changed, 9 insertions, 13 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 9d47406f217..c4355de20b9 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.102 1999/09/28 14:38:02 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.103 1999/09/28 14:49:36 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -3682,6 +3682,10 @@ a_expr: attr
{ $$ = makeA_Expr(OP, "^", NULL, $2); }
| '|' a_expr
{ $$ = makeA_Expr(OP, "|", NULL, $2); }
+ | ':' a_expr
+ { $$ = makeA_Expr(OP, ":", NULL, $2); }
+ | ';' a_expr
+ { $$ = makeA_Expr(OP, ";", NULL, $2); }
| a_expr '%'
{ $$ = makeA_Expr(OP, "%", $1, NULL); }
| a_expr '^'
@@ -3715,12 +3719,6 @@ a_expr: attr
| a_expr '=' a_expr
{ $$ = makeA_Expr(OP, "=", $1, $3); }
- | ':' a_expr
- { $$ = makeA_Expr(OP, ":", NULL, $2); }
- | ';' a_expr
- { $$ = makeA_Expr(OP, ";", NULL, $2); }
- | '|' a_expr
- { $$ = makeA_Expr(OP, "|", NULL, $2); }
| a_expr TYPECAST Typename
{
$$ = (Node *)$1;
@@ -4439,6 +4437,10 @@ b_expr: attr
{ $$ = makeA_Expr(OP, "^", NULL, $2); }
| '|' b_expr
{ $$ = makeA_Expr(OP, "|", NULL, $2); }
+ | ':' b_expr
+ { $$ = makeA_Expr(OP, ":", NULL, $2); }
+ | ';' b_expr
+ { $$ = makeA_Expr(OP, ";", NULL, $2); }
| b_expr '%'
{ $$ = makeA_Expr(OP, "%", $1, NULL); }
| b_expr '^'
@@ -4459,12 +4461,6 @@ b_expr: attr
{ $$ = makeA_Expr(OP, "^", $1, $3); }
| b_expr '|' b_expr
{ $$ = makeA_Expr(OP, "|", $1, $3); }
- | ':' b_expr
- { $$ = makeA_Expr(OP, ":", NULL, $2); }
- | ';' b_expr
- { $$ = makeA_Expr(OP, ";", NULL, $2); }
- | '|' b_expr
- { $$ = makeA_Expr(OP, "|", NULL, $2); }
| b_expr TYPECAST Typename
{
$$ = (Node *)$1;