Remove \shl and \shr.

Author: Eelis

source/compatibility.tex

@@ -990,9 +990,9 @@
 Change to semantics of well-defined expression. A valid \CppIII expression
 containing a right angle bracket (``\tcode{>}'') followed immediately by
 another right angle bracket may now be treated as closing two templates.
-For example, the following code is valid in \CppIII because ``\tcode{\shr}''
+For example, the following code is valid in \CppIII because ``\tcode{>>}''
 is a right-shift operator, but invalid in this International Standard because
-``\tcode{\shr}'' closes two templates.
+``\tcode{>>}'' closes two templates.
 
 \begin{codeblock}
 template <class T> struct X { };

source/diagnostics.tex

@@ -1362,7 +1362,7 @@
 \returns \tcode{error_code(static_cast<int>(e), generic_category())}.
 \end{itemdescr}
 
-\indexlibrarymember{operator\shl}{error_code}%
+\indexlibrarymember{operator<<}{error_code}%
 \begin{itemdecl}
 template <class charT, class traits>
   basic_ostream<charT, traits>&

source/expressions.tex

@@ -1323,8 +1323,8 @@
 
 \begin{bnf}
 \nontermdef{fold-operator} \textnormal{one of}\br
-    \terminal{+ }\quad\terminal{- }\quad\terminal{* }\quad\terminal{/ }\quad\terminal{\% }\quad\terminal{\caret }\quad\terminal{\& }\quad\terminal{| }\quad\terminal{\shl\ }\quad\terminal{\shr }\br
-    \terminal{+=}\quad\terminal{-=}\quad\terminal{*=}\quad\terminal{/=}\quad\terminal{\%=}\quad\terminal{\caret=}\quad\terminal{\&=}\quad\terminal{|=}\quad\terminal{\shl=}\quad\terminal{\shr=}\quad\terminal{=}\br
+    \terminal{+ }\quad\terminal{- }\quad\terminal{* }\quad\terminal{/ }\quad\terminal{\% }\quad\terminal{\caret }\quad\terminal{\& }\quad\terminal{| }\quad\terminal{<< }\quad\terminal{>> }\br
+    \terminal{+=}\quad\terminal{-=}\quad\terminal{*=}\quad\terminal{/=}\quad\terminal{\%=}\quad\terminal{\caret=}\quad\terminal{\&=}\quad\terminal{|=}\quad\terminal{<<=}\quad\terminal{>>=}\quad\terminal{=}\br
     \terminal{==}\quad\terminal{!=}\quad\terminal{< }\quad\terminal{> }\quad\terminal{<=}\quad\terminal{>=}\quad\terminal{\&\&}\quad\terminal{||}\quad\terminal{,  }\quad\terminal{.* }\quad\terminal{->*}
 \end{bnf}
 
@@ -4104,18 +4104,18 @@
 \indextext{shift operator|see{operator, left shift; operator, right shift}}%
 \indextext{right shift operator|see{operator, right shift}}%
 \indextext{left shift operator|see{operator, left shift}}%
-The shift operators \tcode{\shl} and \tcode{\shr} group left-to-right.
+The shift operators \tcode{<<} and \tcode{>>} group left-to-right.
 
 \indextext{operator!left shift}%
-\indextext{\idxcode{\shl}|see{operator, left shift}}%
+\indextext{\idxcode{<<}|see{operator, left shift}}%
 \indextext{operator!right shift}%
-\indextext{\idxcode{\shr}|see{operator, right shift}}%
+\indextext{\idxcode{>>}|see{operator, right shift}}%
 %
 \begin{bnf}
 \nontermdef{shift-expression}\br
     additive-expression\br
-    shift-expression \terminal{\shl} additive-expression\br
-    shift-expression \terminal{\shr} additive-expression
+    shift-expression \terminal{<<} additive-expression\br
+    shift-expression \terminal{>>} additive-expression
 \end{bnf}
 
 The operands shall be of integral or unscoped enumeration type and integral
@@ -4126,7 +4126,7 @@
 than or equal to the length in bits of the promoted left operand.
 
 \pnum
-The value of \tcode{E1 \shl\ E2} is \tcode{E1} left-shifted \tcode{E2} bit positions; vacated bits are
+The value of \tcode{E1 << E2} is \tcode{E1} left-shifted \tcode{E2} bit positions; vacated bits are
 zero-filled. If \tcode{E1} has an unsigned type, the value of the result
 is $\mathrm{E1}\times2^\mathrm{E2}$, reduced modulo
 one more than the maximum value representable in the result type. Otherwise, if
@@ -4136,7 +4136,7 @@
 behavior is undefined.
 
 \pnum
-The value of \tcode{E1 \shr\ E2} is \tcode{E1} right-shifted \tcode{E2}
+The value of \tcode{E1 >> E2} is \tcode{E1} right-shifted \tcode{E2}
 bit positions. If \tcode{E1} has an unsigned type or if \tcode{E1} has a
 signed type and a non-negative value, the value of the result is the
 integral part of the quotient of $\mathrm{E1}/2^\mathrm{E2}$. If \tcode{E1}
@@ -4692,8 +4692,8 @@
 \indextext{operator!\idxcode{*=}}%
 \indextext{operator!\idxcode{/=}}%
 \indextext{operator!\idxcode{\%=}}%
-\indextext{operator!\idxcode{\shr=}}%
-\indextext{operator!\idxcode{\shl=}}%
+\indextext{operator!\idxcode{>>=}}%
+\indextext{operator!\idxcode{<<=}}%
 \indextext{operator!\idxcode{\&=}}%
 \indextext{operator!\idxcode{\caret=}}%
 \indextext{operator!\idxcode{"|=}}%
@@ -4728,7 +4728,7 @@
 
 \begin{bnf}
 \nontermdef{assignment-operator} \textnormal{one of}\br
-    \terminal{=  *=  /=  \%=   +=  -=  \shr=  \shl=  \&=  \caret=  |=}
+    \terminal{=  *=  /=  \%=   +=  -=  >>=  <<=  \&=  \caret=  |=}
 \end{bnf}
 
 \pnum