yapp 2.2.184 → 3.0.4

package/src/parser/json.js

@@ -1,34 +1,36 @@
 "use strict";
 
-import YappParser from "../parser/yapp";
+import { CommonParser } from "occam-parsers";
+import { parserUtilities } from "occam-grammar-utilities";
+
+const { rulesFromBNF, parserFromRules } = parserUtilities;
 
 const bnf = `
 
-    document                   ::=  json error* | error+ ;
+  document                   ::=  json error* | error+ ;
 
 
-    json                       ::=  array | object ;
+  json                       ::=  array | object ;
 
 
-    array                      ::=  "[" ( element ( "," element )* )? "]" ;
+  array                      ::=  "[" ( element ( "," element )* )? "]" ;
 
 
-    object                     ::=  "{" ( [string-literal] ":" element ( "," [string-literal] ":" element )* )? "}" ;
+  object                     ::=  "{" ( [string-literal] ":" element ( "," [string-literal] ":" element )* )? "}" ;
 
-    
-    element                    ::=  json |  [string-literal] | [number] | "true" | "false" | "null" ;
+  
+  element                    ::=  json |  [string-literal] | [number] | "true" | "false" | "null" ;
 
 
-    error                      ::=  . ;
+  error                      ::=  . ;
 
-`;
+      `,
+      rules = rulesFromBNF(bnf);
 
-export default class JSONParser extends YappParser {
+export default class JSONParser extends CommonParser {
   static bnf = bnf;
 
-  static fromNothing() { return YappParser.fromNothing(JSONParser); }
-
-  static fromBNF(bnf) { return YappParser.fromBNF(JSONParser, bnf); }
+  static fromNothing() { return parserFromRules(JSONParser, rules); }
 
-  static fromRules(rules) { return YappParser.fromRules(JSONParser, rules); }
+  static fromRules(rules) { return CommonParser.fromRules(JSONParser, rules); }
 }

package/src/parser/plainText.js

@@ -1,19 +1,21 @@
 "use strict";
 
-import YappParser from "./yapp";
+import { CommonParser } from "occam-parsers";
+import { parserUtilities } from "occam-grammar-utilities";
+
+const { rulesFromBNF, parserFromRules } = parserUtilities;
 
 const bnf = `
 
-    document                   ::=  .+ ;
+  document                   ::=  .+ ;
 
-`;
+      `,
+      rules = rulesFromBNF(bnf);
 
-export default class PlainTextParser extends YappParser {
+export default class PlainTextParser extends CommonParser {
   static bnf = bnf;
 
-  static fromNothing() { return YappParser.fromNothing(PlainTextParser); }
-
-  static fromBNF(bnf) { return YappParser.fromBNF(PlainTextParser, bnf); }
+  static fromNothing() { return parserFromRules(PlainTextParser, rules); }
 
-  static fromRules(rules) { return YappParser.fromRules(PlainTextParser, rules); }
+  static fromRules(rules) { return CommonParser.fromRules(PlainTextParser, rules); }
 }

package/src/parser/xml.js

@@ -1,52 +1,54 @@
 "use strict";
 
-import YappParser from "./yapp";
+import { CommonParser } from "occam-parsers";
+import { parserUtilities } from "occam-grammar-utilities";
+
+const { rulesFromBNF, parserFromRules } = parserUtilities;
 
 const bnf = `
 
-    document                   ::=  xml error* | error+ ;
+  document                   ::=  xml error* | error+ ;
 
 
-    xml                        ::=  ( preamble element* ) | element+ ;
+  xml                        ::=  ( preamble element* ) | element+ ;
 
 
-    preamble                   ::=  "<?"<NO_WHITESPACE>"xml" attribute* "?>" ;
+  preamble                   ::=  "<?"<NO_WHITESPACE>"xml" attribute* "?>" ;
 
 
-    element                    ::=  comment | completeTag | startTag ( element | text )* endTag ;
+  element                    ::=  comment | completeTag | startTag ( element | text )* endTag ;
 
 
-    comment                    ::=  "<!--" text* "-->" ;
+  comment                    ::=  "<!--" text* "-->" ;
 
 
-    completeTag                ::=  "<"<NO_WHITESPACE>name attribute* "/>" ;
+  completeTag                ::=  "<"<NO_WHITESPACE>name attribute* "/>" ;
 
 
-    startTag                   ::=  "<"<NO_WHITESPACE>name attribute* ">" ;
+  startTag                   ::=  "<"<NO_WHITESPACE>name attribute* ">" ;
 
 
-    endTag                     ::=  "</"<NO_WHITESPACE>name ">" ;
-    
+  endTag                     ::=  "</"<NO_WHITESPACE>name ">" ;
+  
 
-    attribute                  ::=  [identifier]<NO_WHITESPACE>"="<NO_WHITESPACE>[string-literal] ;
+  attribute                  ::=  [identifier]<NO_WHITESPACE>"="<NO_WHITESPACE>[string-literal] ;
 
 
-    text                       ::=  ( [identifier] | [string-literal]| [broken-string-literal] | [unassigned] )+ ;
-    
-    
-    name                       ::=  [identifier] ;
+  text                       ::=  ( [identifier] | [string-literal]| [broken-string-literal] | [unassigned] )+ ;
+  
+  
+  name                       ::=  [identifier] ;
 
 
-    error                      ::=  . ;
+  error                      ::=  . ;
 
-`;
+      `,
+      rules = rulesFromBNF(bnf);
 
-export default class XMLParser extends YappParser {
+export default class XMLParser extends CommonParser {
   static bnf = bnf;
 
-  static fromNothing() { return YappParser.fromNothing(XMLParser); }
-
-  static fromBNF(bnf) { return YappParser.fromBNF(XMLParser, bnf); }
+  static fromNothing() { return parserFromRules(XMLParser, rules); }
 
-  static fromRules(rules) { return YappParser.fromRules(XMLParser, rules); }
+  static fromRules(rules) { return CommonParser.fromRules(XMLParser, rules); }
 }

package/src/plugin/javascript.js

@@ -8,7 +8,7 @@ import JavaScriptProcessor from "../processor/javascript";
 import { JAVASCRIPT_LANGUAGE } from "../languages"
 
 export default class JavaScriptPlugin extends Plugin {
-  language = JAVASCRIPT_LANGUAGE;
+  static language = JAVASCRIPT_LANGUAGE;
 
   static Lexer = JavaScriptLexer;
 

package/src/plugin/json.js

@@ -8,7 +8,7 @@ import JSONProcessor from "../processor/json";
 import { JSON_LANGUAGE } from "../languages"
 
 export default class JSONPlugin extends Plugin {
-  language = JSON_LANGUAGE;
+  static language = JSON_LANGUAGE;
 
   static Lexer = JSONLexer;
 

package/src/plugin/plainText.js

@@ -8,7 +8,7 @@ import PlainTextProcessor from "../processor/plainText";
 import { PLAIN_TEXT_LANGUAGE } from "../languages"
 
 export default class PlainTextPlugin extends Plugin {
-  language = PLAIN_TEXT_LANGUAGE;
+  static language = PLAIN_TEXT_LANGUAGE;
 
   static Lexer = PlainTextLexer;
 

package/src/plugin/xml.js

@@ -8,7 +8,7 @@ import XMLProcessor from "../processor/xml";
 import { XML_LANGUAGE } from "../languages"
 
 export default class XMLPlugin extends Plugin {
-  language = XML_LANGUAGE;
+  static language = XML_LANGUAGE;
 
   static Lexer = XMLLexer;
 

package/src/plugin.js

@@ -29,7 +29,11 @@ class Plugin {
     return this.node;
   }
 
-  getLanguage() { return this.language; }
+  getLanguage() {
+    const { language } = this.constructor;
+
+    return language;
+  }
 
   setLexer(lexer) {
     this.lexer = lexer;

package/lib/lexer/yapp.js

@@ -1,93 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return YappLexer;
-    }
-});
-var _occamLexers = require("occam-lexers");
-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 _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) {
-    "@swc/helpers - typeof";
-    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 YappLexer = /*#__PURE__*/ function(CommonLexer) {
-    _inherits(YappLexer, CommonLexer);
-    var _super = _createSuper(YappLexer);
-    function YappLexer() {
-        _classCallCheck(this, YappLexer);
-        return _super.apply(this, arguments);
-    }
-    return YappLexer;
-}(_occamLexers.CommonLexer);
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sZXhlci95YXBwLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xyXG5cclxuaW1wb3J0IHsgQ29tbW9uTGV4ZXIgfSBmcm9tIFwib2NjYW0tbGV4ZXJzXCI7XHJcblxyXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBZYXBwTGV4ZXIgZXh0ZW5kcyBDb21tb25MZXhlciB7fVxyXG4iLCJSZWFjdC5jcmVhdGVFbGVtZW50Il0sIm5hbWVzIjpbIllhcHBMZXhlciIsIkNvbW1vbkxleGVyIl0sIm1hcHBpbmdzIjoiQUFBQSxZQUFZLENBQUM7Ozs7Ozs7ZUFJUUEsU0FBUzs7OzJCQUZGLGNBQWM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUUzQixJQUFBLEFBQU1BLFNBQVMsaUJBQWY7OzthQUFNQSxTQUFTOzs7OztDQUF1QixDQUFkQyxZQUFXLFlBQUEsQ0FBRyJ9

package/lib/parser/yapp.js

@@ -1,132 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return YappParser;
-    }
-});
-var _occamParsers = require("occam-parsers");
-var _occamGrammarUtilities = require("occam-grammar-utilities");
-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) {
-    "@swc/helpers - typeof";
-    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 rulesFromBNF = _occamGrammarUtilities.parserUtilities.rulesFromBNF, parserFromRules = _occamGrammarUtilities.parserUtilities.parserFromRules;
-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 = rulesFromBNF(bnf), parser = parserFromRules(Class, rules);
-                return parser;
-            }
-        },
-        {
-            key: "fromBNF",
-            value: function fromBNF(Class, bnf) {
-                var rules = rulesFromBNF(bnf), parser = parserFromRules(Class, rules);
-                return parser;
-            }
-        },
-        {
-            key: "fromRules",
-            value: function fromRules(Class, rules) {
-                var parser = parserFromRules(Class, rules);
-                return parser;
-            }
-        }
-    ]);
-    return YappParser;
-}(_occamParsers.CommonParser);
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYXJzZXIveWFwcC5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgQ29tbW9uUGFyc2VyIH0gZnJvbSBcIm9jY2FtLXBhcnNlcnNcIjtcbmltcG9ydCB7IHBhcnNlclV0aWxpdGllcyB9IGZyb20gXCJvY2NhbS1ncmFtbWFyLXV0aWxpdGllc1wiO1xuXG5jb25zdCB7IHJ1bGVzRnJvbUJORiwgcGFyc2VyRnJvbVJ1bGVzIH0gPSBwYXJzZXJVdGlsaXRpZXM7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIFlhcHBQYXJzZXIgZXh0ZW5kcyBDb21tb25QYXJzZXIge1xuICBzdGF0aWMgZnJvbU5vdGhpbmcoQ2xhc3MpIHtcbiAgICBjb25zdCB7IGJuZiB9ID0gQ2xhc3MsXG4gICAgICAgICAgcnVsZXMgPSBydWxlc0Zyb21CTkYoYm5mKSxcbiAgICAgICAgICBwYXJzZXIgPSBwYXJzZXJGcm9tUnVsZXMoQ2xhc3MsIHJ1bGVzKTtcblxuICAgIHJldHVybiBwYXJzZXI7XG4gIH1cblxuICBzdGF0aWMgZnJvbUJORihDbGFzcywgYm5mKSB7XG4gICAgY29uc3QgcnVsZXMgPSBydWxlc0Zyb21CTkYoYm5mKSxcbiAgICAgICAgICBwYXJzZXIgPSBwYXJzZXJGcm9tUnVsZXMoQ2xhc3MsIHJ1bGVzKTtcblxuICAgIHJldHVybiBwYXJzZXI7XG4gIH1cblxuICBzdGF0aWMgZnJvbVJ1bGVzKENsYXNzLCBydWxlcykge1xuICAgIGNvbnN0IHBhcnNlciA9IHBhcnNlckZyb21SdWxlcyhDbGFzcywgcnVsZXMpO1xuXG4gICAgcmV0dXJuIHBhcnNlcjtcbiAgfVxufVxuIiwiUmVhY3QuY3JlYXRlRWxlbWVudCJdLCJuYW1lcyI6WyJZYXBwUGFyc2VyIiwicnVsZXNGcm9tQk5GIiwicGFyc2VyVXRpbGl0aWVzIiwicGFyc2VyRnJvbVJ1bGVzIiwiZnJvbU5vdGhpbmciLCJDbGFzcyIsImJuZiIsInJ1bGVzIiwicGFyc2VyIiwiZnJvbUJORiIsImZyb21SdWxlcyIsIkNvbW1vblBhcnNlciJdLCJtYXBwaW5ncyI6IkFBQUEsWUFBWSxDQUFDOzs7Ozs7O2VBT1FBLFVBQVU7Ozs0QkFMRixlQUFlO3FDQUNaLHlCQUF5Qjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFekQsSUFBUUMsWUFBWSxHQUFzQkMsc0JBQWUsZ0JBQUEsQ0FBakRELFlBQVksRUFBRUUsZUFBZSxHQUFLRCxzQkFBZSxnQkFBQSxDQUFuQ0MsZUFBZSxBQUFxQjtBQUUzQyxJQUFBLEFBQU1ILFVBQVUsaUJBQWhCOzs7YUFBTUEsVUFBVTs7Ozs7O1lBQ3RCSSxHQUFXLEVBQVhBLGFBQVc7bUJBQWxCLFNBQU9BLFdBQVcsQ0FBQ0MsS0FBSyxFQUFFO2dCQUN4QixJQUFNLEFBQUVDLEdBQUcsR0FBS0QsS0FBSyxDQUFiQyxHQUFHLEFBQVUsRUFDZkMsS0FBSyxHQUFHTixZQUFZLENBQUNLLEdBQUcsQ0FBQyxFQUN6QkUsTUFBTSxHQUFHTCxlQUFlLENBQUNFLEtBQUssRUFBRUUsS0FBSyxDQUFDLEFBQUM7Z0JBRTdDLE9BQU9DLE1BQU0sQ0FBQzthQUNmOzs7WUFFTUMsR0FBTyxFQUFQQSxTQUFPO21CQUFkLFNBQU9BLE9BQU8sQ0FBQ0osS0FBSyxFQUFFQyxHQUFHLEVBQUU7Z0JBQ3pCLElBQU1DLEtBQUssR0FBR04sWUFBWSxDQUFDSyxHQUFHLENBQUMsRUFDekJFLE1BQU0sR0FBR0wsZUFBZSxDQUFDRSxLQUFLLEVBQUVFLEtBQUssQ0FBQyxBQUFDO2dCQUU3QyxPQUFPQyxNQUFNLENBQUM7YUFDZjs7O1lBRU1FLEdBQVMsRUFBVEEsV0FBUzttQkFBaEIsU0FBT0EsU0FBUyxDQUFDTCxLQUFLLEVBQUVFLEtBQUssRUFBRTtnQkFDN0IsSUFBTUMsTUFBTSxHQUFHTCxlQUFlLENBQUNFLEtBQUssRUFBRUUsS0FBSyxDQUFDLEFBQUM7Z0JBRTdDLE9BQU9DLE1BQU0sQ0FBQzthQUNmOzs7O0NBQ0YsQ0FyQnVDRyxhQUFZLGFBQUEsQ0FxQm5EIn0=

package/src/lexer/yapp.js

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

package/src/parser/yapp.js

@@ -1,29 +0,0 @@
-"use strict";
-
-import { CommonParser } from "occam-parsers";
-import { parserUtilities } from "occam-grammar-utilities";
-
-const { rulesFromBNF, parserFromRules } = parserUtilities;
-
-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;
-  }
-}