@bablr/language-en-es6 0.3.4 → 0.3.6

package/lib/grammar.js

@@ -158,7 +158,7 @@ const atrivial = class ES6Grammar extends importMixin(
   }
 
   *Statement(args) {
-    let res = yield match(re`/import|export|class|var|const|let/`);
+    let res = yield match(re`/import|export|class|var|const|let|async/`);
     switch (printSource(res)) {
       case 'import':
         yield eat(m`<ImportDeclaration />`);
@@ -169,6 +169,9 @@ const atrivial = class ES6Grammar extends importMixin(
       case 'class':
         yield eat(m`<ClassDeclaration />`);
         break;
+      case 'async':
+        yield eat(m`<FunctionDeclaration />`);
+        break;
       case 'var':
       case 'const':
       case 'let':

package/lib/mixins/function.js

@@ -1,5 +1,5 @@
 import { spam as m, re } from '@bablr/boot';
-import { o, r, eat, eatMatch, fail, match, shiftMatch, eatHeld } from '@bablr/helpers/grammar';
+import { o, r, eat, eatMatch, match, shiftMatch, eatHeld } from '@bablr/helpers/grammar';
 import { reservedWords } from '@bablr/language-en-es5';
 import { List } from '@bablr/helpers/productions';
 import { printSource } from '@bablr/agast-helpers/tree';
@@ -9,14 +9,11 @@ let reservedWords_ = new Set(reservedWords);
 const mixin = (Base) =>
   class es6FunctionGrammar extends Base {
     *FunctionExpression({ props: { shorthand } }) {
+      yield eatMatch(m`asyncToken*: <*Keyword 'async' />`);
       if (!shorthand) {
         yield eat(m`sigilToken*: <*Keyword 'function' />`);
       }
-
-      let a = yield eatMatch(m`asyncToken*: <*Keyword 'async' />`);
-      let gen = yield eatMatch(m`starToken*: <* '*' />`);
-
-      if (a && gen) yield fail();
+      yield eatMatch(m`starToken*: <* '*' />`);
 
       if (!shorthand) {
         yield eatMatch(m`name$: <Identifier />`, o({}), o({ bind: true }));
@@ -43,12 +40,9 @@ const mixin = (Base) =>
     }
 
     *FunctionDeclaration() {
+      yield eatMatch(m`asyncToken*: <*Keyword 'async' />`);
       yield eat(m`sigilToken*: <*Keyword 'function' />`);
-
-      let a = yield eatMatch(m`asyncToken*: <*Keyword 'async' />`);
-      let gen = yield eatMatch(m`starToken*: <* '*' />`);
-
-      if (a && gen) yield fail();
+      yield eatMatch(m`starToken*: <* '*' />`);
 
       yield eat(m`name$: <Identifier />`, o({}), o({ bind: true }));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-es6",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "A BABLR language for ES6 (JavaScript)",
   "engines": {
     "node": ">=12.0.0"
@@ -24,10 +24,10 @@
     "@bablr/agast-vm-helpers": "0.10.4",
     "@bablr/boot": "0.11.3",
     "@bablr/coroutine": "0.1.0",
-    "@bablr/helpers": "0.25.2",
+    "@bablr/helpers": "0.25.3",
     "@bablr/language-en-blank-space": "0.10.12",
     "@bablr/language-en-c-comments": "0.10.2",
-    "@bablr/language-en-es5": "0.3.4"
+    "@bablr/language-en-es5": "0.3.5"
   },
   "devDependencies": {
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#49f5952efed27f94ee9b94340eb1563c440bf64e",