X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fparser.py;h=302733d0322a69c9592276b94239b626debcb4c3;hb=769c9a9af7f759f89593c5136a1359ce35366fbc;hp=a043bde4615f80474aaab11b974ddb2a87a48b0b;hpb=df9a8d0a788b29913dae3eec4ef8113e2d8e9a41;p=plomrogue2
diff --git a/plomrogue/parser.py b/plomrogue/parser.py
index a043bde..302733d 100644
--- a/plomrogue/parser.py
+++ b/plomrogue/parser.py
@@ -77,7 +77,18 @@ class Parser:
"""Parse msg as call to function, return function with args tuple.
Respects function signature defined in function's .argtypes attribute.
+
+ Throws out messages with any but a small list of acceptable characters.
+
"""
+ import string
+ msg = msg.replace('\n', ' ') # Inserted by some tablet keyboards.
+ legal_chars = string.digits + string.ascii_letters +\
+ string.punctuation + ' ' + 'ÃäÃöÃüç' + 'éèáà ô' + 'ââ¦'
+ for c in msg:
+ if not c in legal_chars:
+ raise ArgError('Command/message contains illegal character(s), '
+ 'may only contain ones of: %s' % legal_chars)
tokens = self.tokenize(msg)
if len(tokens) == 0:
return None, ()
@@ -116,6 +127,15 @@ class Parser:
if not arg.isdigit() or int(arg) < 1:
raise ArgError('Argument must be positive integer.')
args += [int(arg)]
+ elif tmpl == 'int':
+ try:
+ args += [int(arg)]
+ except ValueError:
+ raise ArgError('Argument must be integer.')
+ elif tmpl == 'bool':
+ if not arg.isdigit() or int(arg) not in (0, 1):
+ raise ArgError('Argument must be 0 or 1.')
+ args += [bool(int(arg))]
elif tmpl == 'char':
try:
ord(arg)