diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-12 16:04:45 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-12 16:04:45 +0200 |
| commit | 69246fc8ed0344eae4dab35286813a00010a08cb (patch) | |
| tree | 9c4faf0bcc2bb53e7955aff0b139492ea04dbe2e /lib/coderay/token_kinds.rb | |
| parent | 34e823d709ce19a480dbd78e72e63ada0d3425fb (diff) | |
| parent | 40bd2ef5d33d32c3b3987da1d115b717259819e4 (diff) | |
| download | coderay-69246fc8ed0344eae4dab35286813a00010a08cb.tar.gz | |
Merge branch 'master' into lua-scanner
Conflicts:
lib/coderay/token_kinds.rb
Diffstat (limited to 'lib/coderay/token_kinds.rb')
| -rwxr-xr-x | lib/coderay/token_kinds.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/coderay/token_kinds.rb b/lib/coderay/token_kinds.rb index a0ad5e4..923c859 100755 --- a/lib/coderay/token_kinds.rb +++ b/lib/coderay/token_kinds.rb @@ -29,7 +29,8 @@ module CodeRay :directive => 'directive', :doc => 'doc', :doctype => 'doctype', - :doc_string => 'doc-string', + :docstring => 'doc-string', + :done => 'done', :entity => 'entity', :error => 'error', :escape => 'escape', @@ -39,6 +40,7 @@ module CodeRay :function => 'function', :global_variable => 'global-variable', :hex => 'hex', + :id => 'id', :imaginary => 'imaginary', :important => 'important', :include => 'include', @@ -84,8 +86,4 @@ module CodeRay ) TokenKinds[:method] = TokenKinds[:function] - TokenKinds[:escape] = TokenKinds[:delimiter] - TokenKinds[:docstring] = TokenKinds[:comment] - - TokenKinds.freeze end |