From 2de72de351731e97436219afca1ff3d068a9a650 Mon Sep 17 00:00:00 2001
From: "Silas S. Brown" <ssb22@cam.ac.uk>
Date: Mon, 6 Jul 2015 12:12:34 +0000
Subject: [PATCH] Update adjuster/annogen/termlayout
git-svn-id: http://svn.code.sf.net/p/e-guidedog/code/ssb22/adjuster@2252 29193198-4895-4776-b068-10539e920549
---
annogen.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/annogen.py b/annogen.py
index c156603..e9b050e 100755
--- a/annogen.py
+++ b/annogen.py
@@ -2448,11 +2448,18 @@ def tryNBytes(nbytes,markedDown,nonAnnot,badStarts,okStarts,withAnnot_unistr):
if ret:
if negate: indicators = "negative indicators "
else: indicators = "indicators "
- if len(ret) > 30: indicators += '/'.join(ret[:30]+['...'])
+ if len(ret) > 30: indicators=str(len(ret))+" "+indicators # +'/'.join(ret[:30]+['...'])
else: indicators += '/'.join(ret)
else: indicators = "no indicators"
if len(pOmit) > 200: pOmit = pOmit[:200]+"..."
- diagnose_write("tryNBytes(%d) on %s found %s (avoiding '%s'), covers %d/%d contexts" % (nbytes,withAnnot_unistr,indicators,pOmit.replace(unichr(1),'/').replace('\n',"\\n"),sum(1 for x in covered if x),len(covered)))
+ if all(covered): notCovered = ""
+ else:
+ if negate: strs = badStrs
+ else: strs = okStrs
+ notCovered = [strs[i] for i in xrange(len(covered)) if not covered[i]]
+ if len(notCovered) > 10: notCovered = notCovered[:10]+["..."]
+ notCovered = " (not "+'/'.join(notCovered).replace('\n',"\\n")+")"
+ diagnose_write("tryNBytes(%d) on %s found %s (avoiding '%s'), covers %d/%d contexts%s" % (nbytes,withAnnot_unistr,indicators,pOmit.replace(unichr(1),'/').replace('\n',"\\n"),sum(1 for x in covered if x),len(covered),notCovered))
return negate,ret,sum(1 for x in covered if x),len(covered)
def badInfo(badStarts,nonAnnot,markedDown):
--
GitLab