git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4359 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Daniel de Rauglaudre 2002-02-06 19:59:28 +00:00
parent 6751d4d736
commit a79dad704f
2 changed files with 2 additions and 4 deletions

View File

@ -1,6 +1,7 @@
Camlp4 Version 3.04+5
---------------------
- [06 Feb 02] Added missing infix "%" in pa_o (normal syntax).
- [06 Feb 02] Added Grammar.print_entry printing any kind of (obj) entry
and having the Format.formatter as first parameter (Grammar.Entry.print
and its equivalent in functorial interface call it).

View File

@ -538,14 +538,11 @@ EXTEND
| "+" LEFTA
[ e1 = SELF; "+"; e2 = SELF -> <:expr< $e1$ + $e2$ >>
| e1 = SELF; "-"; e2 = SELF -> <:expr< $e1$ - $e2$ >>
| e1 = SELF; "+."; e2 = SELF -> <:expr< $e1$ +. $e2$ >>
| e1 = SELF; "-."; e2 = SELF -> <:expr< $e1$ -. $e2$ >>
| e1 = SELF; op = infixop2; e2 = SELF -> <:expr< $lid:op$ $e1$ $e2$ >> ]
| "*" LEFTA
[ e1 = SELF; "*"; e2 = SELF -> <:expr< $e1$ * $e2$ >>
| e1 = SELF; "/"; e2 = SELF -> <:expr< $e1$ / $e2$ >>
| e1 = SELF; "*."; e2 = SELF -> <:expr< $e1$ *. $e2$ >>
| e1 = SELF; "/."; e2 = SELF -> <:expr< $e1$ /. $e2$ >>
| e1 = SELF; "%"; e2 = SELF -> <:expr< $lid:"%"$ $e1$ $e2$ >>
| e1 = SELF; "land"; e2 = SELF -> <:expr< $e1$ land $e2$ >>
| e1 = SELF; "lor"; e2 = SELF -> <:expr< $e1$ lor $e2$ >>
| e1 = SELF; "lxor"; e2 = SELF -> <:expr< $e1$ lxor $e2$ >>