findcurve output: tolerate "commentary"

GSL siman generates this

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

diff --git a/helixish.py b/helixish.py
index ac6d4735695f1ada339d031ce09eeca7e89e5a62..72393b6706cf8f1938aff7b518f5c4f5a1bedcc6 100644 (file)
--- a/helixish.py
+++ b/helixish.py
@@ -193,18 +193,25 @@ class HelixishCurve():
     findcurve_subproc.stdin.flush()
 
     hc.func = symbolic.get_python()
+    commentary = ''
 
     while True:
       l = findcurve_subproc.stdout.readline()
       l = l.rstrip()
       #dbg('GOT ', l)
       if not l: vdbg().crashing('findcurve EOF')
+      if not l.startswith('['):
+        commentary += ' '
+        commentary += l
+        continue
+
       l = eval(l)
       if not l: break
 
-      dbg(('%s Q=[%10.7f %10.7f %10.7f] dQ=[%10.7f %10.7f %10.7f]')
+      dbg(('%s Q=[%10.7f %10.7f %10.7f] dQ=[%10.7f %10.7f %10.7f]%s')
           %
-          (( dbg_fmt_params(l[0:6]), ) + tuple(l[6:12]) ))
+          (( dbg_fmt_params(l[0:6]), ) + tuple(l[6:12]) + (commentary,) ))
+      commentary = ''
 
       hc.findcurve_result = l[0:6]
       hc.threshold = l[0]**2