Permalink
Browse files

Merge branch 'merg'

  • Loading branch information...
2 parents fc89e94 + 95a16a4 commit b08a17c02133b1e95e69514cf8c540e350bcccc4 @grosser committed Oct 1, 2011
Showing with 5 additions and 3 deletions.
  1. +4 −2 lib/language_sniffer/languages.yml
  2. +1 −1 test/test_language.rb
@@ -505,6 +505,7 @@ JavaScript:
- .jsm
- .jss
- .jsx
+ - .pac
- .sjs
- .ssjs
filenames:
@@ -891,7 +892,8 @@ Smarty:
- .tpl
Standard ML:
- lexer: OCaml
+ type: programming
+ lexer: Standard ML
aliases:
- sml
primary_extension: .sml
@@ -962,7 +964,7 @@ Vala:
Verilog:
type: programming
- lexer: Text only
+ lexer: verilog
extensions:
- .v
@@ -52,7 +52,7 @@ def test_lexer
assert_equal Lexer['NASM'], Language['Assembly'].lexer
assert_equal Lexer['OCaml'], Language['F#'].lexer
assert_equal Lexer['OCaml'], Language['OCaml'].lexer
- assert_equal Lexer['OCaml'], Language['Standard ML'].lexer
+ assert_equal Lexer['Standard ML'], Language['Standard ML'].lexer
assert_equal Lexer['Ooc'], Language['ooc'].lexer
assert_equal Lexer['REBOL'], Language['Rebol'].lexer
assert_equal Lexer['RHTML'], Language['HTML+ERB'].lexer

0 comments on commit b08a17c

Please sign in to comment.