introduce dbg_file

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/gensymbolic b/gensymbolic
index e0f08ee4a5dca4788780d9396aa87e4e91d9c3e7..0ab8269e419931b8111c83a46a19f1cecf414182 100755 (executable)
--- a/gensymbolic
+++ b/gensymbolic
@@ -6,7 +6,7 @@ from optparse import OptionParser
 import sympy
 
 import symbolic
-from moedebug import dbg_enable, dbg
+from moedebug import dbg_file, dbg
 
 opt_parser = OptionParser()
 opt_parser.add_option('-q',dest='quiet',action='store_true',
@@ -21,8 +21,8 @@ assert(not len(args))
 if (not options.ascii) and sys.stdout.encoding is None:
   sys.stdout = codecs.open("/dev/stdout", "w", 'utf-8')
 
-dbg_enable = not options.quiet
-if dbg_enable:
+dbg_file = None if options.quiet else sys.stdout
+if dbg_file:
   sympy.init_printing(use_unicode=(not options.ascii),
                       num_columns=options.width)
 

diff --git a/moedebug.py b/moedebug.py
index b77d8cff6f889af701703da7a298782c5ea2a768..ac9caeb81c0385f79939017f7d6ea366139a6345 100644 (file)
--- a/moedebug.py
+++ b/moedebug.py
@@ -1,7 +1,7 @@
 
-dbg_enable = False
+dbg_file = None
 
 def dbg(*args):
-  if dbg_enable:
-    print('D ', *args, file=sys.stderr)
+  if dbg_file:
+    print('D ', *args, file=dbg_file)
 

diff --git a/symbolic.py b/symbolic.py
index 2f3f8e6ac05e5d5967d3ce458e4694dbf9218dd3..0f2ff03ab162e65919511dd28fd1ae1db6eccbad 100644 (file)
--- a/symbolic.py
+++ b/symbolic.py
@@ -2,7 +2,7 @@
 from sympy import *
 import itertools
 
-from moedebug import dbg_enable
+from moedebug import dbg_file
 
 from sympy.utilities.lambdify import lambdify, implemented_function
 
@@ -12,11 +12,11 @@ r, theta, s, la, mu, kappa = symbols('r theta s lambda mu kappa')
 # rightvars  replaces 
 
 def dprint(*args):
-  if not dbg_enable: return
+  if not dbg_file: return
   print(*args)
 
 def dbg(*args):
-  if not dbg_enable: return
+  if not dbg_file: return
   for vn in args:
     print('\n    ' + vn + '\n')
     pprint(eval(vn))