Merge pull request #2390 from larsbrinkhoff/lex-yacc

Add Lex and Yacc languages

lib/linguist/heuristics.rb

@@ -289,5 +289,15 @@ module Linguist
         Language["RenderScript"]
       end
     end
+
+    disambiguate "Common Lisp", "Lex", "Groff" do |data|
+      if data.include?("(def(un|macro)\s")
+        Language["Common Lisp"]
+      elsif /^(%[%{}]xs|<.*>)/.match(data)
+        Language["Lex"]
+      elsif /^\.[a-z][a-z](\s|$)/.match(data)
+        Language["Groff"]
+      end
+    end
   end
 end

lib/linguist/languages.yml

@@ -296,9 +296,10 @@ Befunge:
 
 Bison:
   type: programming
+  group: Yacc
   tm_scope: source.bison
   extensions:
-  - .y
+  - .bison
   ace_mode: text
 
 BitBake:
@@ -601,6 +602,7 @@ Common Lisp:
   - .lisp
   - .asd
   - .cl
+  - .l
   - .lsp
   - .ny
   - .podsl
@@ -1213,6 +1215,7 @@ Groff:
   - '.5'
   - '.6'
   - '.7'
+  - .l
   tm_scope: text.groff
   aliases:
   - nroff
@@ -1469,6 +1472,7 @@ J:
 JFlex:
   type: programming
   color: "#DBCA00"
+  group: Lex
   extensions:
   - .flex
   - .jflex
@@ -1704,6 +1708,17 @@ Less:
   tm_scope: source.css.less
   ace_mode: less
 
+Lex:
+  type: programming
+  color: "#DBCA00"
+  aliases:
+  - flex
+  extensions:
+  - .l
+  - .lex
+  tm_scope: none
+  ace_mode: text
+
 LilyPond:
   type: programming
   extensions:
@@ -3574,6 +3589,15 @@ YAML:
   - .yaml
   ace_mode: yaml
 
+Yacc:
+  type: programming
+  extensions:
+  - .y
+  - .yacc
+  - .yy
+  tm_scope: source.bison
+  ace_mode: text
+
 Zephir:
   type: programming
   color: "#118f9e"