diff options
| author | Daniel de Rauglaudre <daniel.de_rauglaudre@inria.fr> | 2002-02-06 19:59:28 +0000 |
|---|---|---|
| committer | Daniel de Rauglaudre <daniel.de_rauglaudre@inria.fr> | 2002-02-06 19:59:28 +0000 |
| commit | a79dad704fba2e8f789e82752fdb7978eb3ea0c4 (patch) | |
| tree | db917c98680f3932983278ac56c8aabcce9c4182 | |
| parent | 6751d4d736847e5071caa22487908686dc9bac0e (diff) | |
-
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4359 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | camlp4/CHANGES | 1 | ||||
| -rw-r--r-- | camlp4/etc/pa_o.ml | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/camlp4/CHANGES b/camlp4/CHANGES index f141b9a26..b3c5abac9 100644 --- a/camlp4/CHANGES +++ b/camlp4/CHANGES @@ -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). diff --git a/camlp4/etc/pa_o.ml b/camlp4/etc/pa_o.ml index 52d4a519d..c61c92766 100644 --- a/camlp4/etc/pa_o.ml +++ b/camlp4/etc/pa_o.ml @@ -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$ >> |