From e4a0daf24e3dacd1cf2aafc5af7c6329c7cbfab5 Mon Sep 17 00:00:00 2001 From: moculus Date: Mon, 22 Oct 2007 00:52:48 +0000 Subject: [PATCH] --HG-- branch : pmacs2 --- highlight2.py | 2 +- mode/bds.py | 2 +- mode/blame.py | 2 +- mode/c.py | 2 +- mode/console.py | 2 +- mode/consolemini.py | 2 +- mode/css.py | 2 +- mode/diff.py | 2 +- mode/dir.py | 2 +- mode/elisp.py | 2 +- mode/hex.py | 2 +- mode/html.py | 2 +- mode/java.py | 2 +- mode/javascript.py | 2 +- mode/lisp.py | 2 +- mode/make.py | 2 +- mode/mutt.py | 2 +- mode/nasm.py | 2 +- mode/ocaml.py | 2 +- mode/perl.py | 2 +- mode/python.py | 2 +- mode/rst.py | 2 +- mode/scheme.py | 2 +- mode/sh.py | 2 +- mode/sql.py | 2 +- mode/text.py | 2 +- mode/text2.py | 2 +- mode/tt.py | 2 +- mode/xml.py | 2 +- mode2.py | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/highlight2.py b/highlight2.py index edf3146..99d30d2 100644 --- a/highlight2.py +++ b/highlight2.py @@ -1,5 +1,5 @@ import re, sys -from lex3 import Token +from lex import Token color_list = [] color_list.extend(['\033[3%dm' % x for x in range(0, 8)]) diff --git a/mode/bds.py b/mode/bds.py index 47f500a..26e6f66 100644 --- a/mode/bds.py +++ b/mode/bds.py @@ -1,6 +1,6 @@ import commands import color, mode2 -from lex3 import Grammar, PatternRule, RegionRule, Grammar +from lex import Grammar, PatternRule, RegionRule, Grammar from method import Method from mode.perl import PerlGrammar from mode.xml import TagGrammar diff --git a/mode/blame.py b/mode/blame.py index 139842f..57c2cf3 100644 --- a/mode/blame.py +++ b/mode/blame.py @@ -1,7 +1,7 @@ import color, mode2 from point import Point -from lex3 import Grammar, PatternRule, RegionRule +from lex import Grammar, PatternRule, RegionRule class MetadataGrammar(Grammar): rules = [ diff --git a/mode/c.py b/mode/c.py index 8c61a33..10cfad3 100644 --- a/mode/c.py +++ b/mode/c.py @@ -1,6 +1,6 @@ import os, popen2, re import color, default, method, mode2, tab2 -from lex3 import Grammar, PatternRule, RegionRule +from lex import Grammar, PatternRule, RegionRule from mode.python import StringGrammar # this might not be complete... diff --git a/mode/console.py b/mode/console.py index 830cdc3..22bc10c 100644 --- a/mode/console.py +++ b/mode/console.py @@ -1,5 +1,5 @@ import color, mode2 -from lex3 import Grammar, PatternRule, RegionRule +from lex import Grammar, PatternRule, RegionRule from mode.python import StringGrammar class ConsoleGrammar(Grammar): diff --git a/mode/consolemini.py b/mode/consolemini.py index 07d9408..154bb88 100644 --- a/mode/consolemini.py +++ b/mode/consolemini.py @@ -1,6 +1,6 @@ import code, string, StringIO, sys, traceback import color, completer, method, mode2 -from lex3 import Grammar, PatternRule +from lex import Grammar, PatternRule from point import Point class ConsoleMini(mode2.Fundamental): diff --git a/mode/css.py b/mode/css.py index 27de867..0c73dff 100644 --- a/mode/css.py +++ b/mode/css.py @@ -1,5 +1,5 @@ import color, mode2 -from lex3 import Grammar, PatternRule, NocasePatternRule, RegionRule, NocaseRegionRule +from lex import Grammar, PatternRule, NocasePatternRule, RegionRule, NocaseRegionRule from point import Point class StringGrammar(Grammar): diff --git a/mode/diff.py b/mode/diff.py index fefe2ad..f96a571 100644 --- a/mode/diff.py +++ b/mode/diff.py @@ -1,5 +1,5 @@ import color, method, mode2, re -from lex3 import Grammar, PatternRule, RegionRule +from lex import Grammar, PatternRule, RegionRule class DiffGrammar(Grammar): rules = [ diff --git a/mode/dir.py b/mode/dir.py index 289a954..ddd2bb3 100644 --- a/mode/dir.py +++ b/mode/dir.py @@ -1,6 +1,6 @@ import commands, dirutil, grp, method, mode2, os.path, pwd, re import buffer, window2 -from lex3 import Grammar, PatternRule, RegionRule, PatternGroupRule +from lex import Grammar, PatternRule, RegionRule, PatternGroupRule from point import Point from method import Method, Argument diff --git a/mode/elisp.py b/mode/elisp.py index 428eb6a..771fae7 100644 --- a/mode/elisp.py +++ b/mode/elisp.py @@ -1,7 +1,7 @@ import commands, os.path, sets, string, sys, traceback import color, completer, default, mode2, method, regex, tab2 from point import Point -from lex3 import Grammar, PatternRule, RegionRule, OverridePatternRule +from lex import Grammar, PatternRule, RegionRule, OverridePatternRule class StringGrammar(Grammar): rules = [ diff --git a/mode/hex.py b/mode/hex.py index 3b6d024..1098d59 100644 --- a/mode/hex.py +++ b/mode/hex.py @@ -1,6 +1,6 @@ import string import color, mode2 -from lex3 import Grammar, PatternRule, RegionRule +from lex import Grammar, PatternRule, RegionRule from method import Method, Argument from point import Point diff --git a/mode/html.py b/mode/html.py index 43f38f0..5c759b0 100644 --- a/mode/html.py +++ b/mode/html.py @@ -1,5 +1,5 @@ import color, mode2 -from lex3 import Grammar, PatternRule, RegionRule +from lex import Grammar, PatternRule, RegionRule from mode.xml import TagGrammar from mode.javascript import JavascriptGrammar, Javascript diff --git a/mode/java.py b/mode/java.py index 3ad7237..66c6b33 100644 --- a/mode/java.py +++ b/mode/java.py @@ -1,5 +1,5 @@ import color, mode2, tab2 -from lex3 import Grammar, PatternRule, RegionRule +from lex import Grammar, PatternRule, RegionRule from mode.python import StringGrammar from mode.c import CTabber diff --git a/mode/javascript.py b/mode/javascript.py index c3f7461..97f9d20 100644 --- a/mode/javascript.py +++ b/mode/javascript.py @@ -1,5 +1,5 @@ import color, mode2, tab2 -from lex3 import Grammar, PatternRule, RegionRule +from lex import Grammar, PatternRule, RegionRule from point import Point from mode.python import StringGrammar diff --git a/mode/lisp.py b/mode/lisp.py index c342a06..c8a68f1 100644 --- a/mode/lisp.py +++ b/mode/lisp.py @@ -1,7 +1,7 @@ import commands, os.path, sets, string, sys, traceback import color, completer, default, mode2, method, regex, tab2 from point import Point -from lex3 import Grammar, PatternRule, RegionRule, OverridePatternRule +from lex import Grammar, PatternRule, RegionRule, OverridePatternRule from mode.python import StringGrammar class LispGrammar(Grammar): diff --git a/mode/make.py b/mode/make.py index 94902fa..07e699f 100644 --- a/mode/make.py +++ b/mode/make.py @@ -1,5 +1,5 @@ import color, mode2 -from lex3 import Grammar, PatternRule, RegionRule, PatternGroupRule +from lex import Grammar, PatternRule, RegionRule, PatternGroupRule from mode.sh import ShGrammar, Sh class StringGrammar(Grammar): diff --git a/mode/mutt.py b/mode/mutt.py index c893402..0ef2a79 100644 --- a/mode/mutt.py +++ b/mode/mutt.py @@ -1,7 +1,7 @@ import re import color, mode2, method import mode.text -from lex3 import Grammar, PatternRule +from lex import Grammar, PatternRule class MuttGrammar(Grammar): rules = [ diff --git a/mode/nasm.py b/mode/nasm.py index ab3d069..aaeb36b 100644 --- a/mode/nasm.py +++ b/mode/nasm.py @@ -1,5 +1,5 @@ import color, mode2 -from lex3 import Grammar, PatternRule, RegionRule +from lex import Grammar, PatternRule, RegionRule class StringGrammar(Grammar): rules = [ diff --git a/mode/ocaml.py b/mode/ocaml.py index 2c6bff4..39b05eb 100644 --- a/mode/ocaml.py +++ b/mode/ocaml.py @@ -1,7 +1,7 @@ import commands, os.path, sets, string, sys, traceback import color, completer, default, mode2, method, regex, tab2 from point import Point -from lex3 import Grammar, PatternRule, RegionRule, NocasePatternRule +from lex import Grammar, PatternRule, RegionRule, NocasePatternRule class StringGrammar(Grammar): rules = [ diff --git a/mode/perl.py b/mode/perl.py index 24b5f40..72ad4a8 100644 --- a/mode/perl.py +++ b/mode/perl.py @@ -1,7 +1,7 @@ import re, sets, string, sys import color, commands, default, method, mode2, regex, tab2 from point import Point -from lex3 import Grammar, PatternRule, ContextPatternRule, RegionRule, OverridePatternRule, PatternGroupRule +from lex import Grammar, PatternRule, ContextPatternRule, RegionRule, OverridePatternRule, PatternGroupRule from method import Argument, Method, WrapParagraph class PodGrammar(Grammar): diff --git a/mode/python.py b/mode/python.py index abcf7c8..059cc13 100644 --- a/mode/python.py +++ b/mode/python.py @@ -1,7 +1,7 @@ import commands, os.path, sets, string, sys, traceback import color, completer, default, mode2, method, regex, tab2 from point import Point -from lex3 import Grammar, PatternRule, RegionRule, OverridePatternRule +from lex import Grammar, PatternRule, RegionRule, OverridePatternRule class StringGrammar(Grammar): rules = [ diff --git a/mode/rst.py b/mode/rst.py index 8e37050..6c4c007 100644 --- a/mode/rst.py +++ b/mode/rst.py @@ -1,5 +1,5 @@ import color, mode2 -from lex3 import Grammar, PatternRule, RegionRule, PatternGroupRule +from lex import Grammar, PatternRule, RegionRule, PatternGroupRule class RSTString(Grammar): rules = [ diff --git a/mode/scheme.py b/mode/scheme.py index 96e6bbf..b075970 100644 --- a/mode/scheme.py +++ b/mode/scheme.py @@ -1,7 +1,7 @@ import commands, os.path, sets, string, sys, traceback import color, completer, default, mode2, method, regex, tab2 from point import Point -from lex3 import Grammar, PatternRule, RegionRule, OverridePatternRule +from lex import Grammar, PatternRule, RegionRule, OverridePatternRule import mode.lisp class SchemeGrammar(Grammar): diff --git a/mode/sh.py b/mode/sh.py index f264781..e4f2749 100644 --- a/mode/sh.py +++ b/mode/sh.py @@ -1,6 +1,6 @@ import commands import color, mode2, tab2 -from lex3 import Grammar, PatternRule, RegionRule +from lex import Grammar, PatternRule, RegionRule from method import Method class StringGrammar(Grammar): diff --git a/mode/sql.py b/mode/sql.py index b853c68..af72b43 100644 --- a/mode/sql.py +++ b/mode/sql.py @@ -1,5 +1,5 @@ import mode2, tab2 -from lex3 import Grammar, PatternRule, NocasePatternRule, RegionRule, NocaseRegionRule +from lex import Grammar, PatternRule, NocasePatternRule, RegionRule, NocaseRegionRule from mode.python import StringGrammar class PlPgSqlGrammar(Grammar): diff --git a/mode/text.py b/mode/text.py index 29ed5ca..1a8e95e 100644 --- a/mode/text.py +++ b/mode/text.py @@ -1,5 +1,5 @@ import color, mode2, method, ispell -from lex3 import Token, Rule, PatternRule, RegionRule, Grammar +from lex import Token, Rule, PatternRule, RegionRule, Grammar class WordRule(PatternRule): def __init__(self): diff --git a/mode/text2.py b/mode/text2.py index ec9b073..ad21bc2 100644 --- a/mode/text2.py +++ b/mode/text2.py @@ -1,5 +1,5 @@ import color, mode2, mode.text, method, ispell -from lex3 import Token, Rule, PatternRule, RegionRule, Grammar +from lex import Token, Rule, PatternRule, RegionRule, Grammar from mode.text import WordRule, ContinuedRule class Text2Grammar(Grammar): diff --git a/mode/tt.py b/mode/tt.py index dc1d966..cdfa9ba 100644 --- a/mode/tt.py +++ b/mode/tt.py @@ -1,5 +1,5 @@ import color, mode2 -from lex3 import Grammar, PatternRule, RegionRule +from lex import Grammar, PatternRule, RegionRule #from mode.xml import TagGrammar from mode.perl import StringGrammar diff --git a/mode/xml.py b/mode/xml.py index 10b50f5..26a2f5c 100644 --- a/mode/xml.py +++ b/mode/xml.py @@ -1,5 +1,5 @@ import color, mode2 -from lex3 import Grammar, PatternRule, RegionRule +from lex import Grammar, PatternRule, RegionRule class TagGrammar(Grammar): rules = [ diff --git a/mode2.py b/mode2.py index 44cada0..5fcc73a 100644 --- a/mode2.py +++ b/mode2.py @@ -1,6 +1,6 @@ import os, sets, string import color, method -from lex3 import Lexer +from lex import Lexer from point import Point DEBUG = False