From ff46f60191806754456c47b8c6ffbd4d6433e301 Mon Sep 17 00:00:00 2001
From: Stefan Behnel <scoder@users.berlios.de>
Date: Tue, 3 Mar 2009 18:42:58 +0100
Subject: [PATCH] fix Cython compilation after cdef-locals change

---
 Cython/Compiler/Scanning.pxd |  1 -
 Cython/Compiler/Scanning.py  |  1 +
 Cython/Plex/Scanners.pxd     | 21 ++++-----------------
 Cython/Plex/Scanners.py      | 10 ++++++++--
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/Cython/Compiler/Scanning.pxd b/Cython/Compiler/Scanning.pxd
index 280a3cfd..d3220387 100644
--- a/Cython/Compiler/Scanning.pxd
+++ b/Cython/Compiler/Scanning.pxd
@@ -25,5 +25,4 @@ cdef class PyrexScanner(Scanner):
     cpdef next(self)
     cpdef bint expect(self, what, message = *) except -2
     
-    @cython.locals(current_level=long, new_level=long)
     cpdef indentation_action(self, text)
diff --git a/Cython/Compiler/Scanning.py b/Cython/Compiler/Scanning.py
index 3b448fca..9e019f9e 100644
--- a/Cython/Compiler/Scanning.py
+++ b/Cython/Compiler/Scanning.py
@@ -367,6 +367,7 @@ class PyrexScanner(Scanner):
         self.end_string_action(text)
         self.error("Unclosed string literal")
 
+    @cython.locals(current_level=cython.long, new_level=cython.long)
     def indentation_action(self, text):
         self.begin('')
         # Indentation within brackets should be ignored.
diff --git a/Cython/Plex/Scanners.pxd b/Cython/Plex/Scanners.pxd
index 97c441ad..375ab4cd 100644
--- a/Cython/Plex/Scanners.pxd
+++ b/Cython/Plex/Scanners.pxd
@@ -23,25 +23,12 @@ cdef class Scanner:
     cdef public input_state
 
     cdef public level
-    
-    cpdef next_char(self):
-        cdef:
-            long input_state
+
+    cpdef next_char(self)
     cpdef read(self)
     cpdef position(self)
-    
-    cpdef run_machine_inlined(self):
-        cdef:
-            long cur_pos
-            long cur_line
-            long cur_line_start
-            long input_state
-            long next_pos
-            long buf_start_pos
-            long buf_len
-            long buf_index
-            bint trace
-            long discard
+
+    cpdef run_machine_inlined(self)
     
     cpdef begin(self, state)
     cpdef produce(self, value, text = *)
diff --git a/Cython/Plex/Scanners.py b/Cython/Plex/Scanners.py
index a37483ae..5f4af56d 100644
--- a/Cython/Plex/Scanners.py
+++ b/Cython/Plex/Scanners.py
@@ -159,7 +159,12 @@ class Scanner:
     while self.transition():
       pass
     return self.back_up()
-  
+
+  @cython.locals(cur_pos=cython.long, cur_line=cython.long,
+                 cur_line_start=cython.long, input_state=cython.long,
+                 next_pos=cython.long, buf_start_pos=cython.long,
+                 buf_len=cython.long, buf_index=cython.long,
+                 trace=cython.bint, discard=cython.long)
   def run_machine_inlined(self):
     """
     Inlined version of run_machine for speed.
@@ -299,7 +304,8 @@ class Scanner:
 #            return action
 #        else:
 #            return None
-  
+
+  @cython.locals(input_state=long)
   def next_char(self):
     input_state = self.input_state
     if self.trace:
-- 
2.26.2