Merge pull request #2505 from HTPC-Schrauber/fix-RegEx

Fixed: RegEx for gcc > 4.9

AppKit/CPTextView/CPTextView.j

@@ -1899,18 +1899,18 @@ var kDelegateRespondsTo_textShouldBeginEditing
 
 + (JSObject)_wordBoundaryRegex
 {
-    return /(^[0-9][\.,])|(^.[^-\.,+#'"!§$%&/\(<\[\]>\)=?`´*\s{}\|¶])/m;
+    return new RegExp("(^[0-9][\\.,])|(^.[^-\\.,+#'\"!§$%&/\\(<\\[\\]>\\)=?`´*\\s{}\\|¶])", "m");
 }
 
 + (JSObject)_paragraphBoundaryRegex
 {
-    return /^.[^\n\r]/m;
+    return new RegExp("^.[^\\n\\r]", "m");
 }
 
 + (JSObject)_whitespaceRegex
 {
     // do not include \n here or we will get cross paragraph selections
-    return /^.[ \t]+/m;
+    return new RegExp("^.[ \\t]+", "m");
 }
 
 - (CPRange)_characterRangeForIndex:(unsigned)index asDefinedByRegex:(JSObject)regex

AppKit/CPTextView/_CPRTFParser.j

@@ -350,7 +350,7 @@ var kRgsymRtf = {
 
             var hex = '';
 
-            while (/[a-fA-F0-9\']/.test(ch))
+            while (new RegExp("[a-fA-F0-9\\']").test(ch))
             {
                 if (ch == "'")
                 {
@@ -377,7 +377,7 @@ var kRgsymRtf = {
 
              var code = '';
 
-             while (/[0-9]/.test(ch))
+             while (new RegExp("[0-9]").test(ch))
              {
                  code += (ch + '');
                  ch = _rtf.charAt(++_currentParseIndex);
@@ -621,7 +621,7 @@ var kRgsymRtf = {
     if (!/[a-zA-Z]/.test(ch))
         return [self _translateKeyword:ch parameter:nil fParameter:fParam];
 
-    while (/[a-zA-Z]/.test(ch))
+    while (new RegExp("[a-zA-Z]").test(ch))
     {
         keyword += ch;
         ch = rtf.charAt(++_currentParseIndex);
@@ -635,7 +635,7 @@ var kRgsymRtf = {
 
     fParam = true;
 
-    while (/[0-9]/.test(ch))
+    while (new RegExp("[0-9]").test(ch))
     {
         param += (ch + '');
         ch = rtf.charAt(++_currentParseIndex);

Foundation/CPDate.j

@@ -115,7 +115,7 @@ var CPDateReferenceDate = new Date(Date.UTC(2001, 0, 1, 0, 0, 0, 0));
 */
 - (id)initWithString:(CPString)description
 {
-    var format = /(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2}) ([-+])(\d{2})(\d{2})/,
+    var format = new RegExp("(\\d{4})-(\\d{2})-(\\d{2}) (\\d{2}):(\\d{2}):(\\d{2}) ([-+])(\\d{2})(\\d{2})"),
         d = description.match(new RegExp(format));
 
     if (!d || d.length != 10)
@@ -262,7 +262,7 @@ Date.parseISO8601 = function (date)
     // First, check for native parsing.
     timestamp = Date.parse(date);
 
-    if (isNaN(timestamp) && (struct = /^(\d{4}|[+\-]\d{6})(?:-(\d{2})(?:-(\d{2}))?)?(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d{3}))?)?(?:(Z)|([+\-])(\d{2})(?::(\d{2}))?)?)?$/.exec(date)))
+    if (isNaN(timestamp) && (struct = new RegExp("^(\\d{4}|[+\\-]\\d{6})(?:-(\\d{2})(?:-(\\d{2}))?)?(?:T(\\d{2}):(\\d{2})(?::(\\d{2})(?:\\.(\\d{3}))?)?(?:(Z)|([+\\-])(\\d{2})(?::(\\d{2}))?)?)?$").exec(date)))
     {
         // avoid NaN timestamps caused by "undefined" values being passed to Date.UTC
         for (var i = 0, k; (k = numericKeys[i]); ++i)
@@ -294,4 +294,4 @@ function _isNumberType(value)
         return YES;
     else
         return NO;
-}
+}

Foundation/CPDateFormatter.j

@@ -1931,7 +1931,7 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4,
 */
 - (int)_secondsFromTimeZoneDefaultFormatString:(CPString)aTimeZoneFormatString
 {
-    var format =  /\w*([HPG-GMT])?([+-])(\d{1,2})([:])?(\d{2})\w*/,
+    var format = new RegExp("\\w*([HPG-GMT])?([+-])(\\d{1,2})([:])?(\\d{2})\\w*"),
         result = aTimeZoneFormatString.match(new RegExp(format)),
         seconds = 0;
 
@@ -1969,7 +1969,7 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4,
     var character = [aToken characterAtIndex:0],
         length = [aToken length],
         targetedArray,
-        format = /\w*([HPG-GMT])?([+-])(\d{1,2})([:])?(\d{2})\w*/,
+        format = new RegExp("\\w*([HPG-GMT])?([+-])(\\d{1,2})([:])?(\\d{2})\\w*"),
         result = aString.match(new RegExp(format));
 
     switch (character)

Foundation/CPDecimal.j

@@ -119,7 +119,7 @@ function CPDecimalMakeWithString(string, locale)
     // Note: this doesn't accept .01 for example, should it?
     // If yes simply add '?' after integer part group, i.e. ([+\-]?)((?:0|[1-9]\d*)?)
     // Note: now it accept .01 style.
-    var matches = string.match(/^([+\-]?)((?:0|[0-9]\d*)?)(?:\.(\d*))?(?:[eE]([+\-]?)(\d+))?$/);
+    var matches = string.match(new RegExp("^([+\\-]?)((?:0|[0-9]\\d*)?)(?:\\.(\\d*))?(?:[eE]([+\\-]?)(\\d+))?$"));
 
     if (!matches)
         return CPDecimalMakeNaN();

Foundation/_CPCollectionKVCOperators.j

@@ -22,7 +22,7 @@
 
 @import "CPObject.j"
 
-var _CPCollectionKVCOperatorSimpleRE = /^@(avg|count|m(ax|in)|sum|unionOfObjects|distinctUnionOfObjects|unionOfArrays|distinctUnionOfArrays|distinctUnionOfSets)(\.|$)/;
+var _CPCollectionKVCOperatorSimpleRE = new RegExp("^@(avg|count|m(ax|in)|sum|unionOfObjects|distinctUnionOfObjects|unionOfArrays|distinctUnionOfArrays|distinctUnionOfSets)(\\.|$)");
 
 
 @implementation _CPCollectionKVCOperator : CPObject

Tools/nib2cib/Converter.j

@@ -165,9 +165,9 @@ ConverterConversionException = @"ConverterConversionException";
         if (system.engine === "rhino")
             plistContents = String(java.lang.String(plistContents).replaceAll("\\<key\\>\\s*CF\\$UID\\s*\\<\/key\\>", "<key>CP\\$UID</key>"));
         else
-            plistContents = plistContents.replace(/\<key\>\s*CF\$UID\s*\<\/key\>/g, "<key>CP$UID</key>");
+            plistContents = plistContents.replace(new RegExp("\\<key\\>\\s*CF\\$UID\\s*\\<\\/key\\>", "g"), "<key>CP$UID</key>");
 
-        plistContents = plistContents.replace(/<string>[\u0000-\u0008\u000B\u000C\u000E-\u001F]<\/string>/g, function(c)
+        plistContents = plistContents.replace(new RegExp("<string>[\\u0000-\\u0008\\u000B\\u000C\\u000E-\\u001F]<\\/string>", "g"), function(c)
         {
             CPLog.warn("Warning: converting character 0x" + c.charCodeAt(8).toString(16) + " to base64 representation");
             return "<string type=\"base64\">" + CFData.encodeBase64String(c.charAt(8)) + "</string>";