Merge pull request #157 from soronpo/bitwise

Add bitwise operations

Author: Oron Port

src/main/scala/singleton/ops/impl/GeneralMacros.scala

@@ -75,6 +75,8 @@ trait GeneralMacros {
     val != = symbolOf[OpId.!=]
     val && = symbolOf[OpId.&&]
     val || = symbolOf[OpId.||]
+    val BitwiseAnd = symbolOf[OpId.BitwiseAnd]
+    val BitwiseOr = symbolOf[OpId.BitwiseOr]
     val Pow = symbolOf[OpId.Pow]
     val Min = symbolOf[OpId.Min]
     val Max = symbolOf[OpId.Max]
@@ -1207,6 +1209,16 @@ trait GeneralMacros {
         case _ => unsupported()
       }
     }
+    def BitwiseAnd : Calc = (a, b) match {
+      case (CalcVal(at : Int, att), CalcVal(bt : Int, btt)) => CalcVal(at & bt, q"$att & $btt")
+      case (CalcVal(at : Long, att), CalcVal(bt : Long, btt)) => CalcVal(at & bt, q"$att & $btt")
+      case _ => unsupported()
+    }
+    def BitwiseOr : Calc = (a, b) match {
+      case (CalcVal(at : Int, att), CalcVal(bt : Int, btt)) => CalcVal(at | bt, q"$att | $btt")
+      case (CalcVal(at : Long, att), CalcVal(bt : Long, btt)) => CalcVal(at | bt, q"$att | $btt")
+      case _ => unsupported()
+    }
     def Or : Calc = a match {
       case CalcLit.Boolean(ab) => //`Or` expressions where the LHS is a literal can be inlined
         if (!ab) b match {
@@ -1350,6 +1362,8 @@ trait GeneralMacros {
       case funcTypes.!= => Neq
       case funcTypes.&& => And
       case funcTypes.|| => Or
+      case funcTypes.BitwiseAnd => BitwiseAnd
+      case funcTypes.BitwiseOr => BitwiseOr
       case funcTypes.Pow => Pow
       case funcTypes.Min => Min
       case funcTypes.Max => Max

src/main/scala/singleton/ops/impl/OpId.scala

@@ -47,6 +47,8 @@ object OpId {
   sealed trait != extends OpId
   sealed trait || extends OpId
   sealed trait && extends OpId
+  sealed trait BitwiseOr extends OpId
+  sealed trait BitwiseAnd extends OpId
   sealed trait Min extends OpId
   sealed trait Max extends OpId
   sealed trait Substring extends OpId

src/main/scala/singleton/ops/package.scala

@@ -126,6 +126,8 @@ package object ops {
   type !=[P1, P2]           = OpMacro[OpId.!=, P1, P2, NP]
   type &&[P1, P2]           = OpMacro[OpId.&&, P1, P2, NP]
   type ||[P1, P2]           = OpMacro[OpId.||, P1, P2, NP]
+  type BitwiseAnd[P1, P2]   = OpMacro[OpId.BitwiseAnd, P1, P2, NP]
+  type BitwiseOr[P1, P2]    = OpMacro[OpId.BitwiseOr, P1, P2, NP]
   type SubSequence[S, IBeg, IEnd] = OpMacro[OpId.SubSequence, S, IBeg, IEnd]
   type Substring[S, I]       = OpMacro[OpId.Substring, S, I, NP]
   type StartsWith[S, Prefix] = OpMacro[OpId.StartsWith, S, Prefix, NP]

src/test/scala/singleton/ops/BitwiseAndSpec.scala

@@ -0,0 +1,19 @@
+package singleton.ops
+
+import org.scalacheck.Properties
+import singleton.TestUtils._
+
+class BitwiseAndSpec extends Properties("BitwiseAnd") {
+  property("Int checks") = wellTyped {
+    implicitly[Require[(W.`9`.T BitwiseAnd W.`1`.T) == W.`1`.T]]
+    implicitly[Require[(W.`9`.T BitwiseAnd W.`8`.T) == W.`8`.T]]
+    implicitly[Require[(W.`9`.T BitwiseAnd W.`9`.T) == W.`9`.T]]
+    implicitly[Require[(W.`9`.T BitwiseAnd W.`0`.T) == W.`0`.T]]
+  }
+  property("Long checks") = wellTyped {
+    implicitly[Require[(W.`9L`.T BitwiseAnd W.`1L`.T) == W.`1L`.T]]
+    implicitly[Require[(W.`9L`.T BitwiseAnd W.`8L`.T) == W.`8L`.T]]
+    implicitly[Require[(W.`9L`.T BitwiseAnd W.`9L`.T) == W.`9L`.T]]
+    implicitly[Require[(W.`9L`.T BitwiseAnd W.`0L`.T) == W.`0L`.T]]
+  }
+}

src/test/scala/singleton/ops/BitwiseOrSpec.scala

@@ -0,0 +1,19 @@
+package singleton.ops
+
+import org.scalacheck.Properties
+import singleton.TestUtils._
+
+class BitwiseOrSpec extends Properties("BitwiseOr") {
+  property("Int checks") = wellTyped {
+    implicitly[Require[(W.`9`.T BitwiseOr W.`1`.T) == W.`9`.T]]
+    implicitly[Require[(W.`9`.T BitwiseOr W.`8`.T) == W.`9`.T]]
+    implicitly[Require[(W.`1`.T BitwiseOr W.`8`.T) == W.`9`.T]]
+    implicitly[Require[(W.`9`.T BitwiseOr W.`0`.T) == W.`9`.T]]
+  }
+  property("Long checks") = wellTyped {
+    implicitly[Require[(W.`9L`.T BitwiseOr W.`1L`.T) == W.`9L`.T]]
+    implicitly[Require[(W.`9L`.T BitwiseOr W.`8L`.T) == W.`9L`.T]]
+    implicitly[Require[(W.`1L`.T BitwiseOr W.`8L`.T) == W.`9L`.T]]
+    implicitly[Require[(W.`9L`.T BitwiseOr W.`0L`.T) == W.`9L`.T]]
+  }
+}

src/test/scala/singleton/ops/UnsupportedSpec.scala

@@ -49,6 +49,8 @@ class UnsupportedSpec extends Properties("UnsupportedSpec") {
   property("!=") = wellTyped {illTyped("""implicitly[W.`true`.T != W.`2`.T]""")}
   property("&&") = wellTyped {illTyped("""implicitly[W.`1`.T && W.`2`.T]""")}
   property("||") = wellTyped {illTyped("""implicitly[W.`1`.T || W.`2`.T]""")}
+  property("BitwiseAnd") = wellTyped {illTyped("""implicitly[W.`1`.T BitwiseAnd W.`true`.T]""")}
+  property("BitwiseOr") = wellTyped {illTyped("""implicitly[W.`1`.T BitwiseOr W.`true`.T]""")}
   property("Pow") = wellTyped {illTyped("""implicitly[Pow[W.`true`.T, W.`2`.T]]""")}
   property("Min") = wellTyped {illTyped("""implicitly[Min[W.`true`.T, W.`2`.T]]""")}
   property("Max") = wellTyped {illTyped("""implicitly[Max[W.`true`.T, W.`2`.T]]""")}