First go an implementing a=!ls and a=%who syntax.

ellisonbg · ellisonbg · commit b7bb7522bd49 · 2009-09-14T11:32:52.000-07:00
These things used to be in ext_rescapture.py, but they need to be
in prefilter.  I have a draft, but I will need to do further refactoting
of prefilter to get this working.
diff --git a/IPython/core/prefilter.py b/IPython/core/prefilter.py
@@ -42,7 +42,8 @@
 # Global utilities, errors and constants
 #-----------------------------------------------------------------------------
 
-
+# Warning, these cannot be changed unless various regular expressions
+# are updated in a number of places.  Not great, but at least we told you.
 ESC_SHELL  = '!'
 ESC_SH_CAP = '!!'
 ESC_HELP   = '?'
@@ -231,6 +232,7 @@ def get_handler_by_esc(self, esc_str):
 
     def prefilter_line_info(self, line_info):
         """Prefilter a line that has been converted to a LineInfo object."""
+        # print "prefilter_line_info: ", line_info
         handler = self.find_handler(line_info)
         return handler.handle(line_info)
 
@@ -239,12 +241,15 @@ def find_handler(self, line_info):
         for checker in self.sorted_checkers:
             handler = checker.check(line_info)
             if handler:
+                # print "Used checker: ", checker
+                # print "Using handler: ", handler
                 return handler
         return self.get_handler_by_name('normal')
 
     def prefilter_line(self, line, continue_prompt):
         """Prefilter a single input line as text."""
 
+        # print "prefilter_line: ", line, continue_prompt
         # All handlers *must* return a value, even if it's blank ('').
 
         # Lines are NOT logged here. Handlers should process the line as
@@ -254,7 +259,7 @@ def prefilter_line(self, line, continue_prompt):
         # growl.notify("_prefilter: ", "line = %s\ncontinue_prompt = %s" % (line, continue_prompt))
 
         # save the line away in case we crash, so the post-mortem handler can
-        # record it        
+        # record it
         self.shell._last_input_line = line
 
         if not line:
@@ -284,7 +289,9 @@ def prefilter_line(self, line, continue_prompt):
         if continue_prompt and not self.multi_line_specials:
             return normal_handler.handle(line_info)
 
-        return self.prefilter_line_info(line_info)
+        prefiltered = self.prefilter_line_info(line_info)
+        # print "prefiltered line: %r" % prefiltered
+        return prefiltered
 
     def prefilter_lines(self, lines, continue_prompt):
         """Prefilter multiple input lines of text.
@@ -330,6 +337,8 @@ def check(self, line_info):
         """Inspect line_info and return a handler or None."""
         return None
 
+    def __str__(self):
+        return "<%s(priority=%i)>" % (self.__class__.__name__, self.priority)
 
 class EmacsChecker(PrefilterChecker):
 
@@ -401,6 +410,10 @@ def check(self, line_info):
             return self.prefilter_manager.get_handler_by_esc(line_info.pre_char)
 
 
+_assign_system_re = re.compile('\s*=\s*!(?P<cmd>.*)')
+_assign_magic_re = re.compile('\s*=\s*%(?P<cmd>.*)')
+
+
 class AssignmentChecker(PrefilterChecker):
 
     priority = Int(600, config=True)
@@ -412,8 +425,15 @@ def check(self, line_info):
         This allows users to assign to either alias or magic names true python
         variables (the magic/alias systems always take second seat to true
         python code).  E.g. ls='hi', or ls,that=1,2"""
-        if line_info.the_rest and line_info.the_rest[0] in '=,':
-            return self.prefilter_manager.get_handler_by_name('normal')
+        if line_info.the_rest:
+            if line_info.the_rest[0] in '=,':
+                # m = _assign_system_re.match(line_info.the_rest)
+                # if m is not None:
+                #     return self.prefilter_manager.get_handler_by_name('assign_system')
+                # m = _assign_magic_re.match(line_info.the_rest)
+                # if m is not None:
+                #     return self.prefilter_manager.get_handler_by_name('assign_magic')
+                return self.prefilter_manager.get_handler_by_name('normal')
         else:
             return None
 
@@ -529,6 +549,7 @@ def prefilter_manager(self):
         return PrefilterManager.get_instances(root=self.root)[0]
 
     def handle(self, line_info):
+        # print "normal: ", line_info
         """Handle normal input lines. Use as a template for handlers."""
 
         # With autoindent on, we need some way to exit the input loop, and I
@@ -547,11 +568,52 @@ def handle(self, line_info):
         self.shell.log(line, line, continue_prompt)
         return line
 
+    def __str__(self):
+        return "<%s(name=%s)>" % (self.__class__.__name__, self.handler_name)
+
+class AssignSystemHandler(PrefilterHandler):
+
+    handler_name = Str('assign_system')
+
+    @auto_attr
+    def normal_handler(self):
+        return self.prefilter_manager.get_handler_by_name('normal')
+
+    def handle(self, line_info):
+        new_line = line_info.line
+        m = _assign_system_re.match(line_info.the_rest)
+        if m is not None:
+            cmd = m.group('cmd')
+            expr = make_quoted_expr("sc -l =%s" % cmd)
+            new_line = '%s%s = get_ipython().magic(%s)' % (line_info.pre_whitespace,
+                line_info.ifun, expr)
+        self.shell.log(line_info.line, new_line, line_info.continue_prompt)
+        return new_line
+
+
+class AssignMagicHandler(PrefilterHandler):
+
+    handler_name = Str('assign_magic')
+
+    @auto_attr
+    def normal_handler(self):
+        return self.prefilter_manager.get_handler_by_name('normal')
+
+    def handle(self, line_info):
+        new_line = line_info.line
+        m = _assign_magic_re.match(line_info.the_rest)
+        if m is not None:
+            cmd = m.group('cmd')
+            expr = make_quoted_expr(cmd)
+            new_line = '%s%s = get_ipython().magic(%s)' % (line_info.pre_whitespace,
+                line_info.ifun, expr)
+        self.shell.log(line_info.line, new_line, line_info.continue_prompt)
+        return new_line
+
 
 class AliasHandler(PrefilterHandler):
 
     handler_name = Str('alias')
-    esc_strings = List([])
 
     @auto_attr
     def alias_manager(self):
@@ -768,5 +830,7 @@ def handle(self, line_info):
     AutoHandler,
     HelpHandler,
     EmacsHandler
+    # AssignSystemHandler,
+    # AssignMagicHandler
 ]
 
diff --git a/IPython/core/splitinput.py b/IPython/core/splitinput.py
@@ -46,19 +46,25 @@
                         r'\s*([\w\.]+)'
                         r'(\s+.*$|$)')
 
+# r'[\w\.]+'
+# r'\s*=\s*%.*'
 
 def split_user_input(line, pattern=None):
-    """Split user input into pre-char/whitespace, function part and rest."""
+    """Split user input into pre-char/whitespace, function part and rest.
+
+    This is currently handles lines with '=' in them in a very inconsistent
+    manner.
+    """
 
     if pattern is None:
         pattern = line_split
     match = pattern.match(line)
     if not match:
-        #print "match failed for line '%s'" % line
+        # print "match failed for line '%s'" % line
         try:
             ifun, the_rest = line.split(None,1)
         except ValueError:
-            #print "split failed for line '%s'" % line
+            # print "split failed for line '%s'" % line
             ifun, the_rest = line,''
         pre = re.match('^(\s*)(.*)',line).groups()[0]
     else:
diff --git a/IPython/extensions/ext_rescapture.py b/IPython/extensions/ext_rescapture.py
@@ -47,7 +47,7 @@ def init_handlers():
 
 init_handlers()
 
-def regex_prefilter_f(self,line):    
+def regex_prefilter_f(self,line):
     for pat, handler in ip.meta.re_prefilters:
         mo = pat.match(line)
         if mo:
