Merge branch 'master' of https://github.com/z3prover/z3

src/api/python/z3/z3.py

@@ -6054,6 +6054,24 @@ class Solver(Z3PPObject):
         """
         Z3_solver_pop(self.ctx.ref(), self.solver, num)
 
+    def num_scopes(self):
+        """Return the current number of backtracking points.
+
+        >>> s = Solver()
+        >>> s.num_scopes()
+        0L
+        >>> s.push()
+        >>> s.num_scopes()
+        1L
+        >>> s.push()
+        >>> s.num_scopes()
+        2L
+        >>> s.pop()
+        >>> s.num_scopes()
+        1L
+        """
+        return Z3_solver_get_num_scopes(self.ctx.ref(), self.solver)
+
     def reset(self):
         """Remove all asserted constraints and backtracking points created using `push()`.
 

src/api/z3_api.h

@@ -421,7 +421,7 @@ typedef enum
      It has the same semantics as Z3_OP_BUREM, but created in a context where the second operand can be assumed to be non-zero.
 
    - Z3_OP_BSMOD_I: Binary signed modulus.
-     It has the same semantics as Z3_OP_BSMOND, but created in a context where the second operand can be assumed to be non-zero.
+     It has the same semantics as Z3_OP_BSMOD, but created in a context where the second operand can be assumed to be non-zero.
 
    - Z3_OP_PR_UNDEF: Undef/Null proof object.