diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-08-12 05:15:24 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-08-12 05:15:24 +0000 |
| commit | 766fb7f707f9527be219353f5f970aab3d786554 (patch) | |
| tree | ddce48601ff21cdd9a27343475779530fa0cb502 /src/backend | |
| parent | 134fdf34d6c48e6420f7592a6b1e02adcf0f2d02 (diff) | |
| download | postgresql-766fb7f707f9527be219353f5f970aab3d786554.tar.gz postgresql-766fb7f707f9527be219353f5f970aab3d786554.zip | |
Mop-up for removal of ':' and ';' operators ... like, say, actually
take 'em out of pg_operator. Also remove from scan.l's set of legal
operator characters. Update documentation.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/parser/gram.y | 10 | ||||
| -rw-r--r-- | src/backend/parser/scan.l | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 276afb8c52e..4294a7bafa4 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.185 2000/08/11 23:45:27 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.186 2000/08/12 05:15:21 tgl Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -363,7 +363,8 @@ static void doNegateFloat(Value *v); /* these are not real. they are here so that they get generated as #define's*/ %token OP -/* precedence */ +/* precedence: lowest to highest */ +%left UNION INTERSECT EXCEPT %left OR %left AND %right NOT @@ -381,15 +382,12 @@ static void doNegateFloat(Value *v); %left '+' '-' %left '*' '/' '%' %left '^' -%left '|' /* this is the relation union op, not logical or */ +%left '|' /* XXX Should this have such a high priority? */ /* Unary Operators */ -%right ':' /* delimiter for array ranges */ -%left ';' /* end of statement */ %right UMINUS %left '.' %left '[' ']' %left TYPECAST -%left UNION INTERSECT EXCEPT %left ESCAPE %% diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l index eb71d08cbbd..2701479313c 100644 --- a/src/backend/parser/scan.l +++ b/src/backend/parser/scan.l @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.74 2000/08/06 17:50:38 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.75 2000/08/12 05:15:21 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -181,7 +181,7 @@ typecast "::" * rule for "operator"! */ self [,()\[\].;$\:\+\-\*\/\%\^\<\>\=\|] -op_chars [\~\!\@\#\^\&\|\`\?\$\:\+\-\*\/\%\<\>\=] +op_chars [\~\!\@\#\^\&\|\`\?\$\+\-\*\/\%\<\>\=] operator {op_chars}+ /* we no longer allow unary minus in numbers. @@ -402,7 +402,7 @@ other . for (ic = nchars-2; ic >= 0; ic--) { - if (strchr("~!@#&`?$:%^|", yytext[ic])) + if (strchr("~!@#^&|`?$%", yytext[ic])) break; } if (ic >= 0) |