[js] Improve readability and control flow of js date string parser.

master
Fedor 2020-07-16 03:54:23 +03:00
parent 3dd6ea0a5d
commit 1b89a480bf
1 changed files with 16 additions and 3 deletions

View File

@ -21,6 +21,8 @@
#include "mozilla/FloatingPoint.h"
#include "mozilla/Sprintf.h"
#include "nsCRT.h"
#include <ctype.h>
#include <math.h>
#include <string.h>
@ -958,11 +960,20 @@ ParseDate(const CharT* s, size_t length, ClippedTime* result)
while (i < length) {
int c = s[i];
i++;
if (c <= ' ' || c == ',' || c == '-') {
if (c == '-' && '0' <= s[i] && s[i] <= '9')
// Spaces, ASCII control characters, and commas are ignored.
if (c <= ' ' || c == ',')
continue;
// Dashes are delimiters if they're immediately followed by a number field.
// If they're not followed by a number field, they're simply ignored.
if (c == '-') {
if (i < length && nsCRT::IsAsciiDigit(s[i])) {
prevc = c;
}
continue;
}
if (c == '(') { /* comments) */
int depth = 1;
while (i < length) {
@ -977,7 +988,9 @@ ParseDate(const CharT* s, size_t length, ClippedTime* result)
}
continue;
}
if ('0' <= c && c <= '9') {
// Parse a number field.
if (nsCRT::IsAsciiDigit(c)) {
int n = c - '0';
while (i < length && '0' <= (c = s[i]) && c <= '9') {
n = n * 10 + c - '0';