diff options
author | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2015-12-08 18:12:27 +0100 |
---|---|---|
committer | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2015-12-08 18:12:27 +0100 |
commit | e70165079e8defe490a568ece20a7029e4c1626e (patch) | |
tree | 7e8ad97cbe6e06251fae9cc2da48acc8ab36d303 /dev | |
parent | 071a458681254716a83b1802d5b6a30edda37892 (diff) | |
parent | 19ea51a4b7f7debbe5bdeb2b2689cddadd9876f4 (diff) |
Merge branch 'v8.5'
Diffstat (limited to 'dev')
-rw-r--r-- | dev/db | 2 | ||||
-rw-r--r-- | dev/v8-syntax/syntax-v8.tex | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -1,5 +1,3 @@ -load_printer "gramlib.cma" -load_printer "str.cma" load_printer "printers.cma" install_printer Top_printers.ppfuture diff --git a/dev/v8-syntax/syntax-v8.tex b/dev/v8-syntax/syntax-v8.tex index 6630be06a..64431ea16 100644 --- a/dev/v8-syntax/syntax-v8.tex +++ b/dev/v8-syntax/syntax-v8.tex @@ -81,7 +81,7 @@ Parenthesis are used to group regexps. Beware to distinguish this operator $\GR{~}$ from the terminals $\ETERM{( )}$, and $\mid$ from terminal \TERMbar. -Rules are optionaly annotated in the right margin with: +Rules are optionally annotated in the right margin with: \begin{itemize} \item a precedence and associativity (L for left, R for right and N for no associativity), indicating how to solve conflicts; lower levels are tighter; |