Improvements to Matlab lexer #1271
Conversation
- Detect `.m` files starting with a function definition as MATLAB, not ObjC (pygments#1149). - Require word boundaries in regexes matching numbers and floats, to avoid mishighlighting `load 123file` as starting with a number.
pygments/lexers/matlab.py
Outdated
| @@ -72,6 +72,8 @@ class MatlabLexer(RegexLexer): | |||
| "hilb", "invhilb", "magic", "pascal", "rosser", "toeplitz", "vander", | |||
| "wilkinson") | |||
|
|
|||
| _operators = r'-|==|~=|<|>|<=|>=|&&|&|~|\|\|?|\.\*|\*|\+|\.\^|\.\\|\.\/|\/|\\' | |||
There was a problem hiding this comment.
this will find < before <=, the order has to be different (I know you just moved the definition)
Or, better, use words() which will automatically escape and order the regex to avoid this problem.
There was a problem hiding this comment.
I just reordered the elements, will pass on the bigger refactoring.
pygments/lexers/matlab.py
Outdated
| if re.match(r'^\s*%', text, re.M): # comment | ||
| # function declaration. | ||
| if next(line for line in text.splitlines() | ||
| if not re.match(r'^\s*%', text)).strip().startswith('function'): |
There was a problem hiding this comment.
I think you can just re.search(r'^function\b') with re.MULTILINE.
Although this is a bit problematic for safe identification, since e.g. JavaScript functions are also defined that way. (analyse_text can also be used when no filename is known.)
Maybe you can also match the equals sign which I gather is always part of the function header?
There was a problem hiding this comment.
I don't think the single regex is equivalent, the point is that the first line that isn't fully commented should start with function.
No, there isn't always an equal sign (if the function doesn't return anything).
There was a problem hiding this comment.
ah, I missed that, sorry. Still very possible in Javascript though... maybe exclude if { comes later?
pygments/lexers/matlab.py
Outdated
| # is recognized if it is either surrounded by spaces or by no | ||
| # spaces on both sides; only the former case matters for us. (This | ||
| # allows distinguishing `cd ./foo` from `cd ./ foo`.) | ||
| (r'(?:(?<=^)|(?<=;))\s*\w+\s+(?!=|\(|(%s)\s+)' % _operators, Name, |
There was a problem hiding this comment.
No lookbehind is needed for ^.
|
thanks, all comments handled. |
MATLAB treats a bare word followed by arguments such as `foo bar baz` as
the function call `foo('bar', 'baz')`. As such, treat everything that
follows the bare word as a string.
|
Thanks! |
.mfiles starting with a function definition as MATLAB, notObjC.
avoid mishighlighting
load 123fileas starting with a number.foo bar bazasthe function call
foo('bar', 'baz'). As such, treat everything thatfollows the bare word as a string.
Just a revival of https://bitbucket.org/birkenfeld/pygments-main/pull-requests/676/matlab-detection-float-boundaries/diff.