(chore) simplify brainfuck grammar

Author: joshgoebel

src/languages/brainfuck.js

@@ -8,17 +8,23 @@ Website: https://esolangs.org/wiki/Brainfuck
 export default function(hljs) {
   const LITERAL = {
     className: 'literal',
-    begin: /[+-]/,
+    begin: /[+-]+/,
     relevance: 0
   };
   return {
     name: 'Brainfuck',
     aliases: ['bf'],
     contains: [
       hljs.COMMENT(
-        '[^\\[\\]\\.,\\+\\-<> \r\n]',
-        '[\\[\\]\\.,\\+\\-<> \r\n]',
+        /[^\[\]\.,\+\-<> \r\n]/,
+        /[\[\]\.,\+\-<> \r\n]/,
         {
+          contains: [
+            {
+              match: /[ ]+[^\[\]\.,\+\-<> \r\n]/,
+              relevance: 0
+            }
+          ],
           returnEnd: true,
           relevance: 0
         }
@@ -35,8 +41,10 @@ export default function(hljs) {
       },
       {
         // this mode works as the only relevance counter
+        // it looks ahead to find the start of a run of literals
+        // so only the runs are counted as relevant
         begin: /(?=\+\+|--)/,
-        contains: [LITERAL]
+        contains: [ LITERAL ]
       },
       LITERAL
     ]

test/markup/brainfuck/default.expect.txt

@@ -1,17 +1,17 @@
-<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>
-<span class="hljs-title">[</span> <span class="hljs-comment">3*10</span> <span class="hljs-comment">and</span> <span class="hljs-comment">10*10</span>
-  <span class="hljs-literal">-</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&lt;&lt;
+<span class="hljs-literal">++++++++++</span>
+<span class="hljs-title">[</span> <span class="hljs-comment">3*10 and 10*10</span>
+  <span class="hljs-literal">-</span>&gt;<span class="hljs-literal">+++</span>&gt;<span class="hljs-literal">++++++++++</span>&lt;&lt;
 <span class="hljs-title">]</span>&gt;&gt;
-<span class="hljs-title">[</span> <span class="hljs-comment">filling</span> <span class="hljs-comment">cells</span>
-  <span class="hljs-literal">-</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-title">[</span>&lt;<span class="hljs-comment">/</span><span class="hljs-title">]</span>&lt;<span class="hljs-title">[</span>&lt;<span class="hljs-title">]</span>&lt;<span class="hljs-title">[</span>&lt;<span class="hljs-title">]</span>&gt;&gt;
+<span class="hljs-title">[</span> <span class="hljs-comment">filling cells</span>
+  <span class="hljs-literal">-</span>&gt;<span class="hljs-literal">++</span>&gt;&gt;<span class="hljs-literal">++</span>&gt;<span class="hljs-literal">++</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">++</span>&gt;&gt;<span class="hljs-literal">++</span>&gt;<span class="hljs-literal">++</span>&gt;<span class="hljs-literal">++</span>&gt;<span class="hljs-literal">++</span>&gt;<span class="hljs-literal">++</span>&gt;<span class="hljs-literal">++</span>&gt;<span class="hljs-literal">++</span>&gt;<span class="hljs-literal">++</span>&gt;<span class="hljs-literal">++</span>&gt;<span class="hljs-literal">++</span>&gt;<span class="hljs-literal">++</span><span class="hljs-title">[</span>&lt;<span class="hljs-comment">/</span><span class="hljs-title">]</span>&lt;<span class="hljs-title">[</span>&lt;<span class="hljs-title">]</span>&lt;<span class="hljs-title">[</span>&lt;<span class="hljs-title">]</span>&gt;&gt;
 <span class="hljs-title">]</span>&lt;
-<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&lt;&lt;
-<span class="hljs-title">[</span> <span class="hljs-comment">rough</span> <span class="hljs-comment">codes</span> <span class="hljs-comment">correction</span> <span class="hljs-comment">loop</span>
-  <span class="hljs-literal">-</span>&gt;&gt;&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-title">[</span>&lt;<span class="hljs-title">]</span>&lt;
+<span class="hljs-literal">+++++++++</span>&lt;&lt;
+<span class="hljs-title">[</span> <span class="hljs-comment">rough codes correction loop</span>
+  <span class="hljs-literal">-</span>&gt;&gt;&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+++</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-title">[</span>&lt;<span class="hljs-title">]</span>&lt;
 <span class="hljs-title">]</span>
-<span class="hljs-comment">more</span> <span class="hljs-comment">accurate</span> <span class="hljs-comment">сodes</span> <span class="hljs-comment">correction</span>
-&gt;&gt;&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;
-<span class="hljs-literal">-</span><span class="hljs-literal">-</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;
-<span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>&gt;<span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span><span class="hljs-literal">-</span>&gt;<span class="hljs-literal">+</span><span class="hljs-literal">+</span><span class="hljs-literal">+</span>
-<span class="hljs-comment">rewind</span> <span class="hljs-comment">and</span> <span class="hljs-comment">output</span>
+<span class="hljs-comment">more accurate сodes correction</span>
+&gt;&gt;&gt;<span class="hljs-literal">++</span>&gt;
+<span class="hljs-literal">--</span>&gt;<span class="hljs-literal">+++++++</span>&gt;<span class="hljs-literal">------</span>&gt;<span class="hljs-literal">++++++</span>&gt;<span class="hljs-literal">++</span>&gt;<span class="hljs-literal">+++++++++</span>&gt;<span class="hljs-literal">++++++++++</span>&gt;<span class="hljs-literal">++++++++</span>&gt;<span class="hljs-literal">---</span>&gt;<span class="hljs-literal">++++++++++</span>&gt;<span class="hljs-literal">------</span>&gt;<span class="hljs-literal">++++++</span>&gt;
+<span class="hljs-literal">++</span>&gt;<span class="hljs-literal">+++++++++++</span>&gt;<span class="hljs-literal">++++++++++++</span>&gt;<span class="hljs-literal">------</span>&gt;<span class="hljs-literal">+++</span>
+<span class="hljs-comment">rewind and output</span>
 <span class="hljs-title">[</span>&lt;<span class="hljs-title">]</span>&gt;<span class="hljs-title">[</span><span class="hljs-string">.</span>&gt;<span class="hljs-title">]</span>