Fixed bug where a regex that started with raised a syntax error

mck89 · Mar 5, 2024 · 2791b08 · 2791b08
1 parent f6e6810
commit 2791b08
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.16.1-dev"
+            "dev-master": "1.16.2-dev"
         }
     }
 }
diff --git a/doc/changelog.md b/doc/changelog.md
@@ -1,6 +1,9 @@
 Changelog
 ==========
 
+#### 1.16.2
+* Fixed bug where a regex that started with `/=` raised a syntax error
+
 #### 1.16.1
 * Fixed bug where, in some situations, scanner allowed invalid characters after a slash
 

diff --git a/lib/Peast/Syntax/Scanner.php b/lib/Peast/Syntax/Scanner.php
@@ -997,6 +997,11 @@ protected function isAfterSlash($position)
             elseif (in_array($char, $this->whitespaces) && !in_array($char, $this->lineTerminators)) {
                 $idx--;
             }
+            //If "/=" is found, return true, this is the only operator that needs a special treatment
+            //since it can be also the start of a regex
+            elseif ($char === "=" && $this->charAt($idx - 1) === "/") {
+                return true;
+            }
             //Different character, return
             else {
                 break;

diff --git a/test/Peast/Syntax/ES2015/files/Literal/Regexp10.Render.txt b/test/Peast/Syntax/ES2015/files/Literal/Regexp10.Render.txt
@@ -0,0 +1,5 @@
+/=\n/;
+/**************************************************/
+/=\n/;
+/**************************************************/
+/=\n/;
diff --git a/test/Peast/Syntax/ES2015/files/Literal/Regexp10.Tokens.json b/test/Peast/Syntax/ES2015/files/Literal/Regexp10.Tokens.json
@@ -0,0 +1,18 @@
+[
+	{
+	    "type": "RegularExpression",
+	    "value": "/=\\n/",
+	    "location": {
+	        "start": {
+	            "line": 1,
+	            "column": 0,
+	            "index": 0
+	        },
+	        "end": {
+	            "line": 1,
+	            "column": 5,
+	            "index": 5
+	        }
+	    }
+	}
+]
diff --git a/test/Peast/Syntax/ES2015/files/Literal/Regexp10.js b/test/Peast/Syntax/ES2015/files/Literal/Regexp10.js
@@ -0,0 +1 @@
+/=\n/
diff --git a/test/Peast/Syntax/ES2015/files/Literal/Regexp10.json b/test/Peast/Syntax/ES2015/files/Literal/Regexp10.json
@@ -0,0 +1,58 @@
+{
+	"type": "Program",
+	"location": {
+	    "start": {
+	        "line": 1,
+	        "column": 0,
+	        "index": 0
+	    },
+	    "end": {
+	        "line": 1,
+	        "column": 5,
+	        "index": 5
+	    }
+	},
+	"leadingComments": [],
+	"trailingComments": [],
+	"body": [
+	    {
+	        "type": "ExpressionStatement",
+	        "location": {
+	            "start": {
+	                "line": 1,
+	                "column": 0,
+	                "index": 0
+	            },
+	            "end": {
+	                "line": 1,
+	                "column": 5,
+	                "index": 5
+	            }
+	        },
+	        "leadingComments": [],
+	        "trailingComments": [],
+	        "expression": {
+	            "type": "RegExpLiteral",
+	            "location": {
+	                "start": {
+	                    "line": 1,
+	                    "column": 0,
+	                    "index": 0
+	                },
+	                "end": {
+	                    "line": 1,
+	                    "column": 5,
+	                    "index": 5
+	                }
+	            },
+	            "leadingComments": [],
+	            "trailingComments": [],
+	            "value": "/=\\n/",
+	            "raw": "/=\\n/",
+	            "flags": "",
+	            "pattern": "=\\n"
+	        }
+	    }
+	],
+	"sourceType": "script"
+}