X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fparser.py;h=51f5cc20390ac71c50b5b1baae7f53fcd7c12bdd;hb=HEAD;hp=22e90594be8313ab514d6d346ce1b87fa498188b;hpb=c1024023126d1fd91be3145e50cae4b493d7a956;p=plomrogue2
diff --git a/plomrogue/parser.py b/plomrogue/parser.py
index 22e9059..51f5cc2 100644
--- a/plomrogue/parser.py
+++ b/plomrogue/parser.py
@@ -6,6 +6,7 @@ class Parser:
def __init__(self, game=None):
self.game = game
+ self.string_options = {}
def tokenize(self, msg):
"""Parse msg string into tokens.
@@ -73,18 +74,19 @@ class Parser:
x = get_axis_position_from_argument('X', tokens[1])
return YX(y, x)
- def parse(self, msg):
+ def parse(self, msg, replace_newline=True):
"""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.
+ Refuses messages with any but a small list of acceptable characters.
"""
import string
- msg = msg.replace('\n', ' ') # Inserted by some tablet keyboards.
+ if replace_newline:
+ msg = msg.replace('\n', ' ') # Inserted by some tablet keyboards.
legal_chars = string.digits + string.ascii_letters +\
- string.punctuation + ' ' + 'ÃäÃöÃüç' + 'éèáà ô'
+ string.punctuation + ' ' + 'ÃäÃöÃüç' + 'éèáà ô' + 'ââ¦'
for c in msg:
if not c in legal_chars:
raise ArgError('Command/message contains illegal character(s), '
@@ -127,6 +129,11 @@ 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.')
@@ -146,12 +153,10 @@ class Parser:
elif tmpl == string_string:
args += [arg]
elif tmpl[:len(string_string) + 1] == string_string + ':':
- if not hasattr(self.game, 'get_string_options'):
- raise ArgError('No string option directory.')
string_option_type = tmpl[len(string_string) + 1:]
- options = self.game.get_string_options(string_option_type)
- if options is None:
- raise ArgError('Unknown string option type.')
+ if not string_option_type in self.string_options.keys():
+ raise ArgError('Unknown string option type: %s' % string_option_type)
+ options = self.string_options[string_option_type]
if arg not in options:
msg = 'Argument #%s must be one of: %s' % (i + 1, options)
raise ArgError(msg)