Skip to content

Commit

Permalink
Add improved grammars for Lex and Bison/Yacc (#4595)
Browse files Browse the repository at this point in the history
  • Loading branch information
Alhadis committed Aug 12, 2019
1 parent 11bfea5 commit 9534a4e
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 25 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,6 @@
[submodule "vendor/grammars/ballerina-grammar"]
path = vendor/grammars/ballerina-grammar
url = https://github.com/ballerina-platform/ballerina-grammar
[submodule "vendor/grammars/bison.tmbundle"]
path = vendor/grammars/bison.tmbundle
url = https://github.com/textmate/bison.tmbundle
[submodule "vendor/grammars/blitzmax"]
path = vendor/grammars/blitzmax
url = https://github.com/textmate/blitzmax.tmbundle
Expand Down Expand Up @@ -521,6 +518,9 @@
[submodule "vendor/grammars/language-gn"]
path = vendor/grammars/language-gn
url = https://github.com/devoncarew/language-gn
[submodule "vendor/grammars/language-grammars"]
path = vendor/grammars/language-grammars
url = https://github.com/Alhadis/language-grammars
[submodule "vendor/grammars/language-graphql"]
path = vendor/grammars/language-graphql
url = https://github.com/rmosolgo/language-graphql
Expand Down
6 changes: 4 additions & 2 deletions grammars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,6 @@ vendor/grammars/babel-sublime:
- source.js.jsx
vendor/grammars/ballerina-grammar:
- source.ballerina
vendor/grammars/bison.tmbundle:
- source.bison
vendor/grammars/blitzmax:
- source.blitzmax
vendor/grammars/boo:
Expand Down Expand Up @@ -453,6 +451,10 @@ vendor/grammars/language-gfm:
- source.gfm
vendor/grammars/language-gn:
- source.gn
vendor/grammars/language-grammars:
- source.lex
- source.lex.regexp
- source.yacc
vendor/grammars/language-graphql:
- source.graphql
vendor/grammars/language-haml:
Expand Down
6 changes: 3 additions & 3 deletions lib/linguist/languages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ BibTeX:
Bison:
type: programming
group: Yacc
tm_scope: source.bison
tm_scope: source.yacc
extensions:
- ".bison"
ace_mode: text
Expand Down Expand Up @@ -2717,7 +2717,7 @@ Lex:
extensions:
- ".l"
- ".lex"
tm_scope: none
tm_scope: source.lex
ace_mode: text
language_id: 199
LilyPond:
Expand Down Expand Up @@ -5890,7 +5890,7 @@ Yacc:
- ".y"
- ".yacc"
- ".yy"
tm_scope: source.bison
tm_scope: source.yacc
ace_mode: text
color: "#4B6C4B"
language_id: 409
Expand Down
5 changes: 3 additions & 2 deletions vendor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
- **Batchfile:** [mmims/language-batchfile](https://github.com/mmims/language-batchfile)
- **Befunge:** [johanasplund/sublime-befunge](https://github.com/johanasplund/sublime-befunge)
- **BibTeX:** [textmate/latex.tmbundle](https://github.com/textmate/latex.tmbundle)
- **Bison:** [textmate/bison.tmbundle](https://github.com/textmate/bison.tmbundle)
- **Bison:** [Alhadis/language-grammars](https://github.com/Alhadis/language-grammars)
- **Blade:** [jawee/language-blade](https://github.com/jawee/language-blade)
- **BlitzBasic:** [textmate/blitzmax.tmbundle](https://github.com/textmate/blitzmax.tmbundle)
- **BlitzMax:** [textmate/blitzmax.tmbundle](https://github.com/textmate/blitzmax.tmbundle)
Expand Down Expand Up @@ -218,6 +218,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
- **Latte:** [textmate/php-smarty.tmbundle](https://github.com/textmate/php-smarty.tmbundle)
- **Lean:** [leanprover/vscode-lean](https://github.com/leanprover/vscode-lean)
- **Less:** [atom/language-less](https://github.com/atom/language-less)
- **Lex:** [Alhadis/language-grammars](https://github.com/Alhadis/language-grammars)
- **LilyPond:** [textmate/lilypond.tmbundle](https://github.com/textmate/lilypond.tmbundle)
- **Liquid:** [bastilian/validcode-textmate-bundles](https://github.com/bastilian/validcode-textmate-bundles)
- **Literate CoffeeScript:** [atom/language-coffee-script](https://github.com/atom/language-coffee-script)
Expand Down Expand Up @@ -445,7 +446,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
- **YANG:** [DzonyKalafut/language-yang](https://github.com/DzonyKalafut/language-yang)
- **YARA:** [blacktop/language-yara](https://github.com/blacktop/language-yara)
- **YASnippet:** [Alhadis/language-emacs-lisp](https://github.com/Alhadis/language-emacs-lisp)
- **Yacc:** [textmate/bison.tmbundle](https://github.com/textmate/bison.tmbundle)
- **Yacc:** [Alhadis/language-grammars](https://github.com/Alhadis/language-grammars)
- **ZAP:** [tclem/vscode-zil-language](https://github.com/tclem/vscode-zil-language)
- **ZIL:** [tclem/vscode-zil-language](https://github.com/tclem/vscode-zil-language)
- **Zeek:** [zeek/zeek-sublime](https://github.com/zeek/zeek-sublime)
Expand Down
1 change: 0 additions & 1 deletion vendor/grammars/bison.tmbundle
Submodule bison.tmbundle deleted from c68322
1 change: 1 addition & 0 deletions vendor/grammars/language-grammars
Submodule language-grammars added at 9ac398
14 changes: 0 additions & 14 deletions vendor/licenses/grammar/bison.tmbundle.txt

This file was deleted.

19 changes: 19 additions & 0 deletions vendor/licenses/grammar/language-grammars.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
type: grammar
name: language-grammars
version: 9ac398fb7327a4501bbb31b22106b8291c20ba83
license: isc
---
Copyright (c) 2018-2019, John Gardner

Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.

THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

0 comments on commit 9534a4e

Please sign in to comment.