doc: check the rpcalc.

[bison.git] / doc / bison.texinfo

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 7fb051553684245f3a40256a2a661468c8e96e68..0f5dbbb3f9cd5f4ebe912e4402fd140733aaf0c9 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -163,9 +163,9 @@ Reverse Polish Notation Calculator
 
 Grammar Rules for @code{rpcalc}
 
 
 Grammar Rules for @code{rpcalc}
 

-* Rpcalc Input::
-* Rpcalc Line::
-* Rpcalc Expr::
+* Rpcalc Input::            Explanation of the @code{input} nonterminal
+* Rpcalc Line::             Explanation of the @code{line} nonterminal
+* Rpcalc Expr::             Explanation of the @code{expr} nonterminal

 
 Location Tracking Calculator: @code{ltcalc}
 
 
 Location Tracking Calculator: @code{ltcalc}
 


@@ -1517,11 +1517,13 @@ The source code for this calculator is named @file{rpcalc.y}.  The
 Here are the C and Bison declarations for the reverse polish notation
 calculator.  As in C, comments are placed between @samp{/*@dots{}*/}.
 
 Here are the C and Bison declarations for the reverse polish notation
 calculator.  As in C, comments are placed between @samp{/*@dots{}*/}.
 

+@comment file: rpcalc.y

 @example
 /* Reverse polish notation calculator.  */
 
 %@{
   #define YYSTYPE double
 @example
 /* Reverse polish notation calculator.  */
 
 %@{
   #define YYSTYPE double

+  #include <stdio.h>

   #include <math.h>
   int yylex (void);
   void yyerror (char const *);
   #include <math.h>
   int yylex (void);
   void yyerror (char const *);


@@ -1566,13 +1568,14 @@ type for numeric constants.
 
 Here are the grammar rules for the reverse polish notation calculator.
 
 
 Here are the grammar rules for the reverse polish notation calculator.
 

+@comment file: rpcalc.y

 @example
 input:    /* empty */
         | input line
 ;
 
 line:     '\n'
 @example
 input:    /* empty */
         | input line
 ;
 
 line:     '\n'

-        | exp '\n'      @{ printf ("\t%.10g\n", $1); @}
+        | exp '\n'      @{ printf ("%.10g\n", $1); @}

 ;
 
 exp:      NUM           @{ $$ = $1;           @}
 ;
 
 exp:      NUM           @{ $$ = $1;           @}


@@ -1607,9 +1610,9 @@ main job of most actions.  The semantic values of the components of the
 rule are referred to as @code{$1}, @code{$2}, and so on.
 
 @menu
 rule are referred to as @code{$1}, @code{$2}, and so on.
 
 @menu

-* Rpcalc Input::
-* Rpcalc Line::
-* Rpcalc Expr::
+* Rpcalc Input::            Explanation of the @code{input} nonterminal
+* Rpcalc Line::             Explanation of the @code{line} nonterminal
+* Rpcalc Expr::             Explanation of the @code{expr} nonterminal

 @end menu
 
 @node Rpcalc Input
 @end menu
 
 @node Rpcalc Input


@@ -1653,7 +1656,7 @@ Now consider the definition of @code{line}:
 
 @example
 line:     '\n'
 
 @example
 line:     '\n'

-        | exp '\n'  @{ printf ("\t%.10g\n", $1); @}
+        | exp '\n'  @{ printf ("%.10g\n", $1); @}

 ;
 @end example
 
 ;
 @end example
 


@@ -1769,6 +1772,7 @@ A token type code of zero is returned if the end-of-input is encountered.
 
 Here is the code for the lexical analyzer:
 
 
 Here is the code for the lexical analyzer:
 

+@comment file: rpcalc.y

 @example
 @group
 /* The lexical analyzer returns a double floating point
 @example
 @group
 /* The lexical analyzer returns a double floating point


@@ -1817,6 +1821,7 @@ In keeping with the spirit of this example, the controlling function is
 kept to the bare minimum.  The only requirement is that it call
 @code{yyparse} to start the process of parsing.
 
 kept to the bare minimum.  The only requirement is that it call
 @code{yyparse} to start the process of parsing.
 

+@comment file: rpcalc.y

 @example
 @group
 int
 @example
 @group
 int


@@ -1837,6 +1842,7 @@ always @code{"syntax error"}).  It is up to the programmer to supply
 @code{yyerror} (@pxref{Interface, ,Parser C-Language Interface}), so
 here is the definition we will use:
 
 @code{yyerror} (@pxref{Interface, ,Parser C-Language Interface}), so
 here is the definition we will use:
 

+@comment file: rpcalc.y

 @example
 @group
 #include <stdio.h>
 @example
 @group
 #include <stdio.h>


@@ -1919,15 +1925,15 @@ example session using @code{rpcalc}.
 @example
 $ @kbd{rpcalc}
 @kbd{4 9 +}
 @example
 $ @kbd{rpcalc}
 @kbd{4 9 +}

-13
+@result{} 13

 @kbd{3 7 + 3 4 5 *+-}
 @kbd{3 7 + 3 4 5 *+-}

--13
+@result{} -13

 @kbd{3 7 + 3 4 5 * + - n}              @r{Note the unary minus, @samp{n}}
 @kbd{3 7 + 3 4 5 * + - n}              @r{Note the unary minus, @samp{n}}

-13
+@result{} 13

 @kbd{5 6 / 4 n +}
 @kbd{5 6 / 4 n +}

--3.166666667
+@result{} -3.166666667

 @kbd{3 4 ^}                            @r{Exponentiation}
 @kbd{3 4 ^}                            @r{Exponentiation}

-81
+@result{} 81

 @kbd{^D}                               @r{End-of-file indicator}
 $
 @end example
 @kbd{^D}                               @r{End-of-file indicator}
 $
 @end example


@@ -4194,7 +4200,7 @@ In references, in order to specify names containing dots and dashes, an explicit
 bracketed syntax @code{$[name]} and @code{@@[name]} must be used:
 @example
 @group
 bracketed syntax @code{$[name]} and @code{@@[name]} must be used:
 @example
 @group

-if-stmt: IF '(' expr ')' THEN then.stmt ';'
+if-stmt: "if" '(' expr ')' "then" then.stmt ';'

   @{ $[if-stmt] = new_if_stmt ($expr, $[then.stmt]); @}
 @end group
 @end example
   @{ $[if-stmt] = new_if_stmt ($expr, $[then.stmt]); @}
 @end group
 @end example