fix(parser): tweaked some code

meriyah · Jul 6, 2019 · 6acf9ad · KFlash · Jul 6, 2019 · 6acf9ad
1 parent 6624f57
commit 6acf9ad
Show file tree

Hide file tree

Showing 6 changed files with 281 additions and 97 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/lexer/charClassifier.ts b/src/lexer/charClassifier.ts
@@ -19,6 +19,7 @@ export const enum CharFlags {
   Underscore            = 1 << 21,
   StringLiteral         = 1 << 22,
   JSXToken              = 1 << 23,
+  Hyphen    = 1 << 24,
 }
 
 /**
@@ -70,7 +71,7 @@ export const CharTypes = [
   CharFlags.None /* 0x2A   */,
   CharFlags.Exponent /* 0x2B   */,
   CharFlags.None /* 0x2C   */,
-  CharFlags.Exponent /* 0x2D   */,
+  CharFlags.Exponent | CharFlags.Hyphen /* 0x2D   */,
   CharFlags.None /* 0x2E   */,
   CharFlags.None /* 0x2F   */,
   CharFlags.IdentifierPart | CharFlags.Decimal | CharFlags.Binary | CharFlags.Octal | CharFlags.Hex /* 0x30 0 */,

diff --git a/src/lexer/jsx.ts b/src/lexer/jsx.ts
@@ -1,4 +1,4 @@
-import { CharFlags, CharTypes, isIdentifierStart, isIdentifierPart } from './charClassifier';
+import { CharFlags, CharTypes } from './charClassifier';
 import { Chars } from '../chars';
 import { Token } from '../token';
 import { ParserState, Context } from '../common';
@@ -81,18 +81,15 @@ export function scanJSXToken(parser: ParserState): Token {
 
 /**
  * Scans JSX identifier
+ *
  * @param parser The parser instance
- * @param context Context masks
  */
 export function scanJSXIdentifier(parser: ParserState): Token {
   if ((parser.token & Token.IsIdentifier) === Token.IsIdentifier) {
     const { index } = parser;
-
-    while (parser.index < parser.end) {
-      const char = parser.nextCP;
-      if (char === Chars.Hyphen || (index === parser.index ? isIdentifierStart(char) : isIdentifierPart(char))) {
-        nextCP(parser);
-      } else break;
+    let char = parser.nextCP;
+    while ((CharTypes[char] & (CharFlags.Hyphen | CharFlags.IdentifierPart)) !== 0) {
+      char = nextCP(parser);
     }
     parser.tokenValue += parser.source.slice(index, parser.index);
   }

diff --git a/src/meriyah.ts b/src/meriyah.ts
@@ -23,4 +23,4 @@ export function parse(source: string, options: Options | void): ESTree.Program {
   return parseSource(source, options, Context.None);
 }
 
-export const version = '1.2.6';
+export const version = '1.3.0';
diff --git a/src/parser.ts b/src/parser.ts
@@ -4,8 +4,6 @@ import * as ESTree from './estree';
 import { report, reportAt, Errors } from './errors';
 import { scanTemplateTail } from './lexer/template';
 import { scanJSXIdentifier, scanJSXToken, scanJSXAttributeValue } from './lexer/jsx';
-import { isEqualTagName } from './common';
-
 import {
   declareName,
   declareAndDedupe,
@@ -41,7 +39,8 @@ import {
   validateAndDeclareLabel,
   finishNode,
   HoistedClassFlags,
-  HoistedFunctionFlags
+  HoistedFunctionFlags,
+  isEqualTagName
 } from './common';
 
 /**
@@ -7975,6 +7974,7 @@ function parseAndClassifyIdentifier(
  * @param line
  * @param column
  */
+
 function parseJSXRootElementOrFragment(
   parser: ParserState,
   context: Context,
@@ -7983,36 +7983,35 @@ function parseJSXRootElementOrFragment(
   line: number,
   column: number
 ): ESTree.JSXElement | ESTree.JSXFragment {
-  const openingElement:
-    | ESTree.JSXOpeningElement
-    | ESTree.JSXOpeningFragment = parseJSXOpeningFragmentOrSelfCloseElement(
+  nextToken(parser, context);
+
+  // JSX fragments
+  if (parser.token === Token.GreaterThan) {
+    return finishNode(parser, context, start, line, column, {
+      type: 'JSXFragment',
+      openingFragment: parseOpeningFragment(parser, context, start, line, column),
+      children: parseJSXChildren(parser, context),
+      closingFragment: parseJSXClosingFragment(
+        parser,
+        context,
+        isJSXChild,
+        parser.tokenIndex,
+        parser.linePos,
+        parser.colPos
+      )
+    });
+  }
+
+  let closingElement: ESTree.JSXClosingElement | null = null;
+  let children: ESTree.JSXChild[] = [];
+  const openingElement: ESTree.JSXOpeningElement = parseJSXOpeningFragmentOrSelfCloseElement(
     parser,
     context,
     isJSXChild,
     start,
     line,
     column
   );
-  let children: ESTree.JSXChild[] = [];
-  let closingElement: ESTree.JSXClosingElement | ESTree.JSXClosingFragment | null = null;
-
-  if (openingElement.type === 'JSXOpeningFragment') {
-    children = parseJSXChildren(parser, context);
-    closingElement = parseJSXClosingFragment(
-      parser,
-      context,
-      isJSXChild,
-      parser.tokenIndex,
-      parser.linePos,
-      parser.colPos
-    );
-    return finishNode(parser, context, start, line, column, {
-      type: 'JSXFragment',
-      children,
-      openingFragment: openingElement,
-      closingFragment: closingElement
-    });
-  }
 
   if (!openingElement.selfClosing) {
     children = parseJSXChildren(parser, context);
@@ -8024,9 +8023,8 @@ function parseJSXRootElementOrFragment(
       parser.linePos,
       parser.colPos
     );
-    const open = isEqualTagName(openingElement.name);
     const close = isEqualTagName(closingElement.name);
-    if (open !== close) report(parser, Errors.Unexpected);
+    if (isEqualTagName(openingElement.name) !== close) report(parser, Errors.ExpectedJSXClosingTag, close);
   }
 
   return finishNode(parser, context, start, line, column, {
@@ -8037,6 +8035,28 @@ function parseJSXRootElementOrFragment(
   });
 }
 
+/**
+ * Parses JSX opening fragment
+ *
+ * @param parser Parser object
+ * @param context  Context masks
+ * @param start
+ * @param line
+ * @param column
+ */
+export function parseOpeningFragment(
+  parser: ParserState,
+  context: Context,
+  start: number,
+  line: number,
+  column: number
+): ESTree.JSXOpeningFragment {
+  scanJSXToken(parser);
+  return finishNode(parser, context, start, line, column, {
+    type: 'JSXOpeningFragment'
+  });
+}
+
 /**
  * Parses JSX Closing element
  *
@@ -8161,23 +8181,10 @@ export function parseJSXText(
 ): ESTree.JSXText {
   const value = parser.tokenValue;
   scanJSXToken(parser);
-  return finishNode(
-    parser,
-    context,
-    start,
-    line,
-    column,
-    context & Context.OptionsRaw
-      ? {
-          type: 'JSXText',
-          value,
-          raw: value
-        }
-      : {
-          type: 'JSXText',
-          value
-        }
-  );
+  return finishNode(parser, context, start, line, column, {
+    type: 'JSXText',
+    value
+  });
 }
 
 /**
@@ -8197,15 +8204,7 @@ function parseJSXOpeningFragmentOrSelfCloseElement(
   start: number,
   line: number,
   column: number
-): ESTree.JSXOpeningElement | ESTree.JSXOpeningFragment {
-  consume(parser, context, Token.LessThan);
-  if (parser.token === Token.GreaterThan) {
-    scanJSXToken(parser);
-    return finishNode(parser, context, start, line, column, {
-      type: 'JSXOpeningFragment'
-    });
-  }
-
+): ESTree.JSXOpeningElement {
   if ((parser.token & Token.IsIdentifier) !== Token.IsIdentifier && (parser.token & Token.Keyword) !== Token.Keyword)
     report(parser, Errors.Unexpected);