From cae0dfb1aa19e0fd92a1a8c73e6f610527cb3e06 Mon Sep 17 00:00:00 2001 From: John David Pressman Date: Sun, 27 Oct 2019 12:05:34 -0700 Subject: [PATCH] Change names to the standard library names for the functions in OCaml --- src/passes/operators/operators.ml | 6 +++--- src/test/contracts/bitwise_arithmetic.mligo | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/passes/operators/operators.ml b/src/passes/operators/operators.ml index 9ba53c1b5..e1ebfc2e5 100644 --- a/src/passes/operators/operators.ml +++ b/src/passes/operators/operators.ml @@ -177,9 +177,9 @@ module Simplify = struct ("Big_map.literal" , "BIG_MAP_LITERAL" ) ; ("Big_map.empty" , "BIG_MAP_EMPTY" ) ; - ("Bitwise.bor" , "OR") ; - ("Bitwise.band" , "AND") ; - ("Bitwise.xor" , "XOR") ; + ("Bitwise.lor" , "OR") ; + ("Bitwise.land" , "AND") ; + ("Bitwise.lxor" , "XOR") ; ("String.length", "SIZE") ; ("String.size", "SIZE") ; diff --git a/src/test/contracts/bitwise_arithmetic.mligo b/src/test/contracts/bitwise_arithmetic.mligo index 81671b800..831592c70 100644 --- a/src/test/contracts/bitwise_arithmetic.mligo +++ b/src/test/contracts/bitwise_arithmetic.mligo @@ -1,10 +1,10 @@ (* Test CameLIGO bitwise operators *) let or_op (n : nat) : nat = - Bitwise.bor n 4p + Bitwise.lor n 4p let and_op (n : nat) : nat = - Bitwise.band n 7p + Bitwise.land n 7p let xor_op (n : nat) : nat = - Bitwise.xor n 7p + Bitwise.lxor n 7p