--HG--

branch : pmacs2

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)])

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

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 = [

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...

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):

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):

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):

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 = [

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
 

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 = [

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
 

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
 

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
 

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
 

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):

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):

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 = [

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 = [

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 = [

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):

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 = [

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 = [

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):

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):

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):

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):

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):

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
 

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 = [

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