aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-12-22 13:58:06 -0800
committerGlenn Morris2012-12-22 13:58:06 -0800
commit2ecfdaa6a9a2c14364f714b138c72e50f1ad30c8 (patch)
tree4c961e4deac229fe3dade826eae5becf0618894a
parentfd7620110dd93e2f83e5cc1e7cb72893ca1b5d1b (diff)
downloademacs-2ecfdaa6a9a2c14364f714b138c72e50f1ad30c8.tar.gz
emacs-2ecfdaa6a9a2c14364f714b138c72e50f1ad30c8.zip
doc/misc/wisent.texi tweaks
* doc/misc/wisent.texi (Wisent Overview): Fix xref. (Grammar format, Understanding the automaton): Avoid overfill.
-rw-r--r--doc/misc/ChangeLog3
-rw-r--r--doc/misc/wisent.texi12
2 files changed, 8 insertions, 7 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index cbb780f998a..83e91e55a36 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,8 @@
12012-12-22 Glenn Morris <rgm@gnu.org> 12012-12-22 Glenn Morris <rgm@gnu.org>
2 2
3 * wisent.texi (Wisent Overview): Fix xref.
4 (Grammar format, Understanding the automaton): Avoid overfill.
5
3 * bovine.texi (Optional Lambda Expression): Allow line break. 6 * bovine.texi (Optional Lambda Expression): Allow line break.
4 7
5 * auth.texi (Help for users): Break long lines. 8 * auth.texi (Help for users): Break long lines.
diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi
index c2c52837b97..83302fba219 100644
--- a/doc/misc/wisent.texi
+++ b/doc/misc/wisent.texi
@@ -112,7 +112,7 @@ of the GNU Compiler Compiler Bison. Its code is a port of the C code
112of GNU Bison 1.28 & 1.31. 112of GNU Bison 1.28 & 1.31.
113 113
114For more details on the basic concepts for understanding Wisent, it is 114For more details on the basic concepts for understanding Wisent, it is
115worthwhile to read the @ref{Top, Bison Manual, bison}. 115worthwhile to read the @ref{Top, Bison Manual, , bison}.
116@ifhtml 116@ifhtml
117@uref{http://www.gnu.org/manual/bison/html_node/index.html}. 117@uref{http://www.gnu.org/manual/bison/html_node/index.html}.
118@end ifhtml 118@end ifhtml
@@ -302,7 +302,7 @@ If @var{components} in a rule is @code{nil}, it means that the rule
302can match the empty string. For example, here is how to define a 302can match the empty string. For example, here is how to define a
303comma-separated sequence of zero or more @samp{exp} groupings: 303comma-separated sequence of zero or more @samp{exp} groupings:
304 304
305@example 305@smallexample
306@group 306@group
307(expseq (nil) ;; expseq: ;; empty 307(expseq (nil) ;; expseq: ;; empty
308 ((expseq1)) ;; | expseq1 308 ((expseq1)) ;; | expseq1
@@ -312,7 +312,7 @@ comma-separated sequence of zero or more @samp{exp} groupings:
312 ((expseq1 ?, exp)) ;; | expseq1 ',' exp 312 ((expseq1 ?, exp)) ;; | expseq1 ',' exp
313 ) ;; ; 313 ) ;; ;
314@end group 314@end group
315@end example 315@end smallexample
316 316
317@cindex precedence level 317@cindex precedence level
318@item precedence 318@item precedence
@@ -339,7 +339,7 @@ serves to stand for its precedence:
339 339
340Now the precedence of @code{UMINUS} can be used in specific rules: 340Now the precedence of @code{UMINUS} can be used in specific rules:
341 341
342@example 342@smallexample
343@group 343@group
344(exp @dots{} ;; exp: @dots{} 344(exp @dots{} ;; exp: @dots{}
345 ((exp ?- exp)) ;; | exp '-' exp 345 ((exp ?- exp)) ;; | exp '-' exp
@@ -348,7 +348,7 @@ Now the precedence of @code{UMINUS} can be used in specific rules:
348 @dots{} ;; @dots{} 348 @dots{} ;; @dots{}
349 ) ;; ; 349 ) ;; ;
350@end group 350@end group
351@end example 351@end smallexample
352 352
353If you forget to append @code{[UMINUS]} to the rule for unary minus, 353If you forget to append @code{[UMINUS]} to the rule for unary minus,
354Wisent silently assumes that minus has its usual precedence. This 354Wisent silently assumes that minus has its usual precedence. This
@@ -1032,7 +1032,6 @@ state 8
1032 $default reduce using rule 2 (exp) 1032 $default reduce using rule 2 (exp)
1033 1033
1034 1034
1035
1036state 9 1035state 9
1037 1036
1038 exp -> exp . '+' exp (rule 1) 1037 exp -> exp . '+' exp (rule 1)
@@ -1047,7 +1046,6 @@ state 9
1047 $default reduce using rule 3 (exp) 1046 $default reduce using rule 3 (exp)
1048 1047
1049 1048
1050
1051state 10 1049state 10
1052 1050
1053 exp -> exp . '+' exp (rule 1) 1051 exp -> exp . '+' exp (rule 1)