Browse Source

Fixing RegExp

Sebastien Ros 8 years ago
parent
commit
ecd2551ee7
2 changed files with 4 additions and 2 deletions
  1. 2 0
      Jint/Engine.cs
  2. 2 2
      Jint/Native/RegExp/RegExpConstructor.cs

+ 2 - 0
Jint/Engine.cs

@@ -302,6 +302,8 @@ namespace Jint
                 parserOptions.Loc = true;
             }
 
+            parserOptions.AdaptRegexp = true;
+
             var parser = new JavaScriptParser(source, parserOptions);
             return Execute(parser.ParseProgram());
         }

+ 2 - 2
Jint/Native/RegExp/RegExpConstructor.cs

@@ -127,10 +127,10 @@ namespace Jint.Native.RegExp
             r.Prototype = PrototypeObject;
             r.Extensible = true;
 
-            var scanner = new Scanner(regExp);
+            var scanner = new Scanner(regExp, new ParserOptions { AdaptRegexp = true });
             var body = (string)scanner.ScanRegExpBody().Value;
             var flags = (string)scanner.ScanRegExpFlags().Value;
-            r.Value = scanner.TestRegExp(body, flags, true);
+            r.Value = scanner.TestRegExp(body, flags);
 
             r.Flags = flags;
             r.Source = System.String.IsNullOrEmpty(body) ? "(?:)" : body;