consistent naming of all memoryview slice and cython.memoryview references.

7 files changed, 54 insertions, 52 deletions

diff --git a/Cython/Compiler/Buffer.py b/Cython/Compiler/Buffer.py
index 207e7fe43..e106bc4e7 100644
--- a/Cython/Compiler/Buffer.py
+++ b/Cython/Compiler/Buffer.py
@@ -57,10 +57,10 @@ class IntroduceBufferAuxiliaryVars(CythonTransform):
         if len(bufvars) > 0:
             self.buffers_exists = True
 
-        memviewvars = [entry for name, entry
+        memviewslicevars = [entry for name, entry
                 in scope.entries.iteritems()
-                if entry.type.is_memoryview]
-        if len(memviewvars) > 0:
+                if entry.type.is_memoryviewslice]
+        if len(memviewslicevars) > 0:
             self.buffers_exists = True
 
 
diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
index f46dd9fa4..2fa9ce2f7 100644
--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@ -495,10 +495,10 @@ class ExprNode(Node):
         src_is_py_type = src_type.is_pyobject
         dst_is_py_type = dst_type.is_pyobject
 
-        if dst_type.is_memoryview:
+        if dst_type.is_memoryviewslice:
             import MemoryView
-            if not src.type.is_memoryview:
-                src = CoerceToMemViewNode(src, dst_type, env)
+            if not src.type.is_memoryviewslice:
+                src = CoerceToMemViewSliceNode(src, dst_type, env)
             elif not MemoryView.src_conforms_to_dst(src.type, dst_type):
                 error(self.pos, "Memoryview '%s' not conformable to memoryview '%s'." %
                         (src.type, dst_type))
@@ -1213,8 +1213,8 @@ class NameNode(AtomicExprNode):
                 rhs.generate_disposal_code(code)
                 rhs.free_temps(code)
         else:
-            if self.type.is_memoryview:
-                self.generate_acquire_memoryview(rhs, code)
+            if self.type.is_memoryviewslice:
+                self.generate_acquire_memoryviewslice(rhs, code)
 
             elif self.type.is_buffer:
                 # Generate code for doing the buffer release/acquisition.
@@ -1245,7 +1245,7 @@ class NameNode(AtomicExprNode):
                         code.put_decref(self.result(), self.ctype())
                 if entry.is_cglobal:
                     code.put_giveref(rhs.py_result())
-            if not self.type.is_memoryview:
+            if not self.type.is_memoryviewslice:
                 code.putln('%s = %s;' % (self.result(), rhs.result_as(self.ctype())))
             if debug_disposal_code:
                 print("NameNode.generate_assignment_code:")
@@ -1253,9 +1253,9 @@ class NameNode(AtomicExprNode):
             rhs.generate_post_assignment_code(code)
             rhs.free_temps(code)
 
-    def generate_acquire_memoryview(self, rhs, code):
+    def generate_acquire_memoryviewslice(self, rhs, code):
         import MemoryView
-        MemoryView.put_assign_to_memview(self.result(), rhs.result(), self.type,
+        MemoryView.put_assign_to_memviewslice(self.result(), rhs.result(), self.type,
                                          pos=self.pos, code=code)
         if rhs.is_temp:
             code.put_xdecref_clear("%s.memview" % rhs.result(), py_object_type)
@@ -2902,13 +2902,13 @@ class AttributeNode(ExprNode):
                 code.put_giveref(rhs.py_result())
                 code.put_gotref(select_code)
                 code.put_decref(select_code, self.ctype())
-            elif self.type.is_memoryview:
+            elif self.type.is_memoryviewslice:
                 import MemoryView
-                MemoryView.put_assign_to_memview(select_code, rhs.result(), self.type,
+                MemoryView.put_assign_to_memviewslice(select_code, rhs.result(), self.type,
                         pos=self.pos, code=code)
                 if rhs.is_temp:
                     code.put_xdecref_clear("%s.memview" % rhs.result(), py_object_type)
-            if not self.type.is_memoryview:
+            if not self.type.is_memoryviewslice:
                 code.putln(
                     "%s = %s;" % (
                         select_code,
@@ -5135,11 +5135,11 @@ class CoercionNode(ExprNode):
             file, line, col = self.pos
             code.annotate((file, line, col-1), AnnotationItem(style='coerce', tag='coerce', text='[%s] to [%s]' % (self.arg.type, self.type)))
 
-class CoerceToMemViewNode(CoercionNode):
+class CoerceToMemViewSliceNode(CoercionNode):
 
     def __init__(self, arg, dst_type, env):
-        assert dst_type.is_memoryview
-        assert not arg.type.is_memoryview
+        assert dst_type.is_memoryviewslice
+        assert not arg.type.is_memoryviewslice
         CoercionNode.__init__(self, arg)
         self.type = dst_type
         self.env = env
diff --git a/Cython/Compiler/MemoryView.py b/Cython/Compiler/MemoryView.py
index b10cf479d..1cd327d53 100644
--- a/Cython/Compiler/MemoryView.py
+++ b/Cython/Compiler/MemoryView.py
@@ -70,7 +70,7 @@ def put_init_entry(mv_cname, code):
     code.put_init_to_py_none("%s.memview" % mv_cname, cython_memoryview_type)
     code.put_giveref("%s.memview" % mv_cname)
 
-def put_assign_to_memview(lhs_cname, rhs_cname, memviewtype, pos, code):
+def put_assign_to_memviewslice(lhs_cname, rhs_cname, memviewslicetype, pos, code):
 
     # XXX: add error checks!
 
@@ -80,7 +80,7 @@ def put_assign_to_memview(lhs_cname, rhs_cname, memviewtype, pos, code):
     code.put_xdecref("%s.memview" % (lhs_cname), py_object_type)
     code.putln("%s.memview = %s.memview;" % (lhs_cname, rhs_cname))
     code.putln("%s.data = %s.data;" % (lhs_cname, rhs_cname))
-    ndim = len(memviewtype.axes)
+    ndim = len(memviewslicetype.axes)
     for i in range(ndim):
         code.putln("%s.diminfo[%d] = %s.diminfo[%d];" % (lhs_cname, i, rhs_cname, i))
 
@@ -328,18 +328,18 @@ def _resolve_AttributeNode(env, node):
         scope = scope.lookup(modname).as_module
     return scope.lookup(path[-1])
 
-class MemoryViewTransform(CythonTransform):
+class MemoryViewSliceTransform(CythonTransform):
 
     memviews_exist = False
 
     def __call__(self, node):
-        return super(MemoryViewTransform, self).__call__(node)
+        return super(MemoryViewSliceTransform, self).__call__(node)
 
     def inspect_scope(self, node, scope):
 
         memviewvars = [entry for name, entry
                 in scope.entries.iteritems()
-                if entry.type.is_memoryview]
+                if entry.type.is_memoryviewslice]
         if memviewvars:
             self.memviews_exist = True
 
diff --git a/Cython/Compiler/ModuleNode.py b/Cython/Compiler/ModuleNode.py
index 4dd3bd4c4..089572e20 100644
--- a/Cython/Compiler/ModuleNode.py
+++ b/Cython/Compiler/ModuleNode.py
@@ -912,13 +912,13 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
         type = scope.parent_type
         base_type = type.base_type
         py_attrs = []
-        memview_attrs = []
+        memviewslice_attrs = []
         for entry in scope.var_entries:
             if entry.type.is_pyobject:
                 py_attrs.append(entry)
-            elif entry.type.is_memoryview:
-                memview_attrs.append(entry)
-        need_self_cast = type.vtabslot_cname or py_attrs or memview_attrs
+            elif entry.type.is_memoryviewslice:
+                memviewslice_attrs.append(entry)
+        need_self_cast = type.vtabslot_cname or py_attrs or memviewslice_attrs
         code.putln("")
         code.putln(
             "static PyObject *%s(PyTypeObject *t, PyObject *a, PyObject *k) {"
@@ -960,7 +960,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
                 code.putln("p->%s = 0;" % entry.cname)
             else:
                 code.put_init_var_to_py_none(entry, "p->%s", nanny=False)
-        for entry in memview_attrs:
+        for entry in memviewslice_attrs:
             code.putln("p->%s.data = NULL;" % entry.cname)
             code.put_init_to_py_none("p->%s.memview" % entry.cname,
                     PyrexTypes.cython_memoryview_type, nanny=False)
diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
index efbdadd24..84febd2aa 100644
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@ -709,7 +709,7 @@ class CSimpleBaseTypeNode(CBaseTypeNode):
         else:
             return PyrexTypes.error_type
 
-class MemoryViewTypeNode(CBaseTypeNode):
+class MemoryViewSliceTypeNode(CBaseTypeNode):
 
     child_attrs = ['base_type_node', 'axes']
 
@@ -727,7 +727,7 @@ class MemoryViewTypeNode(CBaseTypeNode):
             self.type = PyrexTypes.ErrorType()
             return self.type
 
-        self.type = PyrexTypes.MemoryViewType(base_type, axes_specs, env)
+        self.type = PyrexTypes.MemoryViewSliceType(base_type, axes_specs, env)
         MemoryView.use_memview_util_code(env)
         return self.type
 
@@ -817,7 +817,7 @@ class CVarDefNode(StatNode):
         for declarator in self.declarators:
             name_declarator, type = declarator.analyse(base_type, env)
             if not type.is_complete():
-                if not (self.visibility == 'extern' and type.is_array or type.is_memoryview):
+                if not (self.visibility == 'extern' and type.is_array or type.is_memoryviewslice):
                     error(declarator.pos,
                         "Variable type '%s' is incomplete" % type)
             if self.visibility == 'extern' and type.is_pyobject:
@@ -1098,9 +1098,9 @@ class FuncDefNode(StatNode, BlockNode):
         for entry in lenv.var_entries + lenv.arg_entries:
             if entry.type.is_buffer and entry.buffer_aux.buflocal_nd_var.used:
                 Buffer.put_init_vars(entry, code)
-        # ----- Initialise local memoryviews
+        # ----- Initialise local memoryview slices
         for entry in lenv.var_entries + lenv.arg_entries:
-            if entry.type.is_memoryview:
+            if entry.type.is_memoryviewslice:
                 MemoryView.put_init_entry(entry.cname, code)
         # ----- Check and convert arguments
         self.generate_argument_type_tests(code)
diff --git a/Cython/Compiler/Parsing.py b/Cython/Compiler/Parsing.py
index 55eed84b2..9ef855320 100644
--- a/Cython/Compiler/Parsing.py
+++ b/Cython/Compiler/Parsing.py
@@ -1831,11 +1831,12 @@ def p_c_simple_base_type(s, self_flag, nonempty, empty):
     #    e.g., sizeof(int[SIZE]).  The only bracketed type that can appear here
     #    is an anonymous C array.
     # empty == False and nonempty == True:
-    #    e.g., declaration of a buffer/memoryview array.  no anonymous brackted C
-    #    arrays allowed, so only buffer declarations/memoryview declarations here.
+    #    e.g., declaration of a buffer/memoryview slice array.  no anonymous
+    #    brackted C arrays allowed, so only buffer declarations/memoryview
+    #    declarations here.
     # empty == False and nonempty == False:
     #    We disallow buffer declarations in this case.  Only anonymous C arrays
-    #    and memoryview arrays are possible here.  Memoryview arrays are
+    #    and memoryview slice arrays are possible here.  Memoryview arrays are
     #    distinguished by an explicit colon in the first axis declaration.
     # empty == True and nonempty == True:
     #    obviously illegal.
@@ -1852,24 +1853,25 @@ def p_bracketed_base_type(s, base_type_node, nonempty, empty):
         # sizeof-like thing.  Only anonymous C arrays allowed (int[SIZE]).
         return base_type_node
     elif not empty and nonempty:
-        # declaration of either memoryview or buffer.
-        if is_memoryview_access(s):
-            return p_memoryview_access(s, base_type_node)
+        # declaration of either memoryview slice or buffer.
+        if is_memoryviewslice_access(s):
+            return p_memoryviewslice_access(s, base_type_node)
         else:
             return p_buffer_access(s, base_type_node)
     elif not empty and not nonempty:
-        # only anonymous C arrays and memoryview arrays here.  We disallow buffer
-        # declarations for now, due to ambiguity with anonymous C arrays.
-        if is_memoryview_access(s):
-            return p_memoryview_access(s, base_type_node)
+        # only anonymous C arrays and memoryview slice arrays here.  We
+        # disallow buffer declarations for now, due to ambiguity with anonymous
+        # C arrays.
+        if is_memoryviewslice_access(s):
+            return p_memoryviewslice_access(s, base_type_node)
         else:
             return base_type_node
 
-def is_memoryview_access(s):
+def is_memoryviewslice_access(s):
     # s.sy == '['
-    # a memoryview declaration is distinguishable from a buffer access
+    # a memoryview slice declaration is distinguishable from a buffer access
     # declaration by the first entry in the bracketed list.  The buffer will
-    # not have an unnested colon in the first entry; the memoryview will.
+    # not have an unnested colon in the first entry; the memoryview slice will.
     saved = [(s.sy, s.systring)]
     s.next()
     retval = False
@@ -1886,7 +1888,7 @@ def is_memoryview_access(s):
 
     return retval
 
-def p_memoryview_access(s, base_type_node):
+def p_memoryviewslice_access(s, base_type_node):
     # s.sy == '['
     pos = s.position()
     s.next()
@@ -1897,7 +1899,7 @@ def p_memoryview_access(s, base_type_node):
             s.error("An axis specification in memoryview declaration does not have a ':'.")
     s.expect(']')
     indexes = make_slice_nodes(pos, subscripts)
-    result = Nodes.MemoryViewTypeNode(pos,
+    result = Nodes.MemoryViewSliceTypeNode(pos,
             base_type_node = base_type_node,
             axes = indexes)
     return result
diff --git a/Cython/Compiler/PyrexTypes.py b/Cython/Compiler/PyrexTypes.py
index 1f1a7a855..531b9908e 100644
--- a/Cython/Compiler/PyrexTypes.py
+++ b/Cython/Compiler/PyrexTypes.py
@@ -100,7 +100,7 @@ class PyrexType(BaseType):
     is_returncode = 0
     is_error = 0
     is_buffer = 0
-    is_memoryview = 0
+    is_memoryviewslice = 0
     has_attributes = 0
     default_value = ""
     pymemberdef_typecode = None
@@ -224,13 +224,13 @@ class CTypedefType(BaseType):
     def __getattr__(self, name):
         return getattr(self.typedef_base_type, name)
 
-class MemoryViewType(PyrexType):
+class MemoryViewSliceType(PyrexType):
 
-    is_memoryview = 1
+    is_memoryviewslice = 1
 
     def __init__(self, base_dtype, axes, env):
         '''
-        MemoryViewType(base, axes)
+        MemoryViewSliceType(base, axes)
 
         Base is the C base type; axes is a list of (access, packing) strings,
         where access is one of 'full', 'direct' or 'ptr' and packing is one of
@@ -268,7 +268,7 @@ class MemoryViewType(PyrexType):
         self.env = env
 
     def is_complete(self):
-        # incomplete since the underlying struct doesn't have a memoryview.
+        # incomplete since the underlying struct doesn't have a cython.memoryview object.
         return 0
 
     def declaration_code(self, entity_code,