andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixes to error output

Browse Source
This commit is contained in:
ccremers 2007-01-29 15:17:11 +00:00
parent cf84e83f9f
commit df62d65d5c
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gui/Gui/Scytherthread.py
View File

@ -254,7 +254,14 @@ class ErrorWindow(wx.Dialog):
line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL) line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL)
sizer.Add(line, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.RIGHT|wx.TOP, 5) sizer.Add(line, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.RIGHT|wx.TOP, 5)
label = wx.StaticText(self, -1, "\n".join(errors)) etxt = ""
prefix = "error: "
for er in errors:
if er.startswith(prefix):
er = er[len(prefix):]
etxt = etxt + "%s\n" % (er)
label = wx.StaticText(self, -1, etxt)
sizer.Add(label, 0, wx.ALIGN_LEFT|wx.ALL, 5) sizer.Add(label, 0, wx.ALIGN_LEFT|wx.ALL, 5)
line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL) line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL)

BIN
gui/Scyther/Bin/scyther-linux
View File

Binary file not shown.

2
src/compiler.c
View File

@ -1976,8 +1976,8 @@ checkLabelMatchThis (const System sys, const Protocol p, const Role readrole,
eprintf ("error: \t"); eprintf ("error: \t");
roledefPrint (readevent); roledefPrint (readevent);
eprintf ("\n"); eprintf ("\n");
globalError--;
error_die (); error_die ();
globalError--;
} }
else else
{ {