doc: fix mfcalc code.

[bison.git] / doc / bison.texinfo

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 3bb41ab0da96e56c32c734fdc25362311133932a..8391e71445b62f695591051f60fa8665d1e5fd0e 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -1178,8 +1178,8 @@ Another Bison feature requiring special consideration is @code{YYERROR}
 initiate error recovery.
 During deterministic GLR operation, the effect of @code{YYERROR} is
 the same as its effect in a deterministic parser.
 initiate error recovery.
 During deterministic GLR operation, the effect of @code{YYERROR} is
 the same as its effect in a deterministic parser.

-The effect in a deferred action is similar, but the precise point of the 
-error is undefined;  instead, the parser reverts to deterministic operation, 
+The effect in a deferred action is similar, but the precise point of the
+error is undefined;  instead, the parser reverts to deterministic operation,

 selecting an unspecified stack on which to continue with a syntax error.
 In a semantic predicate (see @ref{Semantic Predicates}) during nondeterministic
 parsing, @code{YYERROR} silently prunes
 selecting an unspecified stack on which to continue with a syntax error.
 In a semantic predicate (see @ref{Semantic Predicates}) during nondeterministic
 parsing, @code{YYERROR} silently prunes


@@ -1210,12 +1210,12 @@ widget :
 @end smallexample
 
 @noindent
 @end smallexample
 
 @noindent

-is one way to allow the same parser to handle two different syntaxes for 
+is one way to allow the same parser to handle two different syntaxes for

 widgets.  The clause preceded by @code{%?} is treated like an ordinary
 action, except that its text is treated as an expression and is always
 widgets.  The clause preceded by @code{%?} is treated like an ordinary
 action, except that its text is treated as an expression and is always

-evaluated immediately (even when in nondeterministic mode).  If the 
+evaluated immediately (even when in nondeterministic mode).  If the

 expression yields 0 (false), the clause is treated as a syntax error,
 expression yields 0 (false), the clause is treated as a syntax error,

-which, in a nondeterministic parser, causes the stack in which it is reduced 
+which, in a nondeterministic parser, causes the stack in which it is reduced

 to die.  In a deterministic parser, it acts like YYERROR.
 
 As the example shows, predicates otherwise look like semantic actions, and
 to die.  In a deterministic parser, it acts like YYERROR.
 
 As the example shows, predicates otherwise look like semantic actions, and


@@ -1226,7 +1226,7 @@ labels.
 
 There is a subtle difference between semantic predicates and ordinary
 actions in nondeterministic mode, since the latter are deferred.
 
 There is a subtle difference between semantic predicates and ordinary
 actions in nondeterministic mode, since the latter are deferred.

-For example, we could try to rewrite the previous example as 
+For example, we could try to rewrite the previous example as

 
 @smallexample
 widget :
 
 @smallexample
 widget :


@@ -1240,7 +1240,7 @@ widget :
 false).  However, this
 does @emph{not} have the same effect if @code{new_args} and @code{old_args}
 have overlapping syntax.
 false).  However, this
 does @emph{not} have the same effect if @code{new_args} and @code{old_args}
 have overlapping syntax.

-Since the mid-rule actions testing @code{new_syntax} are deferred, 
+Since the mid-rule actions testing @code{new_syntax} are deferred,

 a GLR parser first encounters the unresolved ambiguous reduction
 for cases where @code{new_args} and @code{old_args} recognize the same string
 @emph{before} performing the tests of @code{new_syntax}.  It therefore
 a GLR parser first encounters the unresolved ambiguous reduction
 for cases where @code{new_args} and @code{old_args} recognize the same string
 @emph{before} performing the tests of @code{new_syntax}.  It therefore


@@ -2300,17 +2300,17 @@ Here is a sample session with the multi-function calculator:
 @example
 $ @kbd{mfcalc}
 @kbd{pi = 3.141592653589}
 @example
 $ @kbd{mfcalc}
 @kbd{pi = 3.141592653589}

-3.1415926536
+@result{} 3.1415926536

 @kbd{sin(pi)}
 @kbd{sin(pi)}

-0.0000000000
+@result{} 0.0000000000

 @kbd{alpha = beta1 = 2.3}
 @kbd{alpha = beta1 = 2.3}

-2.3000000000
+@result{} 2.3000000000

 @kbd{alpha}
 @kbd{alpha}

-2.3000000000
+@result{} 2.3000000000

 @kbd{ln(alpha)}
 @kbd{ln(alpha)}

-0.8329091229
+@result{} 0.8329091229

 @kbd{exp(ln(beta1))}
 @kbd{exp(ln(beta1))}

-2.3000000000
+@result{} 2.3000000000

 $
 @end example
 
 $
 @end example
 


@@ -2327,11 +2327,12 @@ Note that multiple assignment and nested function calls are permitted.
 
 Here are the C and Bison declarations for the multi-function calculator.
 
 
 Here are the C and Bison declarations for the multi-function calculator.
 

+@comment file: mfcalc.y

 @smallexample
 @group
 %@{
 @smallexample
 @group
 %@{

-  #include <math.h>  /* For math functions, cos(), sin(), etc.  */
-  #include "calc.h"  /* Contains definition of `symrec'.  */
+  #include <stdio.h>  /* For printf, etc. */
+  #include "calc.h"   /* Contains definition of `symrec'.  */

   int yylex (void);
   void yyerror (char const *);
 %@}
   int yylex (void);
   void yyerror (char const *);
 %@}


@@ -2385,6 +2386,7 @@ Here are the grammar rules for the multi-function calculator.
 Most of them are copied directly from @code{calc}; three rules,
 those which mention @code{VAR} or @code{FNCT}, are new.
 
 Most of them are copied directly from @code{calc}; three rules,
 those which mention @code{VAR} or @code{FNCT}, are new.
 

+@comment file: mfcalc.y

 @smallexample
 @group
 input:   /* empty */
 @smallexample
 @group
 input:   /* empty */


@@ -2395,8 +2397,8 @@ input:   /* empty */
 @group
 line:
           '\n'
 @group
 line:
           '\n'

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

 ;
 @end group
 
 ;
 @end group
 


@@ -2431,6 +2433,7 @@ The symbol table itself consists of a linked list of records.  Its
 definition, which is kept in the header @file{calc.h}, is as follows.  It
 provides for either functions or variables to be placed in the table.
 
 definition, which is kept in the header @file{calc.h}, is as follows.  It
 provides for either functions or variables to be placed in the table.
 

+@comment file: calc.h

 @smallexample
 @group
 /* Function type.  */
 @smallexample
 @group
 /* Function type.  */


@@ -2467,6 +2470,7 @@ The new version of @code{main} includes a call to @code{init_table}, a
 function that initializes the symbol table.  Here it is, and
 @code{init_table} as well:
 
 function that initializes the symbol table.  Here it is, and
 @code{init_table} as well:
 

+@comment file: mfcalc.y

 @smallexample
 #include <stdio.h>
 
 @smallexample
 #include <stdio.h>
 


@@ -2488,15 +2492,16 @@ struct init
 @end group
 
 @group
 @end group
 
 @group

+#include <math.h>  /* Math functions, cos(), sin(), etc.  */

 struct init const arith_fncts[] =
 @{
 struct init const arith_fncts[] =
 @{

-  "sin",  sin,
-  "cos",  cos,
-  "atan", atan,
-  "ln",   log,
-  "exp",  exp,
-  "sqrt", sqrt,
-  0, 0
+  @{ "atan", atan @},
+  @{ "cos",  cos  @},
+  @{ "exp",  exp  @},
+  @{ "ln",   log  @},
+  @{ "sin",  sin  @},
+  @{ "sqrt", sqrt @},
+  @{ 0, 0 @},

 @};
 @end group
 
 @};
 @end group
 


@@ -2507,6 +2512,7 @@ symrec *sym_table;
 
 @group
 /* Put arithmetic functions in table.  */
 
 @group
 /* Put arithmetic functions in table.  */

+static

 void
 init_table (void)
 @{
 void
 init_table (void)
 @{


@@ -2540,7 +2546,11 @@ linked to the front of the list, and a pointer to the object is returned.
 The function @code{getsym} is passed the name of the symbol to look up.  If
 found, a pointer to that symbol is returned; otherwise zero is returned.
 
 The function @code{getsym} is passed the name of the symbol to look up.  If
 found, a pointer to that symbol is returned; otherwise zero is returned.
 

+@comment file: mfcalc.y

 @smallexample
 @smallexample

+#include <stdlib.h> /* malloc. */
+#include <string.h> /* strlen. */
+

 symrec *
 putsym (char const *sym_name, int sym_type)
 @{
 symrec *
 putsym (char const *sym_name, int sym_type)
 @{


@@ -2582,6 +2592,7 @@ returned to @code{yyparse}.
 No change is needed in the handling of numeric values and arithmetic
 operators in @code{yylex}.
 
 No change is needed in the handling of numeric values and arithmetic
 operators in @code{yylex}.
 

+@comment file: mfcalc.y

 @smallexample
 @group
 #include <ctype.h>
 @smallexample
 @group
 #include <ctype.h>


@@ -2624,7 +2635,10 @@ yylex (void)
       /* Initially make the buffer long enough
          for a 40-character symbol name.  */
       if (length == 0)
       /* Initially make the buffer long enough
          for a 40-character symbol name.  */
       if (length == 0)

-        length = 40, symbuf = (char *)malloc (length + 1);
+        @{
+          length = 40;
+          symbuf = (char *) malloc (length + 1);
+        @}

 
       i = 0;
       do
 
       i = 0;
       do


@@ -7745,7 +7759,7 @@ that allows variable-length arrays.  The default is 200.
 Do not allow @code{YYINITDEPTH} to be greater than @code{YYMAXDEPTH}.
 
 You can generate a deterministic parser containing C++ user code from
 Do not allow @code{YYINITDEPTH} to be greater than @code{YYMAXDEPTH}.
 
 You can generate a deterministic parser containing C++ user code from

-the default (C) skeleton, as well as from the C++ skeleton 
+the default (C) skeleton, as well as from the C++ skeleton

 (@pxref{C++ Parsers}).  However, if you do use the default skeleton
 and want to allow the parsing stack to grow,
 be careful not to use semantic types or location types that require
 (@pxref{C++ Parsers}).  However, if you do use the default skeleton
 and want to allow the parsing stack to grow,
 be careful not to use semantic types or location types that require


@@ -9270,7 +9284,8 @@ scanner should use @code{yy::parser::token::FOO}.  The scanner can use
 
 @defcv {Type} {parser} {syntax_error}
 This class derives from @code{std::runtime_error}.  Throw instances of it
 
 @defcv {Type} {parser} {syntax_error}
 This class derives from @code{std::runtime_error}.  Throw instances of it

-from user actions to raise parse errors.  This is equivalent with first
+from the scanner or from the user actions to raise parse errors.  This is
+equivalent with first

 invoking @code{error} to report the location and message of the syntax
 error, and then to invoke @code{YYERROR} to enter the error-recovery mode.
 But contrary to @code{YYERROR} which can only be invoked from user actions
 invoking @code{error} to report the location and message of the syntax
 error, and then to invoke @code{YYERROR} to enter the error-recovery mode.
 But contrary to @code{YYERROR} which can only be invoked from user actions


@@ -10937,7 +10952,7 @@ transcript of the build session, starting with the invocation of
 send additional files as well (such as `config.h' or `config.cache').
 
 Patches are most welcome, but not required.  That is, do not hesitate to
 send additional files as well (such as `config.h' or `config.cache').
 
 Patches are most welcome, but not required.  That is, do not hesitate to

-send a bug report just because you can not provide a fix.
+send a bug report just because you cannot provide a fix.

 
 Send bug reports to @email{bug-bison@@gnu.org}.
 
 
 Send bug reports to @email{bug-bison@@gnu.org}.