WIP

Author: CMCDragonkai

lib/config/ConfigInterpreter.js

@@ -19,7 +19,7 @@ class ConfigInterpreter {
     const text = this._readFile(path);
     const tokens = configLexer.tokenize(text).tokens;
     const parser = new ConfigParser(this.interpret.bind(this));
-    parser.parse(tokens, map);
+    parser.execute(tokens, map);
     return map;
   }
 

lib/config/ConfigParser.js

@@ -1,4 +1,6 @@
 // @flow
+import typeof { Token } from 'chevrotain';
+
 import { Parser } from 'chevrotain';
 import {
   HeaderNameT,
@@ -18,6 +20,8 @@ type value = string|number|boolean;
 type section = Map<key, Array<value>>;
 type sectionKey = string;
 type config = Map<sectionKey, section>;
+type path = string;
+type interpret = (path, config) => config;
 
 /*
   top    ::= (header body)*
@@ -28,22 +32,19 @@ type config = Map<sectionKey, section>;
 */
 class ConfigParser extends Parser {
 
+  _interpret: interpret;
   _map: config;
 
-  constructor (
-    interpret,
-    config
-  ) {
-    super([], lexicalGrammar, config);
+  constructor (interpret: interpret, parserOptions: Object) {
+    super([], lexicalGrammar, parserOptions);
     this._interpret = interpret;
     Parser.performSelfAnalysis(this);
   }
 
-  parse (input, map = new Map) {
+  execute (input: Array<Token>, map: config): void {
     this._map = map;
     super.input = input;
     super.SUBRULE(this.top, [map]);
-    return map;
   }
 
   top = super.RULE('top', (map) => {
@@ -95,6 +96,11 @@ class ConfigParser extends Parser {
   });
 
   body = super.RULE('body', (map: section) => {
+    // here is where we know if a key is an actual path
+    // such that if this path key is within a special section
+    // that being of include or includeIf
+    // then we actually perform the inclusion and the recursive interpretation
+    // so we need to pass in that information as a parameter
     super.MANY(() => {
       const key = super.SUBRULE(this.key);
       let values = map.get(key);
@@ -139,4 +145,12 @@ class ConfigParser extends Parser {
 
 export default ConfigParser;
 
-export type { config, sectionKey, section, key, value };
+export type {
+  interpret,
+  path,
+  config,
+  sectionKey,
+  section,
+  key,
+  value
+};

testy.js

@@ -2,6 +2,7 @@ import fs from 'fs';
 import { Lexer } from 'chevrotain';
 import { lexicalGrammar } from './lib/config/ConfigLexer.js';
 import ConfigParser from './lib/config/ConfigParser.js';
+import interpreter from './lib/config/ConfigInterpreter.js';
 import util from 'util';
 
 const lexer = new Lexer(lexicalGrammar);