summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Glondu <steph@glondu.net>2019-08-05 03:18:09 +0200
committerStephane Glondu <steph@glondu.net>2019-08-05 03:18:09 +0200
commitb2688aff9cd83c5f496f18f92397617a608df3b1 (patch)
tree3f46296dbb4b177a02fcbf6581663a1196d3f4f6
parente0afdda7bed7e3fbdd27876846133d081cc74e90 (diff)
New upstream version 1.6.5
-rw-r--r--Changes3
-rw-r--r--cppo.opam1
-rw-r--r--src/cppo_parser.mly2
3 files changed, 4 insertions, 2 deletions
diff --git a/Changes b/Changes
index e6fd543..45da234 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+2018-09-12: release 1.6.5
+ [bug] Fix 'asr' operator (#61)
+
2018-02-26: release 1.6.4
[compat] Tests should now work with older versions of jbuilder.
diff --git a/cppo.opam b/cppo.opam
index 1d68cb0..75f9aff 100644
--- a/cppo.opam
+++ b/cppo.opam
@@ -16,6 +16,5 @@ build-test: [
depends: [
"jbuilder" {build & >= "1.0+beta17"}
- "base-bytes"
"base-unix"
]
diff --git a/src/cppo_parser.mly b/src/cppo_parser.mly
index 526f66d..21d2cdd 100644
--- a/src/cppo_parser.mly
+++ b/src/cppo_parser.mly
@@ -252,7 +252,7 @@ aexpr:
| aexpr MOD aexpr { `Mod ($2, $1, $3) }
| aexpr LSL aexpr { `Lsl ($1, $3) }
| aexpr LSR aexpr { `Lsr ($1, $3) }
- | aexpr ASR aexpr { `Lsr ($1, $3) }
+ | aexpr ASR aexpr { `Asr ($1, $3) }
| aexpr LAND aexpr { `Land ($1, $3) }
| aexpr LOR aexpr { `Lor ($1, $3) }
| aexpr LXOR aexpr { `Lxor ($1, $3) }