ipy_leo: @a anchors, @ipy-results is back (for collecting new nodes, if it exists)

IPython/Extensions/ipy_leo.py

@@ -42,7 +42,9 b' def all_cells():'
     d = {}
     for p in c.allNodes_iter():
         h = p.headString()
-        if not valid_attribute(h):
+        if h.startswith('@a '):
+            d[h.lstrip('@a ').strip()] = p.parent().copy()
+        elif not valid_attribute(h):
             continue 
         d[h] = p.copy()
     return d    
@@ -154,7 +156,7 b' class LeoWorkbook:'
         cells = all_cells()
         p = cells.get(key, None)
         if p is None:
-            p = add_var(key,None)
+            p = add_var(key)
 
         return LeoNode(p)
 
@@ -167,28 +169,24 b' class LeoWorkbook:'
 ip.user_ns['wb'] = LeoWorkbook()
 
 
-_dummyval = object()
+
 @IPython.generics.complete_object.when_type(LeoWorkbook)
 def workbook_complete(obj, prev):
     return all_cells().keys()
     
 
-def add_var(varname, value = _dummyval):
+def add_var(varname):
     c.beginUpdate()
     try:
         p2 = g.findNodeAnywhere(c,varname)
-        if not c.positionExists(p2):
-            p2 = c.currentPosition().insertAfter()
-            c.setHeadString(p2,varname)
-            
-        c.setCurrentPosition(p2)
-        if value is _dummyval:
-            val = ip.user_ns[varname]
-        else:
-            val = value
-        if val is not None:
-            formatted = format_for_leo(val)
-            c.setBodyString(p2,formatted)
+        if p2:
+            return
+
+        rootpos = g.findNodeAnywhere(c,'@ipy-results')
+        if not rootpos:
+            rootpos = c.currentPosition() 
+        p2 = rootpos.insertAsLastChild()
+        c.setHeadString(p2,varname)
         return p2
     finally:
         c.endUpdate()
@@ -204,7 +202,6 b' def push_script(p):'
         script = g.getScript(c,p,useSelectedText=False,forcePythonSentinels=False,useSentinels=False)
         
         script = g.splitLines(script + '\n')
-        script = ''.join(z for z in script if z.strip())
         
         ip.runlines(script)
         
@@ -221,7 +218,7 b' def push_script(p):'
             es('<%d> %s' % (idx, pprint.pformat(ohist[idx],width = 40)))
         
         if not has_output:
-            es('ipy run: %s' %( p.headString(),))
+            es('ipy run: %s (%d LL)' %( p.headString(),len(script)))
     finally:
         c.endUpdate()
     
@@ -236,12 +233,13 b' def eval_body(body):'
     
 def push_plain_python(p):
     script = g.getScript(c,p,useSelectedText=False,forcePythonSentinels=False,useSentinels=False)
+    lines = script.count('\n')
     try:
         exec script in ip.user_ns
     except:
         print " -- Exception in script:\n"+script + "\n --"
         raise
-    es('ipy plain: %s' % (p.headString(),))
+    es('ipy plain: %s (%d LL)' % (p.headString(),lines))
     
 def push_from_leo(p):
     nod = LeoNode(p)
@@ -250,6 +248,10 b' def push_from_leo(p):'
         push_plain_python(p)
         return
     if nod.b.startswith('@cl'):
+        p2 = g.findNodeAnywhere(c,'@ipy-results')
+        if p2:
+            es("=> @ipy-results")
+            LeoNode(p2).v = nod.v
         es(nod.v)
         return
     
@@ -285,6 +287,7 b' def leo_f(self,s):'
 ip.expose_magic('leo',leo_f)
 
 def leoref_f(self,s):
+    """ Quick reference for ILeo """
     import textwrap
     print textwrap.dedent("""\
     %leo file - open file in leo

doc/examples/leo_bridge_demo.leo

@@ -3,7 +3,7 b''
 <leo_file>
 <leo_header file_format="2" tnodes="0" max_tnode_index="0" clone_windows="0"/>
 <globals body_outline_ratio="0.5">
-	<global_window_position top="161" left="139" height="621" width="1280"/>
+	<global_window_position top="131" left="404" height="621" width="1280"/>
 	<global_log_window_position top="0" left="0" height="0" width="0"/>
 </globals>
 <preferences/>
@@ -11,8 +11,8 b''
 <vnodes>
 <v t="vivainio.20080218184525"><vh>@chapters</vh></v>
 <v t="vivainio.20080218184540" a="E"><vh>@ipy-startup</vh>
-<v t="vivainio.20080218184613.1"><vh>b</vh></v>
-<v t="vivainio.20080218200031" a="ETV"><vh>Some classes P</vh>
+<v t="vivainio.20080218184613.1" a="TV"><vh>b</vh></v>
+<v t="vivainio.20080218200031" a="E"><vh>Some classes P</vh>
 <v t="vivainio.20080218190816"><vh>File-like access</vh></v>
 <v t="vivainio.20080218200106"><vh>csv data</vh></v>
 <v t="vivainio.20080219225120"><vh>String list</vh></v>