[Python-checkins] python/dist/src/Doc/ref ref5.tex,1.59,1.60

fdrake@sourceforge.net fdrake@sourceforge.net
Mon, 29 Apr 2002 19:18:54 -0700


Update of /cvsroot/python/python/dist/src/Doc/ref
In directory usw-pr-cvs1:/tmp/cvs-serv22170/ref

Modified Files:
	ref5.tex 
Log Message:
Added a missing "|" in the grammar productions used in the reference manual
(reported by François Pinard).
Added some missing "_" characters in the same cluster of productions.
Added missing floor division operator in m_expr production, and mention
floor division in the relevant portion of the text.


Index: ref5.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref5.tex,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** ref5.tex	9 Apr 2002 14:39:10 -0000	1.59
--- ref5.tex	30 Apr 2002 02:18:51 -0000	1.60
***************
*** 649,657 ****
    \production{m_expr}
               {\token{u_expr} | \token{m_expr} "*" \token{u_expr}
                | \token{m_expr} "/" \token{u_expr}}
    \productioncont{| \token{m_expr} "\%" \token{u_expr}}
    \production{a_expr}
!              {\token{m_expr} | \token{aexpr} "+" \token{m_expr}
!               \token{aexpr} "-" \token{m_expr}}
  \end{productionlist}
  
--- 649,658 ----
    \production{m_expr}
               {\token{u_expr} | \token{m_expr} "*" \token{u_expr}
+               | \token{m_expr} "//" \token{u_expr}
                | \token{m_expr} "/" \token{u_expr}}
    \productioncont{| \token{m_expr} "\%" \token{u_expr}}
    \production{a_expr}
!              {\token{m_expr} | \token{a_expr} "+" \token{m_expr}
!               | \token{a_expr} "-" \token{m_expr}}
  \end{productionlist}
  
***************
*** 664,672 ****
  \index{multiplication}
  
! The \code{/} (division) operator yields the quotient of its
! arguments.  The numeric arguments are first converted to a common
! type.  Plain or long integer division yields an integer of the same
! type; the result is that of mathematical division with the `floor'
! function applied to the result.  Division by zero raises the
  \exception{ZeroDivisionError} exception.
  \exindex{ZeroDivisionError}
--- 665,674 ----
  \index{multiplication}
  
! The \code{/} (division) and \code{//} (floor division) operators yield
! the quotient of their arguments.  The numeric arguments are first
! converted to a common type.  Plain or long integer division yields an
! integer of the same type; the result is that of mathematical division
! with the `floor' function applied to the result.  Division by zero
! raises the
  \exception{ZeroDivisionError} exception.
  \exindex{ZeroDivisionError}