Commit 00d68a2f authored by Federico G. Schwindt's avatar Federico G. Schwindt Committed by Lasse Karstensen

Correct ParseError output

parent 654b7e97
...@@ -151,7 +151,7 @@ class Token(object): ...@@ -151,7 +151,7 @@ class Token(object):
class Vmod(object): class Vmod(object):
def __init__(self, nam, dnam, sec): def __init__(self, nam, dnam, sec):
if not is_c_name(nam): if not is_c_name(nam):
raise ParseError("Module name '%s' is illegal", nam) raise ParseError("Module name '%s' is illegal" % nam)
self.nam = nam self.nam = nam
self.dnam = dnam self.dnam = dnam
self.sec = sec self.sec = sec
...@@ -163,10 +163,10 @@ class Vmod(object): ...@@ -163,10 +163,10 @@ class Vmod(object):
def set_event(self, nam): def set_event(self, nam):
if self.event != None: if self.event != None:
raise ParseError("Module %s already has $Event", raise ParseError("Module %s already has $Event" %
self.nam) self.nam)
if not is_c_name(nam): if not is_c_name(nam):
raise ParseError("$Event name '%s' is illegal", nam) raise ParseError("$Event name '%s' is illegal" % nam)
self.event = nam self.event = nam
def add_func(self, fn): def add_func(self, fn):
...@@ -686,11 +686,11 @@ def parse_func(tl, rt_type=None, pobj=None): ...@@ -686,11 +686,11 @@ def parse_func(tl, rt_type=None, pobj=None):
if pobj != None and fname[0] == "." and is_c_name(fname[1:]): if pobj != None and fname[0] == "." and is_c_name(fname[1:]):
fname = pobj + fname fname = pobj + fname
elif not is_c_name(fname): elif not is_c_name(fname):
raise ParseError("Function name '%s' is illegal", fname) raise ParseError("Function name '%s' is illegal" % fname)
t = tl.get_token() t = tl.get_token()
if t.str != "(": if t.str != "(":
raise ParseError("Expected \"(\" got \"%s\"", t.str) raise ParseError("Expected \"(\" got \"%s\"" % t.str)
while True: while True:
t = parse_arg(tl, al) t = parse_arg(tl, al)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment