From f24883f7579b1a704c626b196914147afe1c2913 Mon Sep 17 00:00:00 2001 From: CanadaHonk <19228318+CanadaHonk@users.noreply.github.com> Date: Mon, 12 Jun 2023 11:59:22 +0100 Subject: [PATCH] Fix hashbang checks not using all line terminator chars Should make 2 more test262 hashbang tests pass. --- toolsrc/org/mozilla/javascript/tools/shell/Main.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolsrc/org/mozilla/javascript/tools/shell/Main.java b/toolsrc/org/mozilla/javascript/tools/shell/Main.java index c933ad41cb..a7d153a758 100644 --- a/toolsrc/org/mozilla/javascript/tools/shell/Main.java +++ b/toolsrc/org/mozilla/javascript/tools/shell/Main.java @@ -35,6 +35,7 @@ import org.mozilla.javascript.Script; import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; +import org.mozilla.javascript.ScriptRuntime; import org.mozilla.javascript.SecurityController; import org.mozilla.javascript.commonjs.module.ModuleScope; import org.mozilla.javascript.commonjs.module.Require; @@ -566,7 +567,7 @@ static void processFileSecure(Context cx, Scriptable scope, String path, Object if (strSrc.length() > 0 && strSrc.charAt(0) == '#') { for (int i = 1; i != strSrc.length(); ++i) { int c = strSrc.charAt(i); - if (c == '\n' || c == '\r') { + if (ScriptRuntime.isJSLineTerminator(c)) { strSrc = strSrc.substring(i); break; }