diff options
| author | gbrandl <devnull@localhost> | 2007-02-25 20:36:35 +0100 |
|---|---|---|
| committer | gbrandl <devnull@localhost> | 2007-02-25 20:36:35 +0100 |
| commit | 795b97d51a4b5f2311fc4df8d708a30b4aaa033c (patch) | |
| tree | 74bf04bb464ae7fa22cf06cc1ae91e585ba2ef20 /pygments | |
| parent | 4f20affc8e7133fc897c754ea8d5ef403ab44399 (diff) | |
| download | pygments-795b97d51a4b5f2311fc4df8d708a30b4aaa033c.tar.gz | |
[svn] Fix a cmdline bug.
Diffstat (limited to 'pygments')
| -rw-r--r-- | pygments/cmdline.py | 7 | ||||
| -rw-r--r-- | pygments/lexer.py | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/pygments/cmdline.py b/pygments/cmdline.py index 26586ec5..0801eab0 100644 --- a/pygments/cmdline.py +++ b/pygments/cmdline.py @@ -239,8 +239,7 @@ def main(args): # parse -O options O_opts = _parse_options(O_opts) - # parse -F options - F_opts = _parse_filters(F_opts) + opts.pop('-O', None) # handle ``pygmentize -S`` S_opt = opts.pop('-S', None) @@ -270,6 +269,10 @@ def main(args): print >>sys.stderr, usage return 2 + # parse -F options + F_opts = _parse_filters(F_opts) + opts.pop('-F', None) + # select formatter outfn = opts.pop('-o', None) fmter = opts.pop('-f', None) diff --git a/pygments/lexer.py b/pygments/lexer.py index 709587d7..0c28cf3e 100644 --- a/pygments/lexer.py +++ b/pygments/lexer.py @@ -364,7 +364,7 @@ class RegexLexerMeta(LexerMeta): assert type(tdef) is tuple, "wrong rule def %r" % tdef - rex = re.compile(tdef[0], rflags) + rex = re.compile(tdef[0], rflags).match assert type(tdef[1]) is _TokenType or callable(tdef[1]), \ 'token type must be simple type or callable, not %r' % tdef[1] @@ -457,8 +457,8 @@ class RegexLexer(Lexer): statestack = list(stack) statetokens = self._tokens[statestack[-1]] while 1: - for rex, action, new_state in statetokens: - m = rex.match(text, pos) + for rexmatch, action, new_state in statetokens: + m = rexmatch(text, pos) if m: # print rex.pattern if type(action) is _TokenType: @@ -529,8 +529,8 @@ class ExtendedRegexLexer(RegexLexer): statetokens = self._tokens[ctx.stack[-1]] text = ctx.text while 1: - for rex, action, new_state in statetokens: - m = rex.match(text, ctx.pos, ctx.end) + for rexmatch, action, new_state in statetokens: + m = rexmatch(text, ctx.pos, ctx.end) if m: if type(action) is _TokenType: yield ctx.pos, action, m.group() |