diff --git a/CHANGES.txt b/CHANGES.txt index 78f9f93..648fdbe 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,11 @@ Revision 3.0.0 (2008-09-?): "execfile", "file", "help", "intern", "long", "raw_input", "reduce", "reload", "unichr", "unicode", "xrange"; +Revision 2.6.3 (2008-09-29): + + - Return back trailing 'L' support for numbers. Actually it was changed for + future Python 3.0 syntax but in wrong file; + Revision 2.6.2 (2008-09-22): - Added "VMSError" exception; diff --git a/python.vim b/python.vim index c0dfdfb..614e688 100644 --- a/python.vim +++ b/python.vim @@ -211,20 +211,20 @@ if exists("python_highlight_doctests") && python_highlight_doctests != 0 endif " Numbers (ints, longs, floats, complex) -syn match pythonHexError "\<0[xX]\x*[g-zG-Z]\x*\>" display +syn match pythonHexError "\<0[xX]\x*[g-zG-Z]\x*[lL]\=\>" display -syn match pythonHexNumber "\<0[xX]\x\+\>" display -syn match pythonOctNumber "\<0[oO]\o\+\>" display -syn match pythonBinNumber "\<0[bB][01]\+\>" display +syn match pythonHexNumber "\<0[xX]\x\+[lL]\=\>" display +syn match pythonOctNumber "\<0[oO]\o\+[lL]\=\>" display +syn match pythonBinNumber "\<0[bB][01]\+[lL]\=\>" display -syn match pythonNumber "\<\d\+[jJ]\=\>" display +syn match pythonNumber "\<\d\+[lLjJ]\=\>" display syn match pythonFloat "\.\d\+\([eE][+-]\=\d\+\)\=[jJ]\=\>" display syn match pythonFloat "\<\d\+[eE][+-]\=\d\+[jJ]\=\>" display syn match pythonFloat "\<\d\+\.\d*\([eE][+-]\=\d\+\)\=[jJ]\=" display -syn match pythonOctError "\<0[oO]\=\o*[8-9]\d*\>" display -syn match pythonBinError "\<0[bB][01]*[2-9]\d*\>" display +syn match pythonOctError "\<0[oO]\=\o*[8-9]\d*[lL]\=\>" display +syn match pythonBinError "\<0[bB][01]*[2-9]\d*[lL]\=\>" display if exists("python_highlight_builtins") && python_highlight_builtins != 0 " Builtin functions, types and objects diff --git a/python3.0.vim b/python3.0.vim index 9fbfa54..fb996d4 100644 --- a/python3.0.vim +++ b/python3.0.vim @@ -204,20 +204,20 @@ if exists("python_highlight_doctests") && python_highlight_doctests != 0 endif " Numbers (ints, longs, floats, complex) -syn match pythonHexError "\<0[xX]\x*[g-zG-Z]\x*[lL]\=\>" display +syn match pythonHexError "\<0[xX]\x*[g-zG-Z]\x*\>" display -syn match pythonHexNumber "\<0[xX]\x\+[lL]\=\>" display -syn match pythonOctNumber "\<0[oO]\o\+[lL]\=\>" display -syn match pythonBinNumber "\<0[bB][01]\+[lL]\=\>" display +syn match pythonHexNumber "\<0[xX]\x\+\>" display +syn match pythonOctNumber "\<0[oO]\o\+\>" display +syn match pythonBinNumber "\<0[bB][01]\+\>" display -syn match pythonNumber "\<\d\+[lLjJ]\=\>" display +syn match pythonNumber "\<\d\+[jJ]\=\>" display syn match pythonFloat "\.\d\+\([eE][+-]\=\d\+\)\=[jJ]\=\>" display syn match pythonFloat "\<\d\+[eE][+-]\=\d\+[jJ]\=\>" display syn match pythonFloat "\<\d\+\.\d*\([eE][+-]\=\d\+\)\=[jJ]\=" display -syn match pythonOctError "\<0[oO]\=\o*[8-9]\d*[lL]\=\>" display -syn match pythonBinError "\<0[bB][01]*[2-9]\d*[lL]\=\>" display +syn match pythonOctError "\<0[oO]\=\o*[8-9]\d*\>" display +syn match pythonBinError "\<0[bB][01]*[2-9]\d*\>" display if exists("python_highlight_builtins") && python_highlight_builtins != 0 " Builtin functions, types and objects diff --git a/test.py b/test.py index 140a20d..1fa4220 100644 --- a/test.py +++ b/test.py @@ -48,7 +48,7 @@ RuntimeWarning FutureWarning OverflowWarning ImportWarning UnicodeWarning # Numbers -0 0x1f 077 .3 12.34 100L 0j 0j 34.2E-3 0b10 0o77 0xfffffffL +0 0x1f 077 .3 12.34 100L 0j 0j 34.2E-3 0b10 0o77 0xfffffffL 0L # Erroneous numbers