Merge branch 'master' of github.com:stevedonovan/LDoc

This commit is contained in:
steve donovan 2016-04-10 18:02:59 +02:00
commit 2ddb9c64c7
1 changed files with 2 additions and 0 deletions

View File

@ -305,6 +305,7 @@ function lexer.lua(s,filter,options)
{'^`[^`]+`',bdump},
{'^%-%-%[(=*)%[.-%]%1%]',cdump},
{'^%-%-.-\n',cdump},
{'^%-%-.-$',cdump},
{'^%[(=*)%[.-%]%1%]',sdump_l},
{'^==',tdump},
{'^~=',tdump},
@ -354,6 +355,7 @@ function lexer.cpp(s,filter,options,no_string)
{STRING1,chdump},
{STRING2,sdump},
{'^//.-\n',cdump},
{'^//.-$',cdump},
{'^/%*.-%*/',cdump},
{'^==',tdump},
{'^!=',tdump},