support getter function name in reexports (#26)

nodejs · Oct 31, 2020 · 1163d92 · 1163d92
1 parent 20e456d
commit 1163d92
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -88,7 +88,7 @@ EXPORTS_DEFINE: `Object` `.` `defineProperty `(` IDENTIFIER_STRING `, {`
   (`enumerable: true,`)?
   (
     `value:` |
-    `get` `: function`? `()` {` return IDENTIFIER (`.` IDENTIFIER | `[` IDENTIFIER_STRING `]`)? `;`? `}`
+    `get` (`: function` IDENTIFIER? )?  `()` {` return IDENTIFIER (`.` IDENTIFIER | `[` IDENTIFIER_STRING `]`)? `;`? `}`
   )
   `})`
 

diff --git a/lexer.js b/lexer.js
@@ -318,6 +318,9 @@ function tryParseObjectDefineOrKeys (keys) {
             if (ch !== 102/*f*/) break;
             if (!source.startsWith('unction', pos + 1)) break;
             pos += 8;
+            let lastPos = pos;
+            ch = commentWhitespace();
+            if (ch !== 40 && (lastPos === pos || !identifier())) break;
             ch = commentWhitespace();
           }
           if (ch !== 40/*(*/) break;

diff --git a/src/lexer.c b/src/lexer.c
@@ -330,6 +330,9 @@ void tryParseObjectDefineOrKeys (bool keys) {
             if (ch != 'f') break;
             if (!str_eq7(pos + 1, 'u', 'n', 'c', 't', 'i', 'o', 'n')) break;
             pos += 8;
+            uint16_t* lastPos = pos;
+            ch = commentWhitespace();
+            if (ch != '(' && (lastPos == pos || !identifier(ch))) break;
             ch = commentWhitespace();
           }
           if (ch != '(') break;

diff --git a/test/_unit.js b/test/_unit.js
@@ -54,7 +54,7 @@ suite('Lexer', () => {
       });
 
       Object.defineProperty(exports, "c", {
-        get: function () {
+        get: function get () {
           return q['p' ];
         }
       });
@@ -70,6 +70,12 @@ suite('Lexer', () => {
           return external;
         }
       });
+
+      Object.defineProperty(exports, "f", {
+        get: functionget () {
+          return q['p' ];
+        }
+      });
     `);
     assert.equal(exports.length, 4);
     assert.equal(exports[0], 'a');