Changeset 2819 for trunk

Timestamp:

11/13/2008 10:22:06 PM (8 weeks ago)

Author:

guyer

Message:

faster implementation of --inline frame comment

Location:

trunk/fipy

Files:

• tools/inline/inline.py (modified) (4 diffs)
• variables/variable.py (modified) (4 diffs)

trunk/fipy/tools/inline/inline.py

@@ -9 +9 @@
     else:
         return pythonFn(*args)
-                         
-def _frameComment(code, level=2):
-    frame = inspect.getouterframes(inspect.currentframe())[level]
+              
+def _getframeinfo(level, context=1):
+    """
+    Much faster alternative to `inspect.getouterframes(inspect.currentframe())[level]`
+    """
+    frame = inspect.currentframe()
+    for l in range(level+1):
+        frame = frame.f_back
+        
+    return (frame,) + inspect.getframeinfo(frame, context=context)
 
+def _rawCodeComment(code, level=2):
+    finfo = _getframeinfo(level=level)
+    
     # note: 
     # don't use #line because it actually makes it harder 
@@ -24 +34 @@
     %s 
 */
-''' % (frame[1], frame[2] - len(code.splitlines()), frame[3])
+''' % (finfo[1], finfo[2] - len(code.splitlines()), finfo[3])
+
+def _operatorVariableComment(canInline=True, level=3):
+    if canInline and inlineFlagOn:
+        finfo = _getframeinfo(level=level)
+
+        # note: 
+        # don't use #line because it actually makes it harder 
+        # to find the offending code in both the C++ source and in the Python
+        #line %d "%s"
+        
+        if finfo[4] is not None:
+            code = "\n".join(finfo[4])
+        else:
+            code = ""
+            
+        return '''
+/* 
+%s:%d
+
+%s
+ */
+        ''' % (finfo[1], finfo[2], code)
+    else:
+        return ""
 
 def _runInline(code_in, converters=None, verbose=0, comment=None, **args):
@@ -53 +87 @@
 
     if comment is None:
-        comment = _frameComment(code_in)
+        comment = _rawCodeComment(code_in)
         
     code = "\n" + comment + "\n" + code
@@ -104 +138 @@
 
     if comment is None:
-        comment = _frameComment(code_in)
+        comment = _rawCodeComment(code_in)
 
     code = "\n" + comment + "\n" + code

trunk/fipy/variables/variable.py

@@ -42 +42 @@
 from fipy.tools import numerix
 from fipy.tools import parser
+from fipy.tools.inline import inline
 
 class Variable(object):
@@ -804 +805 @@
         return operatorVariable._OperatorVariableClass(baseClass=baseClass)
             
-    def _inlineComment(self, level=3):
-        frame = inspect.getouterframes(inspect.currentframe())[level]
-
-        # note: 
-        # don't use #line because it actually makes it harder 
-        # to find the offending code in both the C++ source and in the Python
-        #line %d "%s"
-        
-        if frame[4] is not None:
-            code = "\n".join(frame[4])
-        else:
-            code = ""
-            
-        return '''
-/* 
-    %s:%d
-    
-    %s
- */
-        ''' % (frame[1], frame[2], code)
-         
-
     def _UnaryOperatorVariable(self, op, operatorClass=None, opShape=None, canInline=True, unit=None):
         """
@@ -849 +828 @@
             canInline = False
 
-        var = unOp(op=op, var=[self], opShape=opShape, canInline=canInline, unit=unit, inlineComment=self._inlineComment())
-#         var.comment = self._frameComment(level=7)
-        
-        return var
+        return unOp(op=op, var=[self], opShape=opShape, canInline=canInline, unit=unit, 
+                    inlineComment=inline._operatorVariableComment(canInline=canInline))
 
     def _shapeClassAndOther(self, opShape, operatorClass, other):
@@ -898 +875 @@
         binOp = binaryOperatorVariable._BinaryOperatorVariable(operatorClass)
         
-        var = binOp(op=op, var=[self, other], opShape=opShape, canInline=canInline, unit=unit, inlineComment=self._inlineComment())
-#         var.comment = self._frameComment(level=7)
-
-        return var
+        return binOp(op=op, var=[self, other], opShape=opShape, canInline=canInline, unit=unit, 
+                     inlineComment=inline._operatorVariableComment(canInline=canInline))
     
     def __add__(self, other):