yapp 2.2.182 → 3.0.2

package/src/colours.js

@@ -11,7 +11,6 @@ export const tuatara = "#363534";
 export const woodsmoke = "#0c0d0f";
 
 export const citron = "#86b923";
-export const sushi = "#7fa82f";
 export const oliveDrab = "#6B9825";
 export const rifleGreen = "#414833";
 export const logCabin = "#24301d";
@@ -28,5 +27,5 @@ export const tahiti = "#F58A0A";
 export const equator = "#e4aC5e";
 
 export const portica = "#f7e75f";
-export const celery = "#bcb852";
+export const celery = "#b7b231";
 export const sycamore = "#908d39";

package/src/example/view.js

@@ -3,9 +3,7 @@
 import withStyle from "easy-with-style";  ///
 
 import { Element } from "easy";
-import { BNFLexer } from "occam-lexers";
-import { BNFParser } from "occam-parsers";
-import { eliminateLeftRecursion, rewriteNodes } from "occam-grammar-utilities";
+import { rewriteNodes, parserUtilities } from "occam-grammar-utilities";
 import { RowDiv, RowsDiv, ColumnDiv, ColumnsDiv, VerticalSplitterDiv, HorizontalSplitterDiv } from "easy-layout";
 
 import Yapp from "./yapp";
@@ -19,8 +17,7 @@ import MiddleSizeableDiv from "./div/sizeable/middle";
 import ParseTreeTextarea from "./textarea/parseTree";
 import LexicalEntriesTextarea from "./textarea/lexicalEntries";
 
-const bnfLexer = BNFLexer.fromNothing(),
-      bnfParser = BNFParser.fromNothing();
+const { rulesFromBNF } = parserUtilities;
 
 class View extends Element {
   contentChangeHandler(event, element) {
@@ -29,17 +26,12 @@ class View extends Element {
 
   keyUpHandler(event, element) {
     try {
-      const lexicalEntries = this.getLexicalEntries(),
-            entries = lexicalEntries, ///
-            bnf = this.getBNF(),
-            tokens = bnfLexer.tokensFromBNF(bnf);
-
-      let rules = bnfParser.rulesFromTokens(tokens);
-
-      rules = eliminateLeftRecursion(rules);
-
       const { Plugin } = this.constructor,
             { Lexer, Parser } = Plugin,
+            lexicalEntries = this.getLexicalEntries(),
+            bnf = this.getBNF(),
+            entries = lexicalEntries, ///
+            rules = rulesFromBNF(bnf),
             lexer = Lexer.fromEntries(entries),
             parser = Parser.fromRules(rules),
             yappLexer = lexer,  ///
@@ -64,6 +56,7 @@ class View extends Element {
           yappHeight = topSizeableDivHeight;  ///
 
     this.setYappWidth(yappWidth);
+
     this.setYappHeight(yappHeight);
 
     this.resizeYapp();

package/src/index.js

@@ -4,8 +4,6 @@ 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 colourScheme } from "./scheme/colour";
 export { default as firaCodeStyle } from "./style/firaCode";

package/src/lexer/javascript.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import { WhitespaceToken,
+import { CommonLexer,
+         WhitespaceToken,
          EndOfLineNonSignificantToken,
          CStyleSingleLineCommentToken,
          SinglyQuotedStringLiteralToken,
@@ -10,8 +11,6 @@ import { WhitespaceToken,
          CStyleMiddleOfMultiLineCommentToken,
          EndOfLineCommentNonSignificantToken } from "occam-lexers";
 
-import YappLexer from "../lexer/yapp";
-
 const entries = [
   {
     "delimiter": "^(?:`|\\$\\{|<\\/|\\/>)"
@@ -36,7 +35,7 @@ const entries = [
   }
 ];
 
-export default class JavaScriptLexer extends YappLexer {
+export default class JavaScriptLexer extends CommonLexer {
   static entries = entries;
 
   static EndOfLineToken = EndOfLineNonSignificantToken; ///
@@ -59,9 +58,7 @@ export default class JavaScriptLexer extends YappLexer {
 
   static DoublyQuotedStringLiteralToken = DoublyQuotedStringLiteralToken;
 
-  static fromNothing() { return YappLexer.fromEntries(JavaScriptLexer, entries); }
-
-  static fromRules(rules) { return YappLexer.fromRules(JavaScriptLexer, rules); }
+  static fromNothing() { return CommonLexer.fromNothing(JavaScriptLexer); }
 
-  static fromEntries(entries) { return YappLexer.fromEntries(JavaScriptLexer, entries); }
+  static fromEntries(entries) { return CommonLexer.fromEntries(JavaScriptLexer, entries); }
 }

package/src/lexer/json.js

@@ -1,7 +1,6 @@
 "use strict";
 
-import YappLexer from "../lexer/yapp";
-import { WhitespaceToken, EndOfLineNonSignificantToken, DoublyQuotedStringLiteralToken, EndOfLineCommentNonSignificantToken } from "occam-lexers";
+import { CommonLexer, WhitespaceToken, EndOfLineNonSignificantToken, DoublyQuotedStringLiteralToken } from "occam-lexers";
 
 const entries = [
   {
@@ -18,14 +17,14 @@ const entries = [
   }
 ];
 
-export default class JSONLexer extends YappLexer {
+export default class JSONLexer extends CommonLexer {
   static entries = entries;
 
   static EndOfLineToken = EndOfLineNonSignificantToken; ///
 
   static WhitespaceToken = WhitespaceToken;
 
-  static EndOfLineCommentToken = EndOfLineCommentNonSignificantToken; ///
+  static EndOfLineCommentToken = null;
 
   static SingleLineCommentToken = null;
 
@@ -41,9 +40,7 @@ export default class JSONLexer extends YappLexer {
 
   static DoublyQuotedStringLiteralToken = DoublyQuotedStringLiteralToken;
 
-  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); }
+  static fromEntries(entries) { return CommonLexer.fromEntries(JSONLexer, entries); }
 }

package/src/lexer/plainText.js

@@ -1,8 +1,6 @@
 "use strict";
 
-import { WhitespaceToken, EndOfLineNonSignificantToken, EndOfLineCommentNonSignificantToken } from "occam-lexers";
-
-import YappLexer from "../lexer/yapp";
+import { CommonLexer, WhitespaceToken, EndOfLineNonSignificantToken } from "occam-lexers";
 
 const entries = [
   {
@@ -10,14 +8,14 @@ const entries = [
   }
 ];
 
-export default class PlainTextLexer extends YappLexer {
+export default class PlainTextLexer extends CommonLexer {
   static entries = entries;
 
   static EndOfLineToken = EndOfLineNonSignificantToken; ///
 
   static WhitespaceToken = WhitespaceToken;
 
-  static EndOfLineCommentToken = EndOfLineCommentNonSignificantToken; ///
+  static EndOfLineCommentToken = null;
 
   static SingleLineCommentToken = null;
 
@@ -33,9 +31,7 @@ export default class PlainTextLexer extends YappLexer {
 
   static DoublyQuotedStringLiteralToken = null;
 
-  static fromNothing() { return YappLexer.fromEntries(PlainTextLexer, entries); }
-
-  static fromRules(rules) { return YappLexer.fromRules(PlainTextLexer, rules); }
+  static fromNothing() { return CommonLexer.fromNothing(PlainTextLexer); }
 
-  static fromEntries(entries) { return YappLexer.fromEntries(PlainTextLexer, entries); }
+  static fromEntries(entries) { return CommonLexer.fromEntries(PlainTextLexer, entries); }
 }

package/src/lexer/xml.js

@@ -1,7 +1,6 @@
 "use strict";
 
-import YappLexer from "../lexer/yapp";
-import { WhitespaceToken, EndOfLineNonSignificantToken, DoublyQuotedStringLiteralToken } from "occam-lexers";
+import { CommonLexer, WhitespaceToken, EndOfLineNonSignificantToken, DoublyQuotedStringLiteralToken } from "occam-lexers";
 
 const entries = [
   {
@@ -15,7 +14,7 @@ const entries = [
   }
 ];
 
-export default class XMLLexer extends YappLexer {
+export default class XMLLexer extends CommonLexer {
   static entries = entries;
 
   static EndOfLineToken = EndOfLineNonSignificantToken; ///
@@ -38,9 +37,7 @@ export default class XMLLexer extends YappLexer {
 
   static DoublyQuotedStringLiteralToken = DoublyQuotedStringLiteralToken;
 
-  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); }
+  static fromEntries(entries) { return CommonLexer.fromEntries(XMLLexer, entries); }
 }