summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Closing branch 604b8a0f-93a0-4b5c-b778-ce64f80c564e.604b8a0f-93a0-4b5c-b778-ce64f80c564eGeorg Brandl2016-03-170-0/+0
|
* Add 'asm' as a C keyword.Matthew Fernandez2016-03-171-5/+6
| | | | | | | | | | | | | | | | | | | | | | | The C standards allow the use of inline assembly with the `asm` keyword (see ?J.5.10 of C99 for example). This commit adds 'asm' as a supported keyword to the base C lexer, `CFamilyLexer`, and removes it from `CppLexer` which inherits from this base. The intended effect is supporting the `asm` keyword for the C lexer, while leaving the behaviour of the C++ lexer identical. Side-effects of adding this keyword are that 'asm' is now also supported as a keyword in the following lexers: - CUDA. Inline PTX assembler is supported in CUDA with this syntax, so this is correct. - eC. It claims to be a superset of C, so this is correct. - nesC. As far as I can tell, nesC supports inline assembly through the same syntax, so this is correct. - Objective-C. I believe inline assembly is supported in Objective-C, but using the keyword `__asm__` instead, so this is somewhat incorrect. However, note that the Objective-C++ lexer currently incorrectly supports `asm` as well. Closes #1219
* Merged in 1ec5/pygments-main/1ec5/added-swift-22-keywords-1457594214041 ↵Georg Brandl2016-03-100-0/+0
|\ | | | | | | | | | | (pull request #568) Added Swift 2.2 keywords
* | Added Swift 2.2 keywordsMinh Nguy?n2016-03-101-11/+14
|/
* Fix Batch stringsDavid Corbett2016-03-012-4/+8
|
* Merged in xuhdev/pygments-main/bash-variable (pull request #562)Georg Brandl2016-02-290-0/+0
|\ | | | | | | Bash lexer: letter from "g" to "z" should also be treated as part of a variable name.
* | Bash lexer: letter from "g" to "z" should also be treated as part of a ↵Hong Xu2016-02-281-1/+1
|/ | | | | | variable name. Fixes #1214
* merge with stableGeorg Brandl2016-02-2692-1316/+8484
|\
| * Remove ez_setup.pyGeorg Brandl2016-02-242-398/+10
| |
| * Add renaming keyword 'as' to Chapel lexer.Lydia Duncan2016-02-231-9/+9
| |
| * Xtlang: regexlint fixes.Georg Brandl2016-02-171-3/+3
| |
| * Merge in Extempore lexer (PR#530)Georg Brandl2016-02-175-1/+1310
| |\
| | * add lexer for the Extempore programming language/environmentBen Swift2015-12-114-2/+1309
| | | | | | | | | | | | | | | | | | | | | for more info, see http://extempore.moso.com.au https://github.com/digego/extempore
| * | NCL: add to changelog, mapping, and fix nits.Georg Brandl2016-02-173-8/+10
| | |
| * | Merged in wqshen/pygments-main (pull request #536)Georg Brandl2016-02-172-0/+1073
| |\ \ | | | | | | | | | | | | Add a lexer for NCAR Command Language (NCL)
| | * | test.ncl created online with BitbucketSHEN Wenqiang2016-01-061-0/+20
| | | | | | | | | | | | | | | | this file is a test NCL script.
| | * | ncl.py created online with BitbucketSHEN Wenqiang2016-01-061-0/+1053
| | | |
| * | | regexlint fixes.Georg Brandl2016-02-172-2/+2
| | | |
| * | | JSGF: add to CHANGES, add versionaddedGeorg Brandl2016-02-172-1/+3
| | | |
| * | | Merged in dscorbett/pygments-jsgf (pull request #546)Georg Brandl2016-02-174-5/+115
| |\ \ \ | | | | | | | | | | | | | | | Add a lexer for JSGF
| | * | | Add a lexer for JSGFDavid Corbett2016-01-244-5/+115
| | | | |
| * | | | LLVM lexer: use words()Georg Brandl2016-02-171-61/+40
| | | | |
| * | | | Hsail: fix two issues to lex examplefile.Georg Brandl2016-02-171-3/+2
| | | | |
| * | | | Merge in HSAIL lexer (PR#518).Georg Brandl2016-02-17121-1574/+10078
| |\ \ \ \
| | * | | | CAmkES update (PR#552)Georg Brandl2016-02-171-8/+13
| | | | | |
| | * | | | Fix unused import.Georg Brandl2016-02-171-1/+1
| | | | | |
| | * | | | Add Silver to changelog, move Boogie&Silver to one module.Georg Brandl2016-02-174-70/+54
| | | | | |
| | * | | | Merged in fhahn/pygments-main/silver-lexer (pull request #537)Georg Brandl2016-02-175-47/+336
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add lexer for the Silver language
| | | * | | | Move Silver and Boogie lexers to separate modulesFlorian Hahn2016-02-114-96/+130
| | | | | | |
| | | * | | | Add lexer for the Silver languageFlorian Hahn2016-01-063-1/+256
| | | | |/ / | | | |/| |
| | * | | | Flatline: add to changelog, style nits.Georg Brandl2016-02-173-29/+31
| | | | | |
| | * | | | Merged in cheesinglee/pygments-main (pull request #551)Georg Brandl2016-02-1768-531/+2409
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add Flatline lexer
| | | * | | | Add wdiff to authors/changes.Georg Brandl2016-02-174-762/+6
| | | | | | |
| | | * | | | Merged in hhsprings/pygments-hhs-sub/add-wdiff-lexer (pull request #513)Georg Brandl2016-02-175-0/+370
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add the lexer for wdiff output. (close #960)
| | | | * | | | Fixes Clean indentation issuesCamil Staps2016-02-161-12/+14
| | | | | | | |
| | | | * | | | Clean lexer: style nitsGeorg Brandl2016-02-163-63/+61
| | | | | | | |
| | | | * | | | Merged in camilstaps/pygments-main (pull request #503)Georg Brandl2016-02-164-0/+370
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a Clean (http://clean.cs.ru.nl/Clean) Lexer and example file
| | | | | * | | | Adapted CleanLexer according to PR discussionCamil Staps2016-02-161-16/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most importantly, CleanLexer now stores indent in a LexerContext instead of in the lexer instance.
| | | | | * | | | Fixes & cleanup Clean lexer as per PR discussionCamil Staps2016-02-163-21/+21
| | | | | | | | |
| | | | | * | | | Fix previous commitCamil Staps2016-02-161-7/+7
| | | | | | | | |
| | | | | * | | | Store indent in lexer instanceCamil Staps2016-02-161-13/+8
| | | | | | | | |
| | | | | * | | | Fix Clean: allow typedef on first lineCamil Staps2016-02-161-0/+1
| | | | | | | | |
| | | | | * | | | Adds a Clean (http://clean.cs.ru.nl/Clean) Lexer and example fileCamil Staps2015-10-044-0/+368
| | | | | | | | |
| | | * | | | | | Merged default into add-wdiff-lexerHiroaki Itoh2016-02-165-1/+1560
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Merged default into add-wdiff-lexerHiroaki Itoh2016-02-0339-417/+2861
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merged default into add-wdiff-lexerHiroaki Itoh2016-01-195-1/+1560
| | | | |\ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| | | | | * | | | | Merged default into add-wdiff-lexerHiroaki Itoh2015-11-155-1/+1560
| | | | | |\ \ \ \ \ | | | | | | |_|_|_|/ | | | | | |/| | | |
| | | | | | * | | | Merged default into add-wdiff-lexerHiroaki Itoh2015-11-125-1/+1560
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merged default into add-wdiff-lexerHiroaki Itoh2015-11-108-1/+363
| | | | | | | |\ \ \ \
| | | | | | | * \ \ \ \ Merged default into add-wdiff-lexerHiroaki Itoh2015-11-104-2/+2883
| | | | | | | |\ \ \ \ \