Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added options object for dateFromGrammarFile method
  • Loading branch information
misdocumeno committed Jun 24, 2022
commit d0b13e4715b6fa8248593cc9d60c72bc4d1e592c
5 changes: 4 additions & 1 deletion src/bin/syntax.js
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,10 @@ function getGrammar(grammarFile, mode) {
return null;
}

const grammarData = Grammar.dataFromGrammarFile(grammarFile, 'bnf', options.loc);
const grammarData = Grammar.dataFromGrammarFile(grammarFile, {
Comment thread
misdocumeno marked this conversation as resolved.
grammarType: 'bnf',
useLocation: options.loc,
});

// If explicit lexical grammar file was passed, use it.
const lexGrammarData = getLexGrammarData(options);
Expand Down
4 changes: 2 additions & 2 deletions src/grammar/grammar.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ export default class Grammar {
* Reads grammar file data. Supports reading `bnf`,
* and `lex` grammars based on mode.
*/
static dataFromGrammarFile(grammarFile, grammarType = 'bnf', loc = false) {
static dataFromGrammarFile(grammarFile, { grammarType = 'bnf', useLocation = false }) {
const grammar = fs.readFileSync(grammarFile, 'utf8');

// check if the bnf grammar contains location capture characters
if (grammarType === 'bnf' && !loc) {
if (grammarType === 'bnf' && !useLocation) {
const bnf = grammar
// lexer rules
.replace(/%lex[\n\s\S]*?\/lex/g, '')
Expand Down