Changeset 1834

Timestamp:

10/19/06 14:35:35 (2 years ago)

Author:

jstenar

Message:

pyreadline-refactor: Adding argument handling

Files:

• pyreadline/branches/refactor/doc/ChangeLog (modified) (1 diff)
• pyreadline/branches/refactor/pyreadline/lineeditor/lineobj.py (modified) (3 diffs)
• pyreadline/branches/refactor/pyreadline/modes/basemode.py (modified) (6 diffs)
• pyreadline/branches/refactor/pyreadline/modes/emacs.py (modified) (1 diff)

pyreadline/branches/refactor/doc/ChangeLog

@@ +1 @@
+2006-10-19 Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
+    * Adding argument handling.
+    * Adding argument to functions:forward_char, backward_char, forward_word, backward_word
+      forward_word_end, backward_word_end, beginning_of_line_extend_selection, end_of_line_extend_selection
+      forward_char_extend_selection, backward_char_extend_selection, forward_word_extend_selection,
+      backward_word_extend_selection, forward_word_end_extend_selection, backward_word_end_extend_selection,
+      delete_char, backward_delete_char, backward_delete_word, forward_delete_word, 
+    
-2006-10-18 Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
-    * Adding functionality to dump_functions

pyreadline/branches/refactor/pyreadline/lineeditor/lineobj.py

@@ -416 +416 @@
-        self.selection_mark=-1
-        self.point=EndOfLine
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-       
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-######### Movement select
@@ -447 +469 @@
-            self.selection_mark=self.point
-        self.point=EndOfLine
-
-
+
+
+
+
-        if self.enable_selection and self.selection_mark<0:
-            self.selection_mark=self.point
-
-
-
+
+
+
+
+
+
-        if self.enable_selection and self.selection_mark<0:
-            self.selection_mark=self.point
-
-
-
+
+
+
+
+
+
-        if self.enable_selection and self.selection_mark<0:
-            self.selection_mark=self.point
-
+
+
-       
-
+
+
+
-        if self.enable_selection and self.selection_mark<0:
-            self.selection_mark=self.point
-
+
+
+
-       
-
+
+
+
-        if self.enable_selection and self.selection_mark<0:
-            self.selection_mark=self.point
-
+
+
+
+
+
+
+
+
+
+
+
-
-######### delete       
@@ -479 +526 @@
-            if self.selection_mark<self.point:
-                del self[self.selection_mark:self.point]
+                self.selection_mark=-1
-            else:                
-                del self[self.point:self.selection_mark]
+                self.selection_mark=-1
-            return True
-        else:
+            self.selection_mark=-1
-            return False
-
-
-
-
+
+
+
+
+
+
+
-            del self[Point]
-
-
-
-
+
+
+
+
+
+
+
-            if self.point>0:
-                self.backward_char()
-                self.delete_char()
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            del self[PrevWordStart:Point]
-        self.selection_mark=-1
-
-    def forward_delete_word(self):
-        if not self.delete_selection():
-            #del self[PrevWordEnd:Point]
-            del self[Point:NextWordStart]
-        self.selection_mark=-1
-
-    def delete_current_word(self):

pyreadline/branches/refactor/pyreadline/modes/basemode.py

@@ -24 +24 @@
-        self.startup_hook=None
-        self.pre_input_hook=None
+        self.argument=1
+        self.prevargument=None
-        
-    def __repr__(self):
@@ -39 +41 @@
-            return getattr(self.rlobj,x)
-        return g
+
+    def _argreset(self):
+        val=self.argument
+        self.argument=1
+        return val
+    argument_reset=property(_argreset)
-        
-    l_buffer=property(*_gs("l_buffer"))
@@ -58 +66 @@
-    _clear_after=property(_g("_clear_after"))
-    _set_cursor=property(_g("_set_cursor"))
-    _print_prompt=property(_g("_print_prompt"))
-    _update_prompt_pos=property(_g("_update_prompt_pos"))
-    _update_line=property(_g("_update_line"))
@@ -230 +237 @@
-    def forward_char(self, e): # (C-f)
-        '''Move forward a character. '''
-
+self.argument_reset
-
-    def backward_char(self, e): # (C-b)
-        '''Move back a character. '''
-
+self.argument_reset
-
-    def forward_word(self, e): # (M-f)
-        '''Move forward to the end of the next word. Words are composed of
-        letters and digits.'''
-
-
-
-
-
-
+
-
-    def backward_word(self, e): # (M-b)
-        '''Move back to the start of the current or previous word. Words are
-        composed of letters and digits.'''
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def beginning_of_line_extend_selection(self, e): # 
-        '''Move to the start of the current line. '''
-
+self.argument_reset
-
-    def end_of_line_extend_selection(self, e): # 
-        '''Move to the end of the line. '''
-
+self.argument_reset
-
-    def forward_char_extend_selection(self, e): # 
-        '''Move forward a character. '''
-
+self.argument_reset
-
-    def backward_char_extend_selection(self, e): #
-        '''Move back a character. '''
-
+self.argument_reset
-
-    def forward_word_extend_selection(self, e): # 
-        '''Move forward to the end of the next word. Words are composed of
-        letters and digits.'''
-
-
-
-
-
-
+
-
-    def backward_word_extend_selection(self, e): # 
-        '''Move back to the start of the current or previous word. Words are
-        composed of letters and digits.'''
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def upcase_word(self, e): # (M-u)
@@ -300 +319 @@
-
-
-
+
-    def clear_screen(self, e): # (C-l)
-        '''Clear the screen and redraw the current line, leaving the current
@@ -322 +341 @@
-        the line, there are no characters in the line, and the last
-        character typed was not bound to delete-char, then return EOF.'''
-
+self.argument_reset
-
-    def backward_delete_char(self, e): # (Rubout)
-        '''Delete the character behind the cursor. A numeric argument means
-        to kill the characters instead of deleting them.'''
-
+self.argument_reset
-
-    def backward_delete_word(self, e): # (Control-Rubout)
-        '''Delete the character behind the cursor. A numeric argument means
-        to kill the characters instead of deleting them.'''
-
+self.argument_reset
-
-    def forward_delete_word(self, e): # (Control-Delete)
-        '''Delete the character behind the cursor. A numeric argument means
-        to kill the characters instead of deleting them.'''
-
+self.argument_reset
-
-    def delete_horizontal_space(self, e): # ()

pyreadline/branches/refactor/pyreadline/modes/emacs.py

@@ -357 +357 @@
-        '''Add this digit to the argument already accumulating, or start a
-        new argument. M-- starts a negative argument.'''
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def universal_argument(self, e): # ()