Skip to content

Commit aac5b68

Browse files
deps: update merve to 1.2.2
PR-URL: #62213 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent e42dbef commit aac5b68

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

deps/merve/merve.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on 2026-03-06 11:46:19 -0500. Do not edit! */
1+
/* auto-generated on 2026-03-11 12:53:21 -0400. Do not edit! */
22
#include "merve.h"
33

44
/* begin file src/parser.cpp */
@@ -1478,11 +1478,13 @@ class CJSLexer {
14781478
}
14791479

14801480
void tryBacktrackAddStarExportBinding(const char* bPos) {
1481-
while (*bPos == ' ' && bPos > source)
1481+
if (bPos < source) return;
1482+
while (bPos > source && *bPos == ' ')
14821483
bPos--;
14831484
if (*bPos == '=') {
1485+
if (bPos <= source) return;
14841486
bPos--;
1485-
while (*bPos == ' ' && bPos > source)
1487+
while (bPos > source && *bPos == ' ')
14861488
bPos--;
14871489
const char* id_end = bPos;
14881490
bool identifierStart = false;
@@ -1497,7 +1499,7 @@ class CJSLexer {
14971499
if (starExportStack == STAR_EXPORT_STACK_END)
14981500
return;
14991501
starExportStack->id = std::string_view(bPos + 1, static_cast<size_t>(id_end - bPos));
1500-
while (*bPos == ' ' && bPos > source)
1502+
while (bPos > source && *bPos == ' ')
15011503
bPos--;
15021504
switch (*bPos) {
15031505
case 'r':

deps/merve/merve.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on 2026-03-06 11:46:19 -0500. Do not edit! */
1+
/* auto-generated on 2026-03-11 12:53:21 -0400. Do not edit! */
22
/* begin file include/merve.h */
33
#ifndef MERVE_H
44
#define MERVE_H
@@ -15,14 +15,14 @@
1515
#ifndef MERVE_VERSION_H
1616
#define MERVE_VERSION_H
1717

18-
#define MERVE_VERSION "1.2.0" // x-release-please-version
18+
#define MERVE_VERSION "1.2.2" // x-release-please-version
1919

2020
namespace lexer {
2121

2222
enum {
2323
MERVE_VERSION_MAJOR = 1, // x-release-please-major
2424
MERVE_VERSION_MINOR = 2, // x-release-please-minor
25-
MERVE_VERSION_REVISION = 0, // x-release-please-patch
25+
MERVE_VERSION_REVISION = 2, // x-release-please-patch
2626
};
2727

2828
} // namespace lexer

0 commit comments

Comments
 (0)