Commit 6fb523ac authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

поправлена регулярка для парсинга ошибок. раньше парсились только написание заглавными буквами.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59628 954022d7-b5bf-4e40-9824-e11837661b57
parent adf3fcc8
......@@ -341,7 +341,7 @@ var str_namedRanges = "A-Za-z\u005F\u0080-\u0081\u0083\u0085-\u0087\u0089-\u008A
rx_ref = /^ *(\$?[A-Za-z]{1,3}\$?(\d{1,7}))([-+*\/^&%<=>: ;),]|$)/,
rx_refAll = /^(\$?[A-Za-z]+\$?(\d+))([-+*\/^&%<=>: ;),]|$)/,
//rx_ref3D_non_quoted = new XRegExp( "^(?<name_from>[\\p{L}\\d.]+)(:(?<name_to>[\\p{L}\\d.]+))?!" ),
rx_ref3D_non_quoted = new XRegExp( "^(?<name_from>"+"["+str_namedRanges+"]"+"["+str_namedRanges+"]"+"["+str_namedRanges+"\\d.]+)(:(?<name_to>"+"["+str_namedRanges+"]"+"["+str_namedRanges+"]"+"["+str_namedRanges+"\\d.]+))?!" ),
rx_ref3D_non_quoted = new XRegExp( "^(?<name_from>"+"["+str_namedRanges+"]"+"["+str_namedRanges+"\\d.]+)(:(?<name_to>"+"["+str_namedRanges+"]"+"["+str_namedRanges+"\\d.]+))?!","i" ),
rx_ref3D_quoted = new XRegExp( "^'(?<name_from>(?:''|[^\\[\\]'\\/*?:])*)(?::(?<name_to>(?:''|[^\\[\\]'\\/*?:])*))?'!" ),
rx_ref3D = new XRegExp( "^(?<name_from>[^:]+)(:(?<name_to>[^:]+))?!" ),
rx_before_operators = /^ *[,()]/,
......@@ -349,8 +349,8 @@ var str_namedRanges = "A-Za-z\u005F\u0080-\u0081\u0083\u0085-\u0087\u0089-\u008A
rx_LeftParentheses = /^ *\( */,
rx_RightParentheses = /^ *\)/,
rx_Comma = /^ *[,;] */,
rx_error = /^(#NULL!|#DIV\/0!|#VALUE!|#REF!|#NAME\?|#NUM!|#UNSUPPORTED_FUNCTION!|#N\/A|#GETTING_DATA)/,
rx_bool = /^(TRUE|FALSE|true|false)([-+*\/^&%<=>: ;),]|$)/,
rx_error = /^(#NULL!|#DIV\/0!|#VALUE!|#REF!|#NAME\?|#NUM!|#UNSUPPORTED_FUNCTION!|#N\/A|#GETTING_DATA)/i,
rx_bool = /^(TRUE|FALSE)([-+*\/^&%<=>: ;),]|$)/i,
rx_string = /^\"((\"\"|[^\"])*)\"/,
// rx_name = new XRegExp( "^(?<name>\\p{L}[\\p{L}\\d.]*)([-+*\\/^&%<=>: ;),]|$)" ),
rx_test_ws_name = new test_ws_name2(),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment