X-Git-Url: https://code.kerkeslager.com/?p=fur;a=blobdiff_plain;f=tokenization.py;h=bc8cf85a8f5a12aa556095f905bb190ef292c446;hp=f73ddf8d73f6fd02340252a21a07ba721a2e8f99;hb=1f2895250c61aeb81c0f0ba7efed156c9386dfac;hpb=a96e96f3f783930707122f691cd6a08a90416a74 diff --git a/tokenization.py b/tokenization.py index f73ddf8..bc8cf85 100644 --- a/tokenization.py +++ b/tokenization.py @@ -33,15 +33,20 @@ def _make_token_matcher(definition): _TOKEN_MATCHERS = [ ('keyword', r'(def|do|else|end|if)(?![a-z_])'), + ('open_bracket', r'\['), + ('close_bracket', r'\]'), ('open_parenthese', r'\('), ('close_parenthese', r'\)'), ('comma', r','), + ('colon', r':'), + ('period', r'\.'), ('integer_literal', r'\d+'), ('symbol', r'[a-z_]+'), ('single_quoted_string_literal', r"'.*?'"), - ('comparison_level_operator', r'(<=|>=|==|!=|<|>)'), + ('double_quoted_string_literal', r'".*?"'), + ('comparison_level_operator', r'(<=|>=|==|!=|<|>)'), ('assignment_operator', r'='), - ('addition_level_operator', r'(\+|-)'), + ('addition_level_operator', r'(\+\+|\+|-)'), ('multiplication_level_operator', r'(\*|//|%)'), ('newline', r'\n'), ]