rdef -> cpdef
authorRobert Bradshaw <robertwb@math.washington.edu>
Thu, 25 Oct 2007 06:55:04 +0000 (23:55 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Thu, 25 Oct 2007 06:55:04 +0000 (23:55 -0700)
Cython/Compiler/Parsing.py
Cython/Compiler/Scanning.py

index b76e520fa642a626441f532ae27c500fe19e46e0..86cc03f10fed5e2c762a7e9d0dbbd95232d41c00 100644 (file)
@@ -1311,7 +1311,7 @@ def p_statement(s, level, cdef_flag = 0, visibility = 'private', api = 0):
         if s.sy == 'cdef':
             cdef_flag = 1
             s.next()
-        if s.sy == 'rdef':
+        if s.sy == 'cpdef':
             cdef_flag = 1
             overridable = 1
             s.next()
@@ -1320,7 +1320,7 @@ def p_statement(s, level, cdef_flag = 0, visibility = 'private', api = 0):
                 s.error('cdef statement not allowed here')
             return p_cdef_statement(s, level, visibility = visibility,
                                     api = api, overridable = overridable)
-    #    elif s.sy == 'rdef':
+    #    elif s.sy == 'cpdef':
     #        s.next()
     #        return p_c_func_or_var_declaration(s, level, s.position(), visibility = visibility, api = api, overridable = True)
         else:
index 821f661d0e546e36717675a03916c0ed7c199624..ea2970b5a32067c79effcb7b34abb81d2174d8a8 100644 (file)
@@ -139,7 +139,7 @@ reserved_words = [
     "raise", "import", "exec", "try", "except", "finally",
     "while", "if", "elif", "else", "for", "in", "assert",
     "and", "or", "not", "is", "in", "lambda", "from",
-    "NULL", "cimport", "by", "with", "rdef", "DEF", "IF", "ELIF", "ELSE"
+    "NULL", "cimport", "by", "with", "cpdef", "DEF", "IF", "ELIF", "ELSE"
 ]
 
 class Method: