From 9920ad5286b6e61d67f07f908107d65f7fa817ac Mon Sep 17 00:00:00 2001 From: jvr Date: Sun, 24 Aug 2003 16:25:12 +0000 Subject: [PATCH] added and tweaked some asserts git-svn-id: svn://svn.code.sf.net/p/fonttools/code/trunk@414 4cde692c-a291-49d1-8350-778aa11640f8 --- Lib/fontTools/misc/psCharStrings.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Lib/fontTools/misc/psCharStrings.py b/Lib/fontTools/misc/psCharStrings.py index 61c9d416b..70bd32b2e 100644 --- a/Lib/fontTools/misc/psCharStrings.py +++ b/Lib/fontTools/misc/psCharStrings.py @@ -232,9 +232,9 @@ class T2CharString(ByteCodeBase): def compile(self): if self.bytecode is not None: return - if self.program[-1] not in ("endchar", "return", "callsubr", "callgsubr", "seac"): - print "XXX", self.program - assert 0, "illegal CharString" + assert self.program, "illegal CharString: decompiled to empty program" + assert self.program[-1] in ("endchar", "return", "callsubr", "callgsubr", + "seac"), "illegal CharString" bytecode = [] opcodes = self.opcodes program = self.program @@ -459,10 +459,10 @@ class SimpleT2Decompiler: else: pushToStack(token) if needsDecompilation: + assert program, "illegal CharString: decompiled to empty program" + assert program[-1] in ("endchar", "return", "callsubr", "callgsubr", + "seac"), "illegal CharString" charString.setProgram(program) - if program[-1] not in ("endchar", "return", "callsubr", "callgsubr", "seac"): - print "XXX", program - assert program[-1] in ("endchar", "return", "callsubr", "callgsubr", "seac") del self.callingStack[-1] def pop(self): @@ -1020,4 +1020,3 @@ def calcSubrBias(subrs): else: bias = 32768 return bias -