yapp 2.2.47 → 2.2.52

package/lib/parser/yapp.js

@@ -0,0 +1,126 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.default = void 0;
+var _occamParsers = require("occam-parsers");
+var _parser = require("../utilities/parser");
+function _assertThisInitialized(self) {
+    if (self === void 0) {
+        throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    }
+    return self;
+}
+function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
+}
+function _defineProperties(target, props) {
+    for(var i = 0; i < props.length; i++){
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+    }
+}
+function _createClass(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
+}
+function _getPrototypeOf(o) {
+    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
+        return o.__proto__ || Object.getPrototypeOf(o);
+    };
+    return _getPrototypeOf(o);
+}
+function _inherits(subClass, superClass) {
+    if (typeof superClass !== "function" && superClass !== null) {
+        throw new TypeError("Super expression must either be null or a function");
+    }
+    subClass.prototype = Object.create(superClass && superClass.prototype, {
+        constructor: {
+            value: subClass,
+            writable: true,
+            configurable: true
+        }
+    });
+    if (superClass) _setPrototypeOf(subClass, superClass);
+}
+function _possibleConstructorReturn(self, call) {
+    if (call && (_typeof(call) === "object" || typeof call === "function")) {
+        return call;
+    }
+    return _assertThisInitialized(self);
+}
+function _setPrototypeOf(o, p) {
+    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+        o.__proto__ = p;
+        return o;
+    };
+    return _setPrototypeOf(o, p);
+}
+var _typeof = function(obj) {
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+};
+function _isNativeReflectConstruct() {
+    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
+    if (Reflect.construct.sham) return false;
+    if (typeof Proxy === "function") return true;
+    try {
+        Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
+        return true;
+    } catch (e) {
+        return false;
+    }
+}
+function _createSuper(Derived) {
+    var hasNativeReflectConstruct = _isNativeReflectConstruct();
+    return function _createSuperInternal() {
+        var Super = _getPrototypeOf(Derived), result;
+        if (hasNativeReflectConstruct) {
+            var NewTarget = _getPrototypeOf(this).constructor;
+            result = Reflect.construct(Super, arguments, NewTarget);
+        } else {
+            result = Super.apply(this, arguments);
+        }
+        return _possibleConstructorReturn(this, result);
+    };
+}
+var YappParser = /*#__PURE__*/ function(CommonParser) {
+    _inherits(YappParser, CommonParser);
+    var _super = _createSuper(YappParser);
+    function YappParser() {
+        _classCallCheck(this, YappParser);
+        return _super.apply(this, arguments);
+    }
+    _createClass(YappParser, null, [
+        {
+            key: "fromNothing",
+            value: function fromNothing(Class) {
+                var bnf = Class.bnf, rules = (0, _parser).rulesFromBNF(bnf), parser = (0, _parser).parserFromRules(Class, rules);
+                return parser;
+            }
+        },
+        {
+            key: "fromBNF",
+            value: function fromBNF(Class, bnf) {
+                var rules = (0, _parser).rulesFromBNF(bnf), parser = (0, _parser).parserFromRules(Class, rules);
+                return parser;
+            }
+        },
+        {
+            key: "fromRules",
+            value: function fromRules(Class, rules) {
+                var parser = (0, _parser).parserFromRules(Class, rules);
+                return parser;
+            }
+        }
+    ]);
+    return YappParser;
+}(_occamParsers.CommonParser);
+exports.default = YappParser;
+
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYXJzZXIveWFwcC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgQ29tbW9uUGFyc2VyIH0gZnJvbSBcIm9jY2FtLXBhcnNlcnNcIjtcblxuaW1wb3J0IHsgcnVsZXNGcm9tQk5GLCBwYXJzZXJGcm9tUnVsZXMgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3BhcnNlclwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBZYXBwUGFyc2VyIGV4dGVuZHMgQ29tbW9uUGFyc2VyIHtcbiAgc3RhdGljIGZyb21Ob3RoaW5nKENsYXNzKSB7XG4gICAgY29uc3QgeyBibmYgfSA9IENsYXNzLFxuICAgICAgICAgIHJ1bGVzID0gcnVsZXNGcm9tQk5GKGJuZiksXG4gICAgICAgICAgcGFyc2VyID0gcGFyc2VyRnJvbVJ1bGVzKENsYXNzLCBydWxlcyk7XG5cbiAgICByZXR1cm4gcGFyc2VyO1xuICB9XG5cbiAgc3RhdGljIGZyb21CTkYoQ2xhc3MsIGJuZikge1xuICAgIGNvbnN0IHJ1bGVzID0gcnVsZXNGcm9tQk5GKGJuZiksXG4gICAgICAgICAgcGFyc2VyID0gcGFyc2VyRnJvbVJ1bGVzKENsYXNzLCBydWxlcyk7XG5cbiAgICByZXR1cm4gcGFyc2VyO1xuICB9XG5cbiAgc3RhdGljIGZyb21SdWxlcyhDbGFzcywgcnVsZXMpIHtcbiAgICBjb25zdCBwYXJzZXIgPSBwYXJzZXJGcm9tUnVsZXMoQ2xhc3MsIHJ1bGVzKTtcblxuICAgIHJldHVybiBwYXJzZXI7XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJZYXBwUGFyc2VyIiwiZnJvbU5vdGhpbmciLCJDbGFzcyIsImJuZiIsInJ1bGVzIiwicGFyc2VyIiwiZnJvbUJORiIsImZyb21SdWxlcyJdLCJtYXBwaW5ncyI6IkFBQUEsQ0FBWTs7Ozs7QUFFaUIsR0FBZSxDQUFmLGFBQWU7QUFFRSxHQUFxQixDQUFyQixPQUFxQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztJQUU5Q0EsVUFBVSxpQkFBaEIsUUFBUTtjQUFGQSxVQUFVOzhCQUFWQSxVQUFVO2FBQVZBLFVBQVU7OEJBQVZBLFVBQVU7OztpQkFBVkEsVUFBVTs7WUFDdEJDLEdBQVcsRUFBWEEsQ0FBVzttQkFBbEIsUUFBUSxDQUFEQSxXQUFXLENBQUNDLEtBQUssRUFBRSxDQUFDO2dCQUN6QixHQUFLLENBQUdDLEdBQUcsR0FBS0QsS0FBSyxDQUFiQyxHQUFHLEVBQ0xDLEtBQUssT0FMK0IsT0FBcUIsZUFLcENELEdBQUcsR0FDeEJFLE1BQU0sT0FOOEIsT0FBcUIsa0JBTWhDSCxLQUFLLEVBQUVFLEtBQUs7Z0JBRTNDLE1BQU0sQ0FBQ0MsTUFBTTtZQUNmLENBQUM7OztZQUVNQyxHQUFPLEVBQVBBLENBQU87bUJBQWQsUUFBUSxDQUFEQSxPQUFPLENBQUNKLEtBQUssRUFBRUMsR0FBRyxFQUFFLENBQUM7Z0JBQzFCLEdBQUssQ0FBQ0MsS0FBSyxPQVorQixPQUFxQixlQVlwQ0QsR0FBRyxHQUN4QkUsTUFBTSxPQWI4QixPQUFxQixrQkFhaENILEtBQUssRUFBRUUsS0FBSztnQkFFM0MsTUFBTSxDQUFDQyxNQUFNO1lBQ2YsQ0FBQzs7O1lBRU1FLEdBQVMsRUFBVEEsQ0FBUzttQkFBaEIsUUFBUSxDQUFEQSxTQUFTLENBQUNMLEtBQUssRUFBRUUsS0FBSyxFQUFFLENBQUM7Z0JBQzlCLEdBQUssQ0FBQ0MsTUFBTSxPQW5COEIsT0FBcUIsa0JBbUJoQ0gsS0FBSyxFQUFFRSxLQUFLO2dCQUUzQyxNQUFNLENBQUNDLE1BQU07WUFDZixDQUFDOzs7V0FwQmtCTCxVQUFVO0VBSkYsYUFBZTtrQkFJdkJBLFVBQVUifQ==

package/lib/utilities/parser.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.rulesFromBNF = rulesFromBNF;
+exports.parserFromRules = parserFromRules;
+var _occamLexers = require("occam-lexers");
+var _occamParsers = require("occam-parsers");
+var _occamGrammarUtilities = require("occam-grammar-utilities");
+var _rules = require("../utilities/rules");
+var bnfLexer = _occamLexers.BNFLexer.fromNothing(), bnfParser = _occamParsers.BNFParser.fromNothing();
+function rulesFromBNF(bnf) {
+    var tokens = bnfLexer.tokensFromBNF(bnf), rules = bnfParser.rulesFromTokens(tokens);
+    return rules;
+}
+function parserFromRules(Class, rules) {
+    var ruleMap = (0, _rules).ruleMapFromRules(rules);
+    var startRule = (0, _rules).startRuleFromRules(rules);
+    startRule = (0, _occamGrammarUtilities).eliminateLeftRecursion(startRule, ruleMap);
+    var parser = new Class(startRule, ruleMap);
+    return parser;
+}
+
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvcGFyc2VyLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBCTkZMZXhlciB9IGZyb20gXCJvY2NhbS1sZXhlcnNcIjtcbmltcG9ydCB7IEJORlBhcnNlciB9IGZyb20gXCJvY2NhbS1wYXJzZXJzXCI7XG5pbXBvcnQgeyBlbGltaW5hdGVMZWZ0UmVjdXJzaW9uIH0gZnJvbSBcIm9jY2FtLWdyYW1tYXItdXRpbGl0aWVzXCI7XG5cbmltcG9ydCB7IHJ1bGVNYXBGcm9tUnVsZXMsIHN0YXJ0UnVsZUZyb21SdWxlcyB9IGZyb20gXCIuLi91dGlsaXRpZXMvcnVsZXNcIjtcblxuY29uc3QgYm5mTGV4ZXIgPSBCTkZMZXhlci5mcm9tTm90aGluZygpLFxuICAgICAgYm5mUGFyc2VyID0gQk5GUGFyc2VyLmZyb21Ob3RoaW5nKCk7XG5cbmV4cG9ydCBmdW5jdGlvbiBydWxlc0Zyb21CTkYoYm5mKSB7XG4gIGNvbnN0IHRva2VucyA9IGJuZkxleGVyLnRva2Vuc0Zyb21CTkYoYm5mKSxcbiAgICAgICAgcnVsZXMgPSBibmZQYXJzZXIucnVsZXNGcm9tVG9rZW5zKHRva2Vucyk7XG5cbiAgcmV0dXJuIHJ1bGVzO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gcGFyc2VyRnJvbVJ1bGVzKENsYXNzLCBydWxlcykge1xuICBjb25zdCBydWxlTWFwID0gcnVsZU1hcEZyb21SdWxlcyhydWxlcyk7XG5cbiAgbGV0IHN0YXJ0UnVsZSA9IHN0YXJ0UnVsZUZyb21SdWxlcyhydWxlcyk7XG5cbiAgc3RhcnRSdWxlID0gZWxpbWluYXRlTGVmdFJlY3Vyc2lvbihzdGFydFJ1bGUsIHJ1bGVNYXApO1xuXG4gIGNvbnN0IHBhcnNlciA9IG5ldyBDbGFzcyhzdGFydFJ1bGUsIHJ1bGVNYXApO1xuXG4gIHJldHVybiBwYXJzZXI7XG59XG4iXSwibmFtZXMiOlsicnVsZXNGcm9tQk5GIiwicGFyc2VyRnJvbVJ1bGVzIiwiYm5mTGV4ZXIiLCJmcm9tTm90aGluZyIsImJuZlBhcnNlciIsImJuZiIsInRva2VucyIsInRva2Vuc0Zyb21CTkYiLCJydWxlcyIsInJ1bGVzRnJvbVRva2VucyIsIkNsYXNzIiwicnVsZU1hcCIsInN0YXJ0UnVsZSIsInBhcnNlciJdLCJtYXBwaW5ncyI6IkFBQUEsQ0FBWTs7OztRQVdJQSxZQUFZLEdBQVpBLFlBQVk7UUFPWkMsZUFBZSxHQUFmQSxlQUFlO0FBaEJOLEdBQWMsQ0FBZCxZQUFjO0FBQ2IsR0FBZSxDQUFmLGFBQWU7QUFDRixHQUF5QixDQUF6QixzQkFBeUI7QUFFWCxHQUFvQixDQUFwQixNQUFvQjtBQUV6RSxHQUFLLENBQUNDLFFBQVEsR0FOVyxZQUFjLFVBTWJDLFdBQVcsSUFDL0JDLFNBQVMsR0FOVyxhQUFlLFdBTWJELFdBQVc7U0FFdkJILFlBQVksQ0FBQ0ssR0FBRyxFQUFFLENBQUM7SUFDakMsR0FBSyxDQUFDQyxNQUFNLEdBQUdKLFFBQVEsQ0FBQ0ssYUFBYSxDQUFDRixHQUFHLEdBQ25DRyxLQUFLLEdBQUdKLFNBQVMsQ0FBQ0ssZUFBZSxDQUFDSCxNQUFNO0lBRTlDLE1BQU0sQ0FBQ0UsS0FBSztBQUNkLENBQUM7U0FFZVAsZUFBZSxDQUFDUyxLQUFLLEVBQUVGLEtBQUssRUFBRSxDQUFDO0lBQzdDLEdBQUssQ0FBQ0csT0FBTyxPQWJzQyxNQUFvQixtQkFhdENILEtBQUs7SUFFdEMsR0FBRyxDQUFDSSxTQUFTLE9BZnNDLE1BQW9CLHFCQWVwQ0osS0FBSztJQUV4Q0ksU0FBUyxPQW5CNEIsc0JBQXlCLHlCQW1CM0JBLFNBQVMsRUFBRUQsT0FBTztJQUVyRCxHQUFLLENBQUNFLE1BQU0sR0FBRyxHQUFHLENBQUNILEtBQUssQ0FBQ0UsU0FBUyxFQUFFRCxPQUFPO0lBRTNDLE1BQU0sQ0FBQ0UsTUFBTTtBQUNmLENBQUMifQ==

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "yapp",
   "author": "James Smith",
-  "version": "2.2.47",
+  "version": "2.2.52",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/yapp",
   "description": "Yet Another Pretty Printer.",
@@ -17,7 +17,7 @@
     "occam-dom": "^3.0.74",
     "occam-grammar-utilities": "^5.0.80",
     "occam-lexers": "^15.0.1",
-    "occam-parsers": "^14.0.67"
+    "occam-parsers": "^14.1.1"
   },
   "devDependencies": {
     "@swc/core": "^1.2.106",

package/src/example/view/javascript.js

@@ -5,9 +5,11 @@ import View from "../view";
 import JavaScriptPlugin from "../../plugin/javascript";
 
 export default class JavaScriptView extends View {
-  Plugin = JavaScriptPlugin;
+  static Plugin = JavaScriptPlugin;
 
-  initialContent = `"use strict";
+  static firaCode = true;
+
+  static initialContent = `"use strict";
 
 import "juxtapose";
 

package/src/example/view/json.js

@@ -5,9 +5,11 @@ import View from "../view";
 import JSONPlugin from "../../plugin/json";
 
 export default class JSONView extends View {
-  Plugin = JSONPlugin;
+  static Plugin = JSONPlugin;
 
-  initialContent = `{  
+  static firaCode = true;
+
+  static initialContent = `{  
   "type": "book",
   "title": "Look to Windward",
   "author": "Look to Windward",

package/src/example/view/xml.js

@@ -5,9 +5,11 @@ import View from "../view";
 import XMLPlugin from "../../plugin/xml";
 
 export default class XMLView extends View {
-  Plugin = XMLPlugin;
+  static Plugin = XMLPlugin;
 
-  initialContent = `<?xml version="1.0" encoding="UTF-8"?>
+  static firaCode = false;
+
+  static initialContent = `<?xml version="1.0" encoding="UTF-8"?>
 <!-- Look to Windward by Iain M. Banks -->
 <book>
   <name>

package/src/example/view.js

@@ -5,12 +5,11 @@ import withStyle from "easy-with-style";  ///
 import { Element } from "easy";
 import { BNFLexer } from "occam-lexers";
 import { BNFParser } from "occam-parsers";
-import { RowDiv, RowsDiv, ColumnDiv } from "easy-layout";
 import { eliminateLeftRecursion, removeOrRenameIntermediateNodes } from "occam-grammar-utilities";
+import { RowDiv, RowsDiv, ColumnDiv, ColumnsDiv, VerticalSplitterDiv, HorizontalSplitterDiv } from "easy-layout";
 
 import Yapp from "./yapp";
 import SubHeading from "./subHeading";
-import ColumnsDiv from "./div/columns";
 import BNFTextarea from "./textarea/bnf";
 import TokensTextarea from "./textarea/tokens";
 import TopSizeableDiv from "./div/sizeable/top";
@@ -18,8 +17,6 @@ import LeftSizeableDiv from "./div/sizeable/left";
 import RightSizeableDiv from "./div/sizeable/right";
 import MiddleSizeableDiv from "./div/sizeable/middle";
 import ParseTreeTextarea from "./textarea/parseTree";
-import VerticalSplitterDiv from "./div/splitter/vertical";
-import HorizontalSplitterDiv from "./div/splitter/horizontal";
 import LexicalEntriesTextarea from "./textarea/lexicalEntries";
 
 import { ruleMapFromRules, startRuleFromRules } from "../utilities/rules";
@@ -114,7 +111,8 @@ class View extends Element {
   }
 
   childElements() {
-    const dragHandler = this.dragHandler.bind(this),
+    const { Plugin, firaCode, initialContent } = this.constructor,
+          dragHandler = this.dragHandler.bind(this),
           keyUpHandler = this.keyUpHandler.bind(this),
           contentChangeHandler = this.contentChangeHandler.bind(this);
 
@@ -124,8 +122,8 @@ class View extends Element {
         <LeftSizeableDiv>
           <RowsDiv>
             <TopSizeableDiv>
-              <Yapp Plugin={this.Plugin} onContentChange={contentChangeHandler} >
-                {this.initialContent}
+              <Yapp Plugin={Plugin} firaCode={firaCode} onContentChange={contentChangeHandler} >
+                {initialContent}
               </Yapp>
             </TopSizeableDiv>
             <HorizontalSplitterDiv onDrag={dragHandler}/>
@@ -180,7 +178,8 @@ class View extends Element {
   initialise() {
     this.assignContext();
 
-    const { Lexer, Parser } = this.Plugin,
+    const { Plugin } = this.constructor,
+          { Lexer, Parser } = Plugin,
           { bnf } = Parser,
           { entries } = Lexer,
           lexicalEntries = entries; ///
@@ -202,5 +201,6 @@ export default withStyle(View)`
   width: 100%;
   height: 100vh;
   display: flex;
+  padding: 1rem;
   
 `;

package/src/example/yapp.js

@@ -7,7 +7,6 @@ import Yapp from "../index";  ///
 export default withStyle(class extends Yapp {
   static defaultProperties = {
     editable: true,
-    firaCode: true,
     hiddenScrollbars: true
   };
 })`

package/src/index.js

@@ -4,8 +4,10 @@ import Yapp from "./yapp";
 
 export default Yapp;
 
+export { default as YappLexer } from "./lexer/yapp";
+export { default as YappParser } from "./parser/yapp";
 export { default as syntaxStyle } from "./style/syntax";
-export { default as firaCodeStyle } from "./style/firaCode";
 export { default as colourScheme } from "./scheme/colour";
+export { default as firaCodeStyle } from "./style/firaCode";
 
 export { renderYappStyles } from "./renderYappStyles";

package/src/lexer/javascript.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { CommonLexer } from "occam-lexers";
+import YappLexer from "../lexer/yapp";
 
 const entries = [
   {
@@ -26,12 +26,14 @@ const entries = [
   }
 ];
 
-export default class JavaScriptLexer extends CommonLexer {
+export default class JavaScriptLexer extends YappLexer {
   static entries = entries;
 
   static RegularExpressionToken = null;
 
-  static fromEntries(entries) { return CommonLexer.fromEntries(JavaScriptLexer, entries); }
+  static fromNothing() { return YappLexer.fromEntries(JavaScriptLexer, entries); }
 
-  static fromNothing() { return CommonLexer.fromNothing(JavaScriptLexer); }
+  static fromRules(rules) { return YappLexer.fromRules(JavaScriptLexer, rules); }
+
+  static fromEntries(entries) { return YappLexer.fromEntries(JavaScriptLexer, entries); }
 }

package/src/lexer/json.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { CommonLexer } from "occam-lexers";
+import YappLexer from "../lexer/yapp";
 
 const entries = [
   {
@@ -17,7 +17,7 @@ const entries = [
   }
 ];
 
-export default class JSONLexer extends CommonLexer {
+export default class JSONLexer extends YappLexer {
   static entries = entries;
 
   static SingleLineCommentToken = null;
@@ -32,7 +32,9 @@ export default class JSONLexer extends CommonLexer {
 
   static SinglyQuotedStringLiteralToken = null;
 
-  static fromEntries(entries) { return CommonLexer.fromEntries(JSONLexer, entries); }
+  static fromNothing() { return YappLexer.fromEntries(JSONLexer, entries); }
 
-  static fromNothing() { return CommonLexer.fromNothing(JSONLexer); }
+  static fromRules(rules) { return YappLexer.fromRules(JSONLexer, rules); }
+
+  static fromEntries(entries) { return YappLexer.fromEntries(JSONLexer, entries); }
 }

package/src/lexer/plainText.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { CommonLexer } from "occam-lexers";
+import YappLexer from "../lexer/yapp";
 
 const entries = [
   {
@@ -8,7 +8,7 @@ const entries = [
   }
 ];
 
-export default class PlainTextLexer extends CommonLexer {
+export default class PlainTextLexer extends YappLexer {
   matchMultiLineCommentInComment(content, inComment) { return null; }
 
   matchMultiLineCommentNotInComment(content, inComment) { return null; }
@@ -33,7 +33,9 @@ export default class PlainTextLexer extends CommonLexer {
 
   static DoublyQuotedStringLiteralToken = null;
 
-  static fromEntries(entries) { return CommonLexer.fromEntries(PlainTextLexer, entries); }
+  static fromNothing() { return YappLexer.fromEntries(PlainTextLexer, entries); }
 
-  static fromNothing() { return CommonLexer.fromNothing(PlainTextLexer); }
+  static fromRules(rules) { return YappLexer.fromRules(PlainTextLexer, rules); }
+
+  static fromEntries(entries) { return YappLexer.fromEntries(PlainTextLexer, entries); }
 }

package/src/lexer/xml.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { CommonLexer } from "occam-lexers";
+import YappLexer from "../lexer/yapp";
 
 const entries = [
   {
@@ -14,7 +14,7 @@ const entries = [
   }
 ];
 
-export default class XMLLexer extends CommonLexer {
+export default class XMLLexer extends YappLexer {
   static entries = entries;
 
   static SingleLineCommentToken = null;
@@ -29,7 +29,9 @@ export default class XMLLexer extends CommonLexer {
 
   static SinglyQuotedStringLiteralToken = null;
 
-  static fromEntries(entries) { return CommonLexer.fromEntries(XMLLexer, entries); }
+  static fromNothing() { return YappLexer.fromEntries(XMLLexer, entries); }
 
-  static fromNothing() { return CommonLexer.fromNothing(XMLLexer); }
+  static fromRules(rules) { return YappLexer.fromRules(XMLLexer, rules); }
+
+  static fromEntries(entries) { return YappLexer.fromEntries(XMLLexer, entries); }
 }

package/src/lexer/yapp.js

@@ -0,0 +1,5 @@
+"use strict";
+
+import { CommonLexer } from "occam-lexers";
+
+export default class YappLexer extends CommonLexer {}

package/src/parser/javascript.js

@@ -1,13 +1,6 @@
 "use strict";
 
-import { BNFLexer } from "occam-lexers";
-import { eliminateLeftRecursion } from "occam-grammar-utilities";
-import { BNFParser, CommonParser } from "occam-parsers";
-
-import { startRuleFromRules, ruleMapFromRules } from "../utilities/rules";
-
-const bnfLexer = BNFLexer.fromNothing(),
-      bnfParser = BNFParser.fromNothing();
+import YappParser  from "../parser/yapp";
 
 const bnf = `
 
@@ -283,26 +276,12 @@ const bnf = `
 
 `;
 
-export default class JavaScriptParser extends CommonParser {
+export default class JavaScriptParser extends YappParser {
   static bnf = bnf;
 
-  static fromNothing() {
-    const tokens = bnfLexer.tokensFromBNF(bnf),
-          rules = bnfParser.rulesFromTokens(tokens),
-          javascriptParser = JavaScriptParser.fromRules(rules);
-
-    return javascriptParser;
-  }
-
-  static fromRules(rules) {
-    const ruleMap = ruleMapFromRules(rules);
-
-    let startRule = startRuleFromRules(rules);
-
-    startRule = eliminateLeftRecursion(startRule, ruleMap);
+  static fromNothing() { return YappParser.fromNothing(JavaScriptParser); }
 
-    const javascriptParser = new JavaScriptParser(startRule, ruleMap);
+  static fromBNF(bnf) { return YappParser.fromBNF(JavaScriptParser, bnf); }
 
-    return javascriptParser;
-  }
+  static fromRules(rules) { return YappParser.fromRules(JavaScriptParser, rules); }
 }

package/src/parser/json.js

@@ -1,13 +1,6 @@
 "use strict";
 
-import { BNFLexer } from "occam-lexers";
-import { eliminateLeftRecursion } from "occam-grammar-utilities";
-import { BNFParser, CommonParser } from "occam-parsers";
-
-import { ruleMapFromRules, startRuleFromRules } from "../utilities/rules";
-
-const bnfLexer = BNFLexer.fromNothing(),
-      bnfParser = BNFParser.fromNothing();
+import YappParser from "../parser/yapp";
 
 const bnf = `
 
@@ -30,26 +23,12 @@ const bnf = `
 
 `;
 
-export default class JSONParser extends CommonParser {
+export default class JSONParser extends YappParser {
   static bnf = bnf;
 
-  static fromNothing() {
-    const tokens = bnfLexer.tokensFromBNF(bnf),
-          rules = bnfParser.rulesFromTokens(tokens),
-          jsonParser = JSONParser.fromRules(rules);
-
-    return jsonParser;
-  }
-
-  static fromRules(rules) {
-    const ruleMap = ruleMapFromRules(rules);
-
-    let startRule = startRuleFromRules(rules);
-
-    startRule = eliminateLeftRecursion(startRule, ruleMap);
+  static fromNothing() { return YappParser.fromNothing(JSONParser); }
 
-    const jsonParser = new JSONParser(startRule, ruleMap);
+  static fromBNF(bnf) { return YappParser.fromBNF(JSONParser, bnf); }
 
-    return jsonParser;
-  }
+  static fromRules(rules) { return YappParser.fromRules(JSONParser, rules); }
 }

package/src/parser/plainText.js

@@ -1,13 +1,6 @@
 "use strict";
 
-import { BNFLexer } from "occam-lexers";
-import { eliminateLeftRecursion } from "occam-grammar-utilities";
-import { BNFParser, CommonParser } from "occam-parsers";
-
-import { ruleMapFromRules, startRuleFromRules } from "../utilities/rules";
-
-const bnfLexer = BNFLexer.fromNothing(),
-      bnfParser = BNFParser.fromNothing();
+import YappParser from "./yapp";
 
 const bnf = `
 
@@ -15,26 +8,12 @@ const bnf = `
 
 `;
 
-export default class PlainTextParser extends CommonParser {
+export default class PlainTextParser extends YappParser {
   static bnf = bnf;
 
-  static fromNothing() {
-    const tokens = bnfLexer.tokensFromBNF(bnf),
-          rules = bnfParser.rulesFromTokens(tokens),
-          plainTextParser = PlainTextParser.fromRules(rules);
-
-    return plainTextParser;
-  }
-
-  static fromRules(rules) {
-    const ruleMap = ruleMapFromRules(rules);
-
-    let startRule = startRuleFromRules(rules);
-
-    startRule = eliminateLeftRecursion(startRule, ruleMap);
+  static fromNothing() { return YappParser.fromNothing(PlainTextParser); }
 
-    const plainTextParser = new PlainTextParser(startRule, ruleMap);
+  static fromBNF(bnf) { return YappParser.fromBNF(PlainTextParser, bnf); }
 
-    return plainTextParser;
-  }
+  static fromRules(rules) { return YappParser.fromRules(PlainTextParser, rules); }
 }

package/src/parser/xml.js

@@ -1,13 +1,6 @@
 "use strict";
 
-import { BNFLexer } from "occam-lexers";
-import { eliminateLeftRecursion } from "occam-grammar-utilities";
-import { BNFParser, CommonParser } from "occam-parsers";
-
-import { ruleMapFromRules, startRuleFromRules } from "../utilities/rules";
-
-const bnfLexer = BNFLexer.fromNothing(),
-      bnfParser = BNFParser.fromNothing();
+import YappParser from "./yapp";
 
 const bnf = `
 
@@ -48,26 +41,12 @@ const bnf = `
 
 `;
 
-export default class XMLParser extends CommonParser {
+export default class XMLParser extends YappParser {
   static bnf = bnf;
 
-  static fromNothing() {
-    const tokens = bnfLexer.tokensFromBNF(bnf),
-          rules = bnfParser.rulesFromTokens(tokens),
-          xmlParser = XMLParser.fromRules(rules);
-
-    return xmlParser;
-  }
-
-  static fromRules(rules) {
-    const ruleMap = ruleMapFromRules(rules);
-
-    let startRule = startRuleFromRules(rules);
-
-    startRule = eliminateLeftRecursion(startRule, ruleMap);
+  static fromNothing() { return YappParser.fromNothing(XMLParser); }
 
-    const xmlParser = new XMLParser(startRule, ruleMap);
+  static fromBNF(bnf) { return YappParser.fromBNF(XMLParser, bnf); }
 
-    return xmlParser;
-  }
+  static fromRules(rules) { return YappParser.fromRules(XMLParser, rules); }
 }

package/src/parser/yapp.js

@@ -0,0 +1,28 @@
+"use strict";
+
+import { CommonParser } from "occam-parsers";
+
+import { rulesFromBNF, parserFromRules } from "../utilities/parser";
+
+export default class YappParser extends CommonParser {
+  static fromNothing(Class) {
+    const { bnf } = Class,
+          rules = rulesFromBNF(bnf),
+          parser = parserFromRules(Class, rules);
+
+    return parser;
+  }
+
+  static fromBNF(Class, bnf) {
+    const rules = rulesFromBNF(bnf),
+          parser = parserFromRules(Class, rules);
+
+    return parser;
+  }
+
+  static fromRules(Class, rules) {
+    const parser = parserFromRules(Class, rules);
+
+    return parser;
+  }
+}

package/src/utilities/parser.js

@@ -0,0 +1,29 @@
+"use strict";
+
+import { BNFLexer } from "occam-lexers";
+import { BNFParser } from "occam-parsers";
+import { eliminateLeftRecursion } from "occam-grammar-utilities";
+
+import { ruleMapFromRules, startRuleFromRules } from "../utilities/rules";
+
+const bnfLexer = BNFLexer.fromNothing(),
+      bnfParser = BNFParser.fromNothing();
+
+export function rulesFromBNF(bnf) {
+  const tokens = bnfLexer.tokensFromBNF(bnf),
+        rules = bnfParser.rulesFromTokens(tokens);
+
+  return rules;
+}
+
+export function parserFromRules(Class, rules) {
+  const ruleMap = ruleMapFromRules(rules);
+
+  let startRule = startRuleFromRules(rules);
+
+  startRule = eliminateLeftRecursion(startRule, ruleMap);
+
+  const parser = new Class(startRule, ruleMap);
+
+  return parser;
+}