Update key words for recent grammar changes

diff --git a/doc/src/sgml/keywords.sgml b/doc/src/sgml/keywords.sgml
index 508256520a919c4cbd339539fab141277f6ba737..47f950b4086addaacd9d179c5dcbac883062705e 100644 (file)
--- a/doc/src/sgml/keywords.sgml
+++ b/doc/src/sgml/keywords.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  <acronym>SQL</acronym> Key Words
@@ -33,7 +33,7 @@
   ranging from those that can never be used as an identifier to those
   that have absolutely no special status in the parser as compared to
   an ordinary identifier.  (The latter is usually the case for
-  functions specified by SQL.)  Most SQL reserved key words are not
+  functions specified by SQL.)  SQL reserved key words are not
   completely reserved in PostgreSQL, but
   can be used as column label (as in SELECT 55 AS
   CHECK, even though CHECK is a reserved key
@@ -45,14 +45,21 @@
   PostgreSQL we classify as
   non-reserved those key words that are explicitly
   known to the parser but are allowed in most or all contexts where an
-  identifier is expected.  Labeled reserved are those
-  tokens that are only allowed as AS column label names
-  (and perhaps in very few other contexts).  The token
-  AS is the only exception: it cannot even be used as a
-  column label.  As a general rule, if you get spurious parser errors
-  for commands that contain any of the listed key words as an
-  identifier you should try to quote the identifier to see if the
-  problem goes away.
+  identifier is expected.  Some key words that are otherwise
+  non-reserved cannot be used as function or data type names and are
+  marked accordingly.  (Some of these tokens represent built-in
+  functions or data types with special syntax.  The function or type
+  is still available but it cannot be redefined by the user.)  Labeled
+  reserved are those tokens that are only allowed as
+  AS column label names (and perhaps in very few other
+  contexts).  Some reserved key words are available as names for
+  functions; this is also shown in the table.
+ 
+
+ 
+  As a general rule, if you get spurious parser errors for commands
+  that contain any of the listed key words as an identifier you should
+  try to quote the identifier to see if the problem goes away.
  
 
  
@@ -86,7 +93,7 @@
   
    
     ABORT
-    reserved
+    non-reserved
     
     
    
@@ -284,19 +291,19 @@
    
    
     BETWEEN
-    reserved
+    reserved (can be function)
     non-reserved
     reserved
    
    
     BINARY
-    reserved
+    reserved (can be function)
     reserved
     
    
    
     BIT
-    reserved
+    non-reserved (cannot be function or type)
     reserved
     reserved
    
@@ -416,13 +423,13 @@
    
    
     CHAR
-    reserved
+    non-reserved (cannot be function or type)
     reserved
     reserved
    
    
     CHARACTER
-    reserved
+    non-reserved (cannot be function or type)
     reserved
     reserved
    
@@ -506,13 +513,13 @@
    
    
     CLUSTER
-    reserved
+    non-reserved
     
     
    
    
     COALESCE
-    reserved
+    non-reserved (cannot be function or type)
     non-reserved
     reserved
    
@@ -680,7 +687,7 @@
    
    
     COPY
-    reserved
+    non-reserved
     
     
    
@@ -716,7 +723,7 @@
    
    
     CROSS
-    reserved
+    reserved (can be function)
     reserved
     reserved
    
@@ -830,13 +837,13 @@
    
    
     DEC
-    reserved
+    non-reserved (cannot be function or type)
     reserved
     reserved
    
    
     DECIMAL
-    reserved
+    non-reserved (cannot be function or type)
     reserved
     reserved
    
@@ -1100,13 +1107,13 @@
    
    
     EXISTS
-    reserved
+    non-reserved (cannot be function or type)
     non-reserved
     reserved
    
    
     EXPLAIN
-    reserved
+    non-reserved
     
     
    
@@ -1118,7 +1125,7 @@
    
    
     EXTRACT
-    reserved
+    non-reserved (cannot be function or type)
     non-reserved
     reserved
    
@@ -1148,7 +1155,7 @@
    
    
     FLOAT
-    reserved
+    non-reserved (cannot be function or type)
     reserved
     reserved
    
@@ -1196,7 +1203,7 @@
    
    
     FREEZE
-    reserved
+    reserved (can be function)
     
     
    
@@ -1208,7 +1215,7 @@
    
    
     FULL
-    reserved
+    reserved (can be function)
     reserved
     reserved
    
@@ -1244,7 +1251,7 @@
    
    
     GLOBAL
-    reserved
+    non-reserved
     reserved
     reserved
    
@@ -1334,7 +1341,7 @@
    
    
     ILIKE
-    reserved
+    reserved (can be function)
     
     
    
@@ -1352,7 +1359,7 @@
    
    
     IN
-    reserved
+    reserved (can be function)
     reserved
     reserved
    
@@ -1400,13 +1407,13 @@
    
    
     INNER
-    reserved
+    reserved (can be function)
     reserved
     reserved
    
    
     INOUT
-    reserved
+    non-reserved
     reserved
     
    
@@ -1466,7 +1473,7 @@
    
    
     INTERVAL
-    reserved
+    non-reserved (cannot be function or type)
     reserved
     reserved
    
@@ -1484,13 +1491,13 @@
    
    
     IS
-    reserved
+    reserved (can be function)
     reserved
     reserved
    
    
     ISNULL
-    reserved
+    reserved (can be function)
     
     
    
@@ -1508,7 +1515,7 @@
    
    
     JOIN
-    reserved
+    reserved (can be function)
     reserved
     reserved
    
@@ -1574,7 +1581,7 @@
    
    
     LEFT
-    reserved
+    reserved (can be function)
     reserved
     reserved
    
@@ -1598,7 +1605,7 @@
    
    
     LIKE
-    reserved
+    reserved (can be function)
     reserved
     reserved
    
@@ -1610,19 +1617,19 @@
    
    
     LISTEN
-    reserved
+    non-reserved
     
     
    
    
     LOAD
-    reserved
+    non-reserved
     
     
    
    
     LOCAL
-    reserved
+    non-reserved
     reserved
     reserved
    
@@ -1652,7 +1659,7 @@
    
    
     LOCK
-    reserved
+    non-reserved
     
     
    
@@ -1778,7 +1785,7 @@
    
    
     MOVE
-    reserved
+    non-reserved
     
     
    
@@ -1808,13 +1815,13 @@
    
    
     NATURAL
-    reserved
+    reserved (can be function)
     reserved
     reserved
    
    
     NCHAR
-    reserved
+    non-reserved (cannot be function or type)
     reserved
     reserved
    
@@ -1856,7 +1863,7 @@
    
    
     NONE
-    non-reserved
+    non-reserved (cannot be function or type)
     reserved
     
    
@@ -1880,7 +1887,7 @@
    
    
     NOTNULL
-    reserved
+    reserved (can be function)
     
     
    
@@ -1898,7 +1905,7 @@
    
    
     NULLIF
-    reserved
+    non-reserved (cannot be function or type)
     non-reserved
     reserved
    
@@ -1910,7 +1917,7 @@
    
    
     NUMERIC
-    reserved
+    non-reserved (cannot be function or type)
     reserved
     reserved
    
@@ -2018,13 +2025,13 @@
    
    
     OUT
-    reserved
+    non-reserved
     reserved
     
    
    
     OUTER
-    reserved
+    reserved (can be function)
     reserved
     reserved
    
@@ -2036,7 +2043,7 @@
    
    
     OVERLAPS
-    reserved
+    reserved (can be function)
     non-reserved
     reserved
    
@@ -2150,7 +2157,7 @@
    
    
     POSITION
-    reserved
+    non-reserved (cannot be function or type)
     non-reserved
     reserved
    
@@ -2162,7 +2169,7 @@
    
    
     PRECISION
-    reserved
+    non-reserved
     reserved
     reserved
    
@@ -2222,7 +2229,7 @@
    
    
     PUBLIC
-    reserved
+    reserved (can be function)
     reserved
     reserved
    
@@ -2300,7 +2307,7 @@
    
    
     RESET
-    reserved
+    non-reserved
     
     
    
@@ -2354,7 +2361,7 @@
    
    
     RIGHT
-    reserved
+    reserved (can be function)
     reserved
     reserved
    
@@ -2540,7 +2547,7 @@
    
    
     SETOF
-    reserved
+    non-reserved (cannot be function or type)
     
     
    
@@ -2558,7 +2565,7 @@
    
    
     SHOW
-    reserved
+    non-reserved
     
     
    
@@ -2726,7 +2733,7 @@
    
    
     SUBSTRING
-    reserved
+    non-reserved (cannot be function or type)
     non-reserved
     reserved
    
@@ -2810,13 +2817,13 @@
    
    
     TIME
-    reserved
+    non-reserved (cannot be function or type)
     reserved
     reserved
    
    
     TIMESTAMP
-    reserved
+    non-reserved (cannot be function or type)
     reserved
     reserved
    
@@ -2852,7 +2859,7 @@
    
    
     TRANSACTION
-    reserved
+    non-reserved
     reserved
     reserved
    
@@ -2930,7 +2937,7 @@
    
    
     TRIM
-    reserved
+    non-reserved (cannot be function or type)
     non-reserved
     reserved
    
@@ -2990,7 +2997,7 @@
    
    
     UNKNOWN
-    reserved
+    non-reserved
     reserved
     reserved
    
@@ -3068,7 +3075,7 @@
    
    
     VACUUM
-    reserved
+    non-reserved
     
     
    
@@ -3092,7 +3099,7 @@
    
    
     VARCHAR
-    reserved
+    non-reserved (cannot be function or type)
     reserved
     reserved
    
@@ -3110,7 +3117,7 @@
    
    
     VERBOSE
-    reserved
+    reserved (can be function)