diff --git a/src/CONST/index.ts b/src/CONST/index.ts index 1136124d1eb5..d15ce273ed6e 100644 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -6500,6 +6500,11 @@ const CONST = { CLEARED: 'cleared', FAILED: 'failed', }, + PAID_STATUS: { + MARKED_AS_PAID: 'markedAsPaid', + WITHDRAWING: 'withdrawing', + CONFIRMED: 'confirmed', + }, IS_VALUES: { READ: 'read', UNREAD: 'unread', @@ -6906,6 +6911,7 @@ const CONST = { POSTED: 'posted', WITHDRAWAL_TYPE: 'withdrawalType', WITHDRAWAL_STATUS: 'withdrawalStatus', + PAID_STATUS: 'paidStatus', WITHDRAWN: 'withdrawn', TOTAL: 'total', TITLE: 'title', @@ -6983,6 +6989,7 @@ const CONST = { POSTED: 'posted', WITHDRAWAL_TYPE: 'withdrawal-type', WITHDRAWAL_STATUS: 'withdrawal-status', + PAID_STATUS: 'paid-status', WITHDRAWN: 'withdrawn', TITLE: 'title', ASSIGNEE: 'assignee', diff --git a/src/components/Search/FilterComponents/index.tsx b/src/components/Search/FilterComponents/index.tsx index f3f54af44310..e5019f11d014 100644 --- a/src/components/Search/FilterComponents/index.tsx +++ b/src/components/Search/FilterComponents/index.tsx @@ -57,6 +57,7 @@ type MultiSelectFilterKeys = | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPENSE_TYPE | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.RECEIPT_TYPE | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.WITHDRAWAL_STATUS + | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.PAID_STATUS | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.STATUS; type MultiSelectFilterComponentsProps = SearchFilterCommonProps & { filterKey: MultiSelectFilterKeys; @@ -220,6 +221,7 @@ function FilterComponents({filterKey, value, type, policyIDs, policyIDQuery, sel case CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPENSE_TYPE: case CONST.SEARCH.SYNTAX_FILTER_KEYS.RECEIPT_TYPE: case CONST.SEARCH.SYNTAX_FILTER_KEYS.WITHDRAWAL_STATUS: + case CONST.SEARCH.SYNTAX_FILTER_KEYS.PAID_STATUS: case CONST.SEARCH.SYNTAX_FILTER_KEYS.STATUS: { return ( ; type SearchDatePreset = ValueOf; type SearchWithdrawalType = ValueOf; type SearchWithdrawalStatus = Array>; +type SearchPaidStatus = Array>; type SyntaxFilterKey = ValueOf; type SearchCustomColumnIds = @@ -475,6 +476,7 @@ export type { SearchDatePreset, SearchWithdrawalType, SearchWithdrawalStatus, + SearchPaidStatus, UserFriendlyValue, SelectedReports, BankAccountMenuItem, diff --git a/src/hooks/useAdvancedSearchFilters.ts b/src/hooks/useAdvancedSearchFilters.ts index 64c7356381ed..7ed6dec639b1 100644 --- a/src/hooks/useAdvancedSearchFilters.ts +++ b/src/hooks/useAdvancedSearchFilters.ts @@ -79,6 +79,7 @@ const typeFiltersKeys = { CONST.SEARCH.SYNTAX_FILTER_KEYS.TOTAL, CONST.SEARCH.SYNTAX_FILTER_KEYS.CURRENCY, CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED_TO, + CONST.SEARCH.SYNTAX_FILTER_KEYS.PAID_STATUS, CONST.SEARCH.SYNTAX_FILTER_KEYS.TITLE, CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_ID, CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_FIELD, diff --git a/src/hooks/useAutocompleteSuggestions.ts b/src/hooks/useAutocompleteSuggestions.ts index 997c112161a3..672f27ae45b3 100644 --- a/src/hooks/useAutocompleteSuggestions.ts +++ b/src/hooks/useAutocompleteSuggestions.ts @@ -69,6 +69,7 @@ const EXPENSE_TYPE_FRIENDLY_VALUES = Object.values(CONST.SEARCH.TRANSACTION_TYPE const RECEIPT_TYPE_FRIENDLY_VALUES = Object.values(CONST.SEARCH.RECEIPT_TYPE).map((value) => getUserFriendlyValue(value)); const WITHDRAWAL_TYPE_VALUES = Object.values(CONST.SEARCH.WITHDRAWAL_TYPE); const WITHDRAWAL_STATUS_VALUES = Object.values(CONST.SEARCH.SETTLEMENT_STATUS); +const PAID_STATUS_VALUES = Object.values(CONST.SEARCH.PAID_STATUS); const BOOLEAN_VALUES = Object.values(CONST.SEARCH.BOOLEAN); const ACTION_FILTER_VALUES = Object.values(CONST.SEARCH.ACTION_FILTERS); const IS_VALUES_LIST = Object.values(CONST.SEARCH.IS_VALUES); @@ -402,6 +403,14 @@ function useAutocompleteSuggestions({ text: withdrawalStatus, })); } + case CONST.SEARCH.SYNTAX_FILTER_KEYS.PAID_STATUS: { + const filteredPaidStatuses = PAID_STATUS_VALUES.filter((paidStatus) => paidStatus.includes(autocompleteValue.toLowerCase()) && !alreadyAutocompletedKeys.has(paidStatus)).sort(); + + return filteredPaidStatuses.map((paidStatus) => ({ + filterKey: CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS.PAID_STATUS, + text: paidStatus, + })); + } case CONST.SEARCH.SYNTAX_FILTER_KEYS.FEED: { // We don't want to show the "Expensify Card" feeds in the autocomplete suggestion list as they don't have real "Statements" // Thus passing an empty object to the `allCards` parameter. diff --git a/src/languages/de.ts b/src/languages/de.ts index 17e556a2d3ef..09229454ba9e 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -397,6 +397,7 @@ const translations: TranslationDeepObject = { withdrawalID: 'Auszahlungs-ID', internationalReimbursementIDs: 'Internationale Erstattungs-IDs', withdrawalStatus: 'Auszahlungsstatus', + paidStatus: 'Status: Bezahlt', bankAccounts: 'Bankkonten', chooseFile: 'Datei auswählen', chooseFiles: 'Dateien auswählen', @@ -8841,6 +8842,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc failedError: ({link}: {link: string}) => `Wir versuchen diese Abrechnung erneut, sobald du dein Konto entsperrst.`, withdrawalInfo: ({date, withdrawalID}: {date: string; withdrawalID: number}) => `${date} • Auszahlungs-ID: ${withdrawalID}`, }, + paidStatus: {markedAsPaid: 'Als bezahlt markiert', withdrawing: 'Wird abgehoben', confirmed: 'Bestätigt'}, reportLayout: { reportLayout: 'Berichts-Layout', groupByLabel: 'Gruppieren nach:', diff --git a/src/languages/en.ts b/src/languages/en.ts index 1ece0ac4abff..d5018cc93bf8 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -422,6 +422,7 @@ const translations = { withdrawalID: 'Withdrawal ID', internationalReimbursementIDs: 'International reimbursement IDs', withdrawalStatus: 'Withdrawal status', + paidStatus: 'Paid status', bankAccounts: 'Bank accounts', chooseFile: 'Choose file', chooseFiles: 'Choose files', @@ -8912,6 +8913,11 @@ const translations = { failedError: ({link}: {link: string}) => `We'll retry this settlement when you unlock your account.`, withdrawalInfo: ({date, withdrawalID}: {date: string; withdrawalID: number}) => `${date} • Withdrawal ID: ${withdrawalID}`, }, + paidStatus: { + markedAsPaid: 'Marked as paid', + withdrawing: 'Withdrawing', + confirmed: 'Confirmed', + }, reportLayout: { reportLayout: 'Report layout', groupByLabel: 'Group by:', diff --git a/src/languages/es.ts b/src/languages/es.ts index 880744d69b34..1aded1656317 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -353,6 +353,7 @@ const translations: TranslationDeepObject = { longReportID: 'ID de informe largo', withdrawalID: 'ID de retiro', withdrawalStatus: 'Estado de retiro', + paidStatus: 'Estado pagado', bankAccounts: 'Cuentas bancarias', chooseFile: 'Elegir archivo', chooseFiles: 'Elegir archivos', @@ -8619,6 +8620,7 @@ ${amount} para ${merchant} - ${date}`, failedError: ({link}: {link: string}) => `Reintentaremos esta liquidación cuando desbloquees tu cuenta.`, withdrawalInfo: ({date, withdrawalID}: {date: string; withdrawalID: number}) => `${date} • ID de retiro: ${withdrawalID}`, }, + paidStatus: {markedAsPaid: 'Marcado como pagado', withdrawing: 'Retirando', confirmed: 'Confirmado'}, reportLayout: { reportLayout: 'Diseño del informe', groupByLabel: 'Agrupar por:', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index eb287f76c5dc..9e93c7137283 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -396,6 +396,7 @@ const translations: TranslationDeepObject = { withdrawalID: 'ID de retrait', internationalReimbursementIDs: 'ID de remboursement international', withdrawalStatus: 'Statut de retrait', + paidStatus: 'Statut payé', bankAccounts: 'Comptes bancaires', chooseFile: 'Choisir un fichier', chooseFiles: 'Choisir des fichiers', @@ -8875,6 +8876,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e failedError: ({link}: {link: string}) => `Nous réessaierons ce règlement lorsque vous déverrouillerez votre compte.`, withdrawalInfo: ({date, withdrawalID}: {date: string; withdrawalID: number}) => `${date} • ID de retrait : ${withdrawalID}`, }, + paidStatus: {markedAsPaid: 'Marqué comme payé', withdrawing: 'Retrait en cours', confirmed: 'Confirmé'}, reportLayout: { reportLayout: 'Mise en page de la note de frais', groupByLabel: 'Regrouper par :', diff --git a/src/languages/it.ts b/src/languages/it.ts index 7fcf8103ebd7..b047df925067 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -397,6 +397,7 @@ const translations: TranslationDeepObject = { withdrawalID: 'ID prelievo', internationalReimbursementIDs: 'ID di rimborso internazionale', withdrawalStatus: 'Stato del prelievo', + paidStatus: 'Stato di pagamento', bankAccounts: 'Conti bancari', chooseFile: 'Scegli file', chooseFiles: 'Scegli file', @@ -8831,6 +8832,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`, failedError: ({link}: {link: string}) => `Riproveremo a effettuare questa liquidazione quando sblocchi il tuo conto.`, withdrawalInfo: ({date, withdrawalID}: {date: string; withdrawalID: number}) => `${date} • ID prelievo: ${withdrawalID}`, }, + paidStatus: {markedAsPaid: 'Contrassegnato come pagato', withdrawing: 'Prelievo', confirmed: 'Confermato'}, reportLayout: { reportLayout: 'Layout del report', groupByLabel: 'Raggruppa per:', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 960b54fdd5a5..f864887fc3c6 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -396,6 +396,7 @@ const translations: TranslationDeepObject = { withdrawalID: '出金ID', internationalReimbursementIDs: '国際払い戻しID', withdrawalStatus: '出金ステータス', + paidStatus: '支払済みステータス', bankAccounts: '銀行口座', chooseFile: 'ファイルを選択', chooseFiles: 'ファイルを選択', @@ -8706,6 +8707,7 @@ ${reportName}`, failedError: ({link}: {link: string}) => `アカウントのロックを解除すると、この精算を再試行します。`, withdrawalInfo: ({date, withdrawalID}: {date: string; withdrawalID: number}) => `${date}・出金 ID：${withdrawalID}`, }, + paidStatus: {markedAsPaid: '支払い済みにマークしました', withdrawing: '出金中', confirmed: '確認済み'}, reportLayout: { reportLayout: 'レポートレイアウト', groupByLabel: 'グループ化基準:', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index b56fa4936fe0..addc266be419 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -396,6 +396,7 @@ const translations: TranslationDeepObject = { withdrawalID: 'Opname-ID', internationalReimbursementIDs: 'Internationale terugbetalings-ID’s', withdrawalStatus: 'Opnamestatus', + paidStatus: 'Betaald-status', bankAccounts: 'Bankrekeningen', chooseFile: 'Bestand kiezen', chooseFiles: 'Bestanden kiezen', @@ -8800,6 +8801,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`, failedError: ({link}: {link: string}) => `We proberen deze afrekening opnieuw zodra je je account ontgrendelt.`, withdrawalInfo: ({date, withdrawalID}: {date: string; withdrawalID: number}) => `${date} • Opname-ID: ${withdrawalID}`, }, + paidStatus: {markedAsPaid: 'Gemarkeerd als betaald', withdrawing: 'Opnemen', confirmed: 'Bevestigd'}, reportLayout: { reportLayout: 'Rapportindeling', groupByLabel: 'Groeperen op:', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 4a55f298ec78..7bd91d75de21 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -396,6 +396,7 @@ const translations: TranslationDeepObject = { withdrawalID: 'Identyfikator wypłaty', internationalReimbursementIDs: 'Identyfikatory zwrotów międzynarodowych', withdrawalStatus: 'Status wypłaty', + paidStatus: 'Status: opłacono', bankAccounts: 'Konta bankowe', chooseFile: 'Wybierz plik', chooseFiles: 'Wybierz pliki', @@ -8782,6 +8783,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`, failedError: ({link}: {link: string}) => `Spróbujemy ponownie rozliczyć tę płatność, gdy odblokujesz swoje konto.`, withdrawalInfo: ({date, withdrawalID}: {date: string; withdrawalID: number}) => `${date} • ID wypłaty: ${withdrawalID}`, }, + paidStatus: {markedAsPaid: 'Oznaczone jako opłacone', withdrawing: 'Wypłata', confirmed: 'Potwierdzone'}, reportLayout: { reportLayout: 'Układ raportu', groupByLabel: 'Grupuj według:', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 55ddcd599a1a..e4398dd49cd0 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -396,6 +396,7 @@ const translations: TranslationDeepObject = { withdrawalID: 'ID do saque', internationalReimbursementIDs: 'IDs de reembolso internacional', withdrawalStatus: 'Status do saque', + paidStatus: 'Status pago', bankAccounts: 'Contas bancárias', chooseFile: 'Escolher arquivo', chooseFiles: 'Escolher arquivos', @@ -8788,6 +8789,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`, failedError: ({link}: {link: string}) => `Tentaremos processar este acerto novamente quando você desbloquear sua conta.`, withdrawalInfo: ({date, withdrawalID}: {date: string; withdrawalID: number}) => `${date} • ID de saque: ${withdrawalID}`, }, + paidStatus: {markedAsPaid: 'Marcado como pago', withdrawing: 'Sacando', confirmed: 'Confirmado'}, reportLayout: { reportLayout: 'Layout do relatório', groupByLabel: 'Agrupar por:', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index e9208408085f..700f10aacc2f 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -396,6 +396,7 @@ const translations: TranslationDeepObject = { withdrawalID: '提现编号', internationalReimbursementIDs: '国际报销 ID', withdrawalStatus: '提现状态', + paidStatus: '已付款状态', bankAccounts: '银行账户', chooseFile: '选择文件', chooseFiles: '选择文件', @@ -8527,6 +8528,7 @@ ${reportName}`, failedError: ({link}: {link: string}) => `当你解锁你的账户后，我们会重试此结算。`, withdrawalInfo: ({date, withdrawalID}: {date: string; withdrawalID: number}) => `${date} • 提现 ID：${withdrawalID}`, }, + paidStatus: {markedAsPaid: '标记为已付款', withdrawing: '提现中', confirmed: '已确认'}, reportLayout: { reportLayout: '报表布局', groupByLabel: '分组依据：', diff --git a/src/libs/SearchAutocompleteUtils.ts b/src/libs/SearchAutocompleteUtils.ts index 584d5ecf324e..026fb5752a88 100644 --- a/src/libs/SearchAutocompleteUtils.ts +++ b/src/libs/SearchAutocompleteUtils.ts @@ -163,6 +163,7 @@ function filterOutRangesWithCorrectValue( const receiptTypeList = userFriendlyReceiptTypeList; const withdrawalTypeList = Object.values(CONST.SEARCH.WITHDRAWAL_TYPE) as string[]; const withdrawalStatusList = Object.values(CONST.SEARCH.SETTLEMENT_STATUS) as string[]; + const paidStatusList = Object.values(CONST.SEARCH.PAID_STATUS) as string[]; const statusList = userFriendlyStatusList; const groupByList = userFriendlyGroupByList; const viewList = userFriendlyViewList; @@ -206,6 +207,8 @@ function filterOutRangesWithCorrectValue( return withdrawalTypeList.includes(range.value); case CONST.SEARCH.SYNTAX_FILTER_KEYS.WITHDRAWAL_STATUS: return withdrawalStatusList.includes(range.value); + case CONST.SEARCH.SYNTAX_FILTER_KEYS.PAID_STATUS: + return paidStatusList.includes(range.value); case CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS: return statusList.includes(range.value); case CONST.SEARCH.SYNTAX_FILTER_KEYS.ACTION: diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js index bef3b4887875..4541d301bd23 100644 --- a/src/libs/SearchParser/autocompleteParser.js +++ b/src/libs/SearchParser/autocompleteParser.js @@ -219,77 +219,79 @@ function peg$parse(input, options) { var peg$c33 = "withdrawal-type"; var peg$c34 = "withdrawalStatus"; var peg$c35 = "withdrawal-status"; - var peg$c36 = "withdrawalid"; - var peg$c37 = "withdrawal-id"; - var peg$c38 = "billable"; - var peg$c39 = "reimbursable"; - var peg$c40 = "type"; - var peg$c41 = "status"; - var peg$c42 = "sortBy"; - var peg$c43 = "sort-by"; - var peg$c44 = "sortOrder"; - var peg$c45 = "sort-order"; - var peg$c46 = "policyID"; - var peg$c47 = "workspace"; - var peg$c48 = "submitted"; - var peg$c49 = "approved"; - var peg$c50 = "paid"; - var peg$c51 = "exported"; - var peg$c52 = "posted"; - var peg$c53 = "withdrawn"; - var peg$c54 = "groupby"; - var peg$c55 = "group-by"; - var peg$c56 = "limit"; - var peg$c57 = "feed"; - var peg$c58 = "title"; - var peg$c59 = "assignee"; - var peg$c60 = "createdby"; - var peg$c61 = "created-by"; - var peg$c62 = "action"; - var peg$c63 = "total"; - var peg$c64 = "has"; - var peg$c65 = "is"; - var peg$c66 = "purchaseamount"; - var peg$c67 = "purchase-amount"; - var peg$c68 = "purchasecurrency"; - var peg$c69 = "purchase-currency"; - var peg$c70 = "columns"; - var peg$c71 = "view"; - var peg$c72 = "per-diem"; - var peg$c73 = "drafts"; - var peg$c74 = "draft"; - var peg$c75 = "original-amount"; - var peg$c76 = "tax"; - var peg$c77 = "policy-name"; - var peg$c78 = "long-report-id"; - var peg$c79 = "exported-to"; - var peg$c80 = "exportedto"; - var peg$c81 = "exchange-rate"; - var peg$c82 = "reimbursable-total"; - var peg$c83 = "non-reimbursable-total"; - var peg$c84 = "group-from"; - var peg$c85 = "group-expenses"; - var peg$c86 = "group-total"; - var peg$c87 = "group-card"; - var peg$c88 = "group-feed"; - var peg$c89 = "group-bank-account"; - var peg$c90 = "group-withdrawn"; - var peg$c91 = "group-withdrawal-id"; - var peg$c92 = "group-category"; - var peg$c93 = "group-tag"; - var peg$c94 = "group-merchant"; - var peg$c95 = "group-month"; - var peg$c96 = "group-week"; - var peg$c97 = "group-year"; - var peg$c98 = "group-quarter"; - var peg$c99 = "!="; - var peg$c100 = ">="; - var peg$c101 = ">"; - var peg$c102 = "<="; - var peg$c103 = "<"; - var peg$c104 = "\u201C"; - var peg$c105 = "\u201D"; - var peg$c106 = "\""; + var peg$c36 = "paidStatus"; + var peg$c37 = "paid-status"; + var peg$c38 = "withdrawalid"; + var peg$c39 = "withdrawal-id"; + var peg$c40 = "billable"; + var peg$c41 = "reimbursable"; + var peg$c42 = "type"; + var peg$c43 = "status"; + var peg$c44 = "sortBy"; + var peg$c45 = "sort-by"; + var peg$c46 = "sortOrder"; + var peg$c47 = "sort-order"; + var peg$c48 = "policyID"; + var peg$c49 = "workspace"; + var peg$c50 = "submitted"; + var peg$c51 = "approved"; + var peg$c52 = "paid"; + var peg$c53 = "exported"; + var peg$c54 = "posted"; + var peg$c55 = "withdrawn"; + var peg$c56 = "groupby"; + var peg$c57 = "group-by"; + var peg$c58 = "limit"; + var peg$c59 = "feed"; + var peg$c60 = "title"; + var peg$c61 = "assignee"; + var peg$c62 = "createdby"; + var peg$c63 = "created-by"; + var peg$c64 = "action"; + var peg$c65 = "total"; + var peg$c66 = "has"; + var peg$c67 = "is"; + var peg$c68 = "purchaseamount"; + var peg$c69 = "purchase-amount"; + var peg$c70 = "purchasecurrency"; + var peg$c71 = "purchase-currency"; + var peg$c72 = "columns"; + var peg$c73 = "view"; + var peg$c74 = "per-diem"; + var peg$c75 = "drafts"; + var peg$c76 = "draft"; + var peg$c77 = "original-amount"; + var peg$c78 = "tax"; + var peg$c79 = "policy-name"; + var peg$c80 = "long-report-id"; + var peg$c81 = "exported-to"; + var peg$c82 = "exportedto"; + var peg$c83 = "exchange-rate"; + var peg$c84 = "reimbursable-total"; + var peg$c85 = "non-reimbursable-total"; + var peg$c86 = "group-from"; + var peg$c87 = "group-expenses"; + var peg$c88 = "group-total"; + var peg$c89 = "group-card"; + var peg$c90 = "group-feed"; + var peg$c91 = "group-bank-account"; + var peg$c92 = "group-withdrawn"; + var peg$c93 = "group-withdrawal-id"; + var peg$c94 = "group-category"; + var peg$c95 = "group-tag"; + var peg$c96 = "group-merchant"; + var peg$c97 = "group-month"; + var peg$c98 = "group-week"; + var peg$c99 = "group-year"; + var peg$c100 = "group-quarter"; + var peg$c101 = "!="; + var peg$c102 = ">="; + var peg$c103 = ">"; + var peg$c104 = "<="; + var peg$c105 = "<"; + var peg$c106 = "\u201C"; + var peg$c107 = "\u201D"; + var peg$c108 = "\""; var peg$r0 = /^[ \t\r\n\xA0,:=<>!]/; var peg$r1 = /^[:=]/; @@ -344,93 +346,95 @@ function peg$parse(input, options) { var peg$e36 = peg$literalExpectation("withdrawal-type", true); var peg$e37 = peg$literalExpectation("withdrawalStatus", false); var peg$e38 = peg$literalExpectation("withdrawal-status", true); - var peg$e39 = peg$literalExpectation("withdrawalID", true); - var peg$e40 = peg$literalExpectation("withdrawal-id", true); - var peg$e41 = peg$literalExpectation("billable", true); - var peg$e42 = peg$literalExpectation("reimbursable", true); - var peg$e43 = peg$literalExpectation("type", true); - var peg$e44 = peg$literalExpectation("status", true); - var peg$e45 = peg$literalExpectation("sortBy", false); - var peg$e46 = peg$literalExpectation("sort-by", true); - var peg$e47 = peg$literalExpectation("sortOrder", false); - var peg$e48 = peg$literalExpectation("sort-order", true); - var peg$e49 = peg$literalExpectation("policyID", false); - var peg$e50 = peg$literalExpectation("workspace", true); - var peg$e51 = peg$literalExpectation("submitted", true); - var peg$e52 = peg$literalExpectation("approved", true); - var peg$e53 = peg$literalExpectation("paid", true); - var peg$e54 = peg$literalExpectation("exported", true); - var peg$e55 = peg$literalExpectation("posted", true); - var peg$e56 = peg$literalExpectation("withdrawn", true); - var peg$e57 = peg$literalExpectation("groupBy", true); - var peg$e58 = peg$literalExpectation("group-by", true); - var peg$e59 = peg$literalExpectation("limit", true); - var peg$e60 = peg$literalExpectation("feed", true); - var peg$e61 = peg$literalExpectation("title", true); - var peg$e62 = peg$literalExpectation("assignee", true); - var peg$e63 = peg$literalExpectation("createdBy", true); - var peg$e64 = peg$literalExpectation("created-by", true); - var peg$e65 = peg$literalExpectation("action", true); - var peg$e66 = peg$literalExpectation("total", true); - var peg$e67 = peg$literalExpectation("has", true); - var peg$e68 = peg$literalExpectation("is", true); - var peg$e69 = peg$literalExpectation("purchaseAmount", true); - var peg$e70 = peg$literalExpectation("purchase-amount", true); - var peg$e71 = peg$literalExpectation("purchaseCurrency", true); - var peg$e72 = peg$literalExpectation("purchase-currency", true); - var peg$e73 = peg$literalExpectation("columns", true); - var peg$e74 = peg$literalExpectation("view", true); - var peg$e75 = peg$literalExpectation("per-diem", true); - var peg$e76 = peg$literalExpectation("drafts", true); - var peg$e77 = peg$literalExpectation("draft", true); - var peg$e78 = peg$literalExpectation("original-amount", true); - var peg$e79 = peg$literalExpectation("tax", true); - var peg$e80 = peg$literalExpectation("policy-name", true); - var peg$e81 = peg$literalExpectation("long-report-id", true); - var peg$e82 = peg$literalExpectation("exported-to", true); - var peg$e83 = peg$classExpectation([":", "="], false, false); - var peg$e84 = peg$literalExpectation("exportedTo", true); - var peg$e85 = peg$literalExpectation("exchange-rate", true); - var peg$e86 = peg$literalExpectation("reimbursable-total", true); - var peg$e87 = peg$literalExpectation("non-reimbursable-total", true); - var peg$e88 = peg$literalExpectation("group-from", true); - var peg$e89 = peg$literalExpectation("group-expenses", true); - var peg$e90 = peg$literalExpectation("group-total", true); - var peg$e91 = peg$literalExpectation("group-card", true); - var peg$e92 = peg$literalExpectation("group-feed", true); - var peg$e93 = peg$literalExpectation("group-bank-account", true); - var peg$e94 = peg$literalExpectation("group-withdrawn", true); - var peg$e95 = peg$literalExpectation("group-withdrawal-id", true); - var peg$e96 = peg$literalExpectation("group-category", true); - var peg$e97 = peg$literalExpectation("group-tag", true); - var peg$e98 = peg$literalExpectation("group-merchant", true); - var peg$e99 = peg$literalExpectation("group-month", true); - var peg$e100 = peg$literalExpectation("group-week", true); - var peg$e101 = peg$literalExpectation("group-year", true); - var peg$e102 = peg$literalExpectation("group-quarter", true); - var peg$e103 = peg$otherExpectation("operator"); - var peg$e104 = peg$literalExpectation("!=", false); - var peg$e105 = peg$literalExpectation(">=", false); - var peg$e106 = peg$literalExpectation(">", false); - var peg$e107 = peg$literalExpectation("<=", false); - var peg$e108 = peg$literalExpectation("<", false); - var peg$e109 = peg$otherExpectation("word"); - var peg$e110 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false); - var peg$e111 = peg$otherExpectation("whitespace"); - var peg$e112 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false); - var peg$e113 = peg$otherExpectation("quote"); - var peg$e114 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false); - var peg$e115 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false); - var peg$e116 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false); - var peg$e117 = peg$literalExpectation("\u201C", false); - var peg$e118 = peg$literalExpectation("\u201D", false); - var peg$e119 = peg$literalExpectation("\"", false); - var peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false); - var peg$e121 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false); - var peg$e122 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false); - var peg$e123 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false); - var peg$e124 = peg$classExpectation([","], false, false); - var peg$e125 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false); + var peg$e39 = peg$literalExpectation("paidStatus", false); + var peg$e40 = peg$literalExpectation("paid-status", true); + var peg$e41 = peg$literalExpectation("withdrawalID", true); + var peg$e42 = peg$literalExpectation("withdrawal-id", true); + var peg$e43 = peg$literalExpectation("billable", true); + var peg$e44 = peg$literalExpectation("reimbursable", true); + var peg$e45 = peg$literalExpectation("type", true); + var peg$e46 = peg$literalExpectation("status", true); + var peg$e47 = peg$literalExpectation("sortBy", false); + var peg$e48 = peg$literalExpectation("sort-by", true); + var peg$e49 = peg$literalExpectation("sortOrder", false); + var peg$e50 = peg$literalExpectation("sort-order", true); + var peg$e51 = peg$literalExpectation("policyID", false); + var peg$e52 = peg$literalExpectation("workspace", true); + var peg$e53 = peg$literalExpectation("submitted", true); + var peg$e54 = peg$literalExpectation("approved", true); + var peg$e55 = peg$literalExpectation("paid", true); + var peg$e56 = peg$literalExpectation("exported", true); + var peg$e57 = peg$literalExpectation("posted", true); + var peg$e58 = peg$literalExpectation("withdrawn", true); + var peg$e59 = peg$literalExpectation("groupBy", true); + var peg$e60 = peg$literalExpectation("group-by", true); + var peg$e61 = peg$literalExpectation("limit", true); + var peg$e62 = peg$literalExpectation("feed", true); + var peg$e63 = peg$literalExpectation("title", true); + var peg$e64 = peg$literalExpectation("assignee", true); + var peg$e65 = peg$literalExpectation("createdBy", true); + var peg$e66 = peg$literalExpectation("created-by", true); + var peg$e67 = peg$literalExpectation("action", true); + var peg$e68 = peg$literalExpectation("total", true); + var peg$e69 = peg$literalExpectation("has", true); + var peg$e70 = peg$literalExpectation("is", true); + var peg$e71 = peg$literalExpectation("purchaseAmount", true); + var peg$e72 = peg$literalExpectation("purchase-amount", true); + var peg$e73 = peg$literalExpectation("purchaseCurrency", true); + var peg$e74 = peg$literalExpectation("purchase-currency", true); + var peg$e75 = peg$literalExpectation("columns", true); + var peg$e76 = peg$literalExpectation("view", true); + var peg$e77 = peg$literalExpectation("per-diem", true); + var peg$e78 = peg$literalExpectation("drafts", true); + var peg$e79 = peg$literalExpectation("draft", true); + var peg$e80 = peg$literalExpectation("original-amount", true); + var peg$e81 = peg$literalExpectation("tax", true); + var peg$e82 = peg$literalExpectation("policy-name", true); + var peg$e83 = peg$literalExpectation("long-report-id", true); + var peg$e84 = peg$literalExpectation("exported-to", true); + var peg$e85 = peg$classExpectation([":", "="], false, false); + var peg$e86 = peg$literalExpectation("exportedTo", true); + var peg$e87 = peg$literalExpectation("exchange-rate", true); + var peg$e88 = peg$literalExpectation("reimbursable-total", true); + var peg$e89 = peg$literalExpectation("non-reimbursable-total", true); + var peg$e90 = peg$literalExpectation("group-from", true); + var peg$e91 = peg$literalExpectation("group-expenses", true); + var peg$e92 = peg$literalExpectation("group-total", true); + var peg$e93 = peg$literalExpectation("group-card", true); + var peg$e94 = peg$literalExpectation("group-feed", true); + var peg$e95 = peg$literalExpectation("group-bank-account", true); + var peg$e96 = peg$literalExpectation("group-withdrawn", true); + var peg$e97 = peg$literalExpectation("group-withdrawal-id", true); + var peg$e98 = peg$literalExpectation("group-category", true); + var peg$e99 = peg$literalExpectation("group-tag", true); + var peg$e100 = peg$literalExpectation("group-merchant", true); + var peg$e101 = peg$literalExpectation("group-month", true); + var peg$e102 = peg$literalExpectation("group-week", true); + var peg$e103 = peg$literalExpectation("group-year", true); + var peg$e104 = peg$literalExpectation("group-quarter", true); + var peg$e105 = peg$otherExpectation("operator"); + var peg$e106 = peg$literalExpectation("!=", false); + var peg$e107 = peg$literalExpectation(">=", false); + var peg$e108 = peg$literalExpectation(">", false); + var peg$e109 = peg$literalExpectation("<=", false); + var peg$e110 = peg$literalExpectation("<", false); + var peg$e111 = peg$otherExpectation("word"); + var peg$e112 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false); + var peg$e113 = peg$otherExpectation("whitespace"); + var peg$e114 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false); + var peg$e115 = peg$otherExpectation("quote"); + var peg$e116 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false); + var peg$e117 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false); + var peg$e118 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false); + var peg$e119 = peg$literalExpectation("\u201C", false); + var peg$e120 = peg$literalExpectation("\u201D", false); + var peg$e121 = peg$literalExpectation("\"", false); + var peg$e122 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false); + var peg$e123 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false); + var peg$e124 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false); + var peg$e125 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false); + var peg$e126 = peg$classExpectation([","], false, false); + var peg$e127 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false); var peg$f0 = function(ranges) { return { autocomplete, ranges }; }; var peg$f1 = function(filters) { return filters.filter(Boolean).flat(); }; @@ -517,95 +521,96 @@ function peg$parse(input, options) { var peg$f27 = function() { return "receiptType"; }; var peg$f28 = function() { return "withdrawalType"; }; var peg$f29 = function() { return "withdrawalStatus"; }; - var peg$f30 = function() { return "withdrawalID"; }; - var peg$f31 = function() { return "billable"; }; - var peg$f32 = function() { return "reimbursable"; }; - var peg$f33 = function() { return "type"; }; - var peg$f34 = function() { return "status"; }; - var peg$f35 = function() { return "sortBy"; }; - var peg$f36 = function() { return "sortOrder"; }; - var peg$f37 = function() { return "policyID"; }; - var peg$f38 = function() { return "submitted"; }; - var peg$f39 = function() { return "approved"; }; - var peg$f40 = function() { return "paid"; }; - var peg$f41 = function() { return "exported"; }; - var peg$f42 = function() { return "posted"; }; - var peg$f43 = function() { return "withdrawn"; }; - var peg$f44 = function() { return "groupBy"; }; - var peg$f45 = function() { return "limit"; }; - var peg$f46 = function() { return "feed"; }; - var peg$f47 = function() { return "title"; }; - var peg$f48 = function() { return "assignee"; }; - var peg$f49 = function() { return "createdBy"; }; - var peg$f50 = function() { return "action"; }; - var peg$f51 = function() {return "total"; }; - var peg$f52 = function() {return "has"; }; - var peg$f53 = function() {return "is"; }; - var peg$f54 = function() {return "purchaseAmount"}; - var peg$f55 = function() {return "purchaseCurrency"}; - var peg$f56 = function() { + var peg$f30 = function() { return "paidStatus"; }; + var peg$f31 = function() { return "withdrawalID"; }; + var peg$f32 = function() { return "billable"; }; + var peg$f33 = function() { return "reimbursable"; }; + var peg$f34 = function() { return "type"; }; + var peg$f35 = function() { return "status"; }; + var peg$f36 = function() { return "sortBy"; }; + var peg$f37 = function() { return "sortOrder"; }; + var peg$f38 = function() { return "policyID"; }; + var peg$f39 = function() { return "submitted"; }; + var peg$f40 = function() { return "approved"; }; + var peg$f41 = function() { return "paid"; }; + var peg$f42 = function() { return "exported"; }; + var peg$f43 = function() { return "posted"; }; + var peg$f44 = function() { return "withdrawn"; }; + var peg$f45 = function() { return "groupBy"; }; + var peg$f46 = function() { return "limit"; }; + var peg$f47 = function() { return "feed"; }; + var peg$f48 = function() { return "title"; }; + var peg$f49 = function() { return "assignee"; }; + var peg$f50 = function() { return "createdBy"; }; + var peg$f51 = function() { return "action"; }; + var peg$f52 = function() {return "total"; }; + var peg$f53 = function() {return "has"; }; + var peg$f54 = function() {return "is"; }; + var peg$f55 = function() {return "purchaseAmount"}; + var peg$f56 = function() {return "purchaseCurrency"}; + var peg$f57 = function() { isColumnsContext = true; return "columns"; }; - var peg$f57 = function() {return "view"}; - var peg$f58 = function() { return isColumnsContext; }; - var peg$f59 = function() { return "perDiem"; }; - var peg$f60 = function() { return "drafts"; }; - var peg$f61 = function() { return "originalamount"; }; - var peg$f62 = function() { return "taxAmount"; }; - var peg$f63 = function() { return "taxrate"; }; - var peg$f64 = function() { return "policyname"; }; - var peg$f65 = function() { return "withdrawalID"; }; - var peg$f66 = function() { return "bankAccount"; }; - var peg$f67 = function() { return "reportID"; }; - var peg$f68 = function() { return "base62ReportID"; }; - var peg$f69 = function() { return "exportedto"; }; - var peg$f70 = function() { return "exportedTo"; }; + var peg$f58 = function() {return "view"}; + var peg$f59 = function() { return isColumnsContext; }; + var peg$f60 = function() { return "perDiem"; }; + var peg$f61 = function() { return "drafts"; }; + var peg$f62 = function() { return "originalamount"; }; + var peg$f63 = function() { return "taxAmount"; }; + var peg$f64 = function() { return "taxrate"; }; + var peg$f65 = function() { return "policyname"; }; + var peg$f66 = function() { return "withdrawalID"; }; + var peg$f67 = function() { return "bankAccount"; }; + var peg$f68 = function() { return "reportID"; }; + var peg$f69 = function() { return "base62ReportID"; }; + var peg$f70 = function() { return "exportedto"; }; var peg$f71 = function() { return "exportedTo"; }; - var peg$f72 = function() { return "exchangeRate"; }; - var peg$f73 = function() { return "reimbursableTotal"; }; - var peg$f74 = function() { return "nonReimbursableTotal"; }; - var peg$f75 = function() { return "groupFrom"; }; - var peg$f76 = function() { return "groupExpenses"; }; - var peg$f77 = function() { return "groupTotal"; }; - var peg$f78 = function() { return "groupCard"; }; - var peg$f79 = function() { return "groupFeed"; }; - var peg$f80 = function() { return "groupBankAccount"; }; - var peg$f81 = function() { return "groupWithdrawn"; }; - var peg$f82 = function() { return "groupWithdrawalID"; }; - var peg$f83 = function() { return "groupCategory"; }; - var peg$f84 = function() { return "groupTag"; }; - var peg$f85 = function() { return "groupMerchant"; }; - var peg$f86 = function() { return "groupmonth"; }; - var peg$f87 = function() { return "groupweek"; }; - var peg$f88 = function() { return "groupyear"; }; - var peg$f89 = function() { return "groupquarter"; }; - var peg$f90 = function() { return "eq"; }; - var peg$f91 = function() { return "neq"; }; - var peg$f92 = function() { return "gte"; }; - var peg$f93 = function() { return "gt"; }; - var peg$f94 = function() { return "lte"; }; - var peg$f95 = function() { return "lt"; }; - var peg$f96 = function(o) { + var peg$f72 = function() { return "exportedTo"; }; + var peg$f73 = function() { return "exchangeRate"; }; + var peg$f74 = function() { return "reimbursableTotal"; }; + var peg$f75 = function() { return "nonReimbursableTotal"; }; + var peg$f76 = function() { return "groupFrom"; }; + var peg$f77 = function() { return "groupExpenses"; }; + var peg$f78 = function() { return "groupTotal"; }; + var peg$f79 = function() { return "groupCard"; }; + var peg$f80 = function() { return "groupFeed"; }; + var peg$f81 = function() { return "groupBankAccount"; }; + var peg$f82 = function() { return "groupWithdrawn"; }; + var peg$f83 = function() { return "groupWithdrawalID"; }; + var peg$f84 = function() { return "groupCategory"; }; + var peg$f85 = function() { return "groupTag"; }; + var peg$f86 = function() { return "groupMerchant"; }; + var peg$f87 = function() { return "groupmonth"; }; + var peg$f88 = function() { return "groupweek"; }; + var peg$f89 = function() { return "groupyear"; }; + var peg$f90 = function() { return "groupquarter"; }; + var peg$f91 = function() { return "eq"; }; + var peg$f92 = function() { return "neq"; }; + var peg$f93 = function() { return "gte"; }; + var peg$f94 = function() { return "gt"; }; + var peg$f95 = function() { return "lte"; }; + var peg$f96 = function() { return "lt"; }; + var peg$f97 = function(o) { if (nameOperator) { expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found } isColumnsContext = false; return o; }; - var peg$f97 = function(chars) { return chars.join("").trim(); }; - var peg$f98 = function() { + var peg$f98 = function(chars) { return chars.join("").trim(); }; + var peg$f99 = function() { isColumnsContext = false; return "and"; }; - var peg$f99 = function() { return expectingNestedQuote; }; - var peg$f100 = function(start, inner, end) { //handle no-breaking space + var peg$f100 = function() { return expectingNestedQuote; }; + var peg$f101 = function(start, inner, end) { //handle no-breaking space return [...start, '"', ...inner, '"', ...end].join(""); }; - var peg$f101 = function(start) {return "“"}; - var peg$f102 = function(start) {return "”"}; - var peg$f103 = function(start) {return "\""}; - var peg$f104 = function(start, inner, end) { + var peg$f102 = function(start) {return "“"}; + var peg$f103 = function(start) {return "”"}; + var peg$f104 = function(start) {return "\""}; + var peg$f105 = function(start, inner, end) { return [...start, '"', ...inner, '"'].join(""); }; var peg$currPos = options.peg$currPos | 0; @@ -1054,69 +1059,72 @@ function peg$parse(input, options) { if (s1 === peg$FAILED) { s1 = peg$parsewithdrawalStatus(); if (s1 === peg$FAILED) { - s1 = peg$parsetype(); + s1 = peg$parsepaidStatus(); if (s1 === peg$FAILED) { - s1 = peg$parsestatus(); + s1 = peg$parsetype(); if (s1 === peg$FAILED) { - s1 = peg$parsecardID(); + s1 = peg$parsestatus(); if (s1 === peg$FAILED) { - s1 = peg$parsebankAccount(); + s1 = peg$parsecardID(); if (s1 === peg$FAILED) { - s1 = peg$parsefeed(); + s1 = peg$parsebankAccount(); if (s1 === peg$FAILED) { - s1 = peg$parsegroupBy(); + s1 = peg$parsefeed(); if (s1 === peg$FAILED) { - s1 = peg$parseview(); + s1 = peg$parsegroupBy(); if (s1 === peg$FAILED) { - s1 = peg$parsereimbursable(); + s1 = peg$parseview(); if (s1 === peg$FAILED) { - s1 = peg$parsebillable(); + s1 = peg$parsereimbursable(); if (s1 === peg$FAILED) { - s1 = peg$parsepolicyID(); + s1 = peg$parsebillable(); if (s1 === peg$FAILED) { - s1 = peg$parseaction(); + s1 = peg$parsepolicyID(); if (s1 === peg$FAILED) { - s1 = peg$parsedate(); + s1 = peg$parseaction(); if (s1 === peg$FAILED) { - s1 = peg$parsesubmitted(); + s1 = peg$parsedate(); if (s1 === peg$FAILED) { - s1 = peg$parseapproved(); + s1 = peg$parsesubmitted(); if (s1 === peg$FAILED) { - s1 = peg$parsepaid(); + s1 = peg$parseapproved(); if (s1 === peg$FAILED) { - s1 = peg$parseexportedTo(); + s1 = peg$parsepaid(); if (s1 === peg$FAILED) { - s1 = peg$parseexported(); + s1 = peg$parseexportedTo(); if (s1 === peg$FAILED) { - s1 = peg$parsewithdrawn(); + s1 = peg$parseexported(); if (s1 === peg$FAILED) { - s1 = peg$parseposted(); + s1 = peg$parsewithdrawn(); if (s1 === peg$FAILED) { - s1 = peg$parsehas(); + s1 = peg$parseposted(); if (s1 === peg$FAILED) { - s1 = peg$parseis(); + s1 = peg$parsehas(); if (s1 === peg$FAILED) { - s1 = peg$parsepurchaseCurrency(); + s1 = peg$parseis(); if (s1 === peg$FAILED) { - s1 = peg$parsepurchaseAmount(); + s1 = peg$parsepurchaseCurrency(); if (s1 === peg$FAILED) { - s1 = peg$parseamount(); + s1 = peg$parsepurchaseAmount(); if (s1 === peg$FAILED) { - s1 = peg$parsemerchant(); + s1 = peg$parseamount(); if (s1 === peg$FAILED) { - s1 = peg$parsedescription(); + s1 = peg$parsemerchant(); if (s1 === peg$FAILED) { - s1 = peg$parsereportID(); + s1 = peg$parsedescription(); if (s1 === peg$FAILED) { - s1 = peg$parsewithdrawalID(); + s1 = peg$parsereportID(); if (s1 === peg$FAILED) { - s1 = peg$parsetitle(); + s1 = peg$parsewithdrawalID(); if (s1 === peg$FAILED) { - s1 = peg$parsereportFieldDynamic(); + s1 = peg$parsetitle(); if (s1 === peg$FAILED) { - s1 = peg$parsecolumns(); + s1 = peg$parsereportFieldDynamic(); if (s1 === peg$FAILED) { - s1 = peg$parselimit(); + s1 = peg$parsecolumns(); + if (s1 === peg$FAILED) { + s1 = peg$parselimit(); + } } } } @@ -1798,28 +1806,57 @@ function peg$parse(input, options) { return s0; } + function peg$parsepaidStatus() { + var s0, s1; + + if (input.substr(peg$currPos, 10) === peg$c36) { + s0 = peg$c36; + peg$currPos += 10; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e39); } + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + s1 = input.substr(peg$currPos, 11); + if (s1.toLowerCase() === peg$c37) { + peg$currPos += 11; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e40); } + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f30(); + } + s0 = s1; + } + + return s0; + } + function peg$parsewithdrawalID() { var s0, s1; s0 = input.substr(peg$currPos, 12); - if (s0.toLowerCase() === peg$c36) { + if (s0.toLowerCase() === peg$c38) { peg$currPos += 12; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e39); } + if (peg$silentFails === 0) { peg$fail(peg$e41); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c37) { + if (s1.toLowerCase() === peg$c39) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e40); } + if (peg$silentFails === 0) { peg$fail(peg$e42); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f30(); + s1 = peg$f31(); } s0 = s1; } @@ -1832,15 +1869,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c38) { + if (s1.toLowerCase() === peg$c40) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e41); } + if (peg$silentFails === 0) { peg$fail(peg$e43); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f31(); + s1 = peg$f32(); } s0 = s1; @@ -1852,15 +1889,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 12); - if (s1.toLowerCase() === peg$c39) { + if (s1.toLowerCase() === peg$c41) { peg$currPos += 12; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e42); } + if (peg$silentFails === 0) { peg$fail(peg$e44); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f32(); + s1 = peg$f33(); } s0 = s1; @@ -1872,15 +1909,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c40) { + if (s1.toLowerCase() === peg$c42) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e43); } + if (peg$silentFails === 0) { peg$fail(peg$e45); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f33(); + s1 = peg$f34(); } s0 = s1; @@ -1892,15 +1929,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c41) { + if (s1.toLowerCase() === peg$c43) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e44); } + if (peg$silentFails === 0) { peg$fail(peg$e46); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f34(); + s1 = peg$f35(); } s0 = s1; @@ -1910,25 +1947,25 @@ function peg$parse(input, options) { function peg$parsesortBy() { var s0, s1; - if (input.substr(peg$currPos, 6) === peg$c42) { - s0 = peg$c42; + if (input.substr(peg$currPos, 6) === peg$c44) { + s0 = peg$c44; peg$currPos += 6; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } + if (peg$silentFails === 0) { peg$fail(peg$e47); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 7); - if (s1.toLowerCase() === peg$c43) { + if (s1.toLowerCase() === peg$c45) { peg$currPos += 7; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e46); } + if (peg$silentFails === 0) { peg$fail(peg$e48); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f35(); + s1 = peg$f36(); } s0 = s1; } @@ -1939,25 +1976,25 @@ function peg$parse(input, options) { function peg$parsesortOrder() { var s0, s1; - if (input.substr(peg$currPos, 9) === peg$c44) { - s0 = peg$c44; + if (input.substr(peg$currPos, 9) === peg$c46) { + s0 = peg$c46; peg$currPos += 9; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e47); } + if (peg$silentFails === 0) { peg$fail(peg$e49); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c45) { + if (s1.toLowerCase() === peg$c47) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e48); } + if (peg$silentFails === 0) { peg$fail(peg$e50); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f36(); + s1 = peg$f37(); } s0 = s1; } @@ -1968,25 +2005,25 @@ function peg$parse(input, options) { function peg$parsepolicyID() { var s0, s1; - if (input.substr(peg$currPos, 8) === peg$c46) { - s0 = peg$c46; + if (input.substr(peg$currPos, 8) === peg$c48) { + s0 = peg$c48; peg$currPos += 8; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e49); } + if (peg$silentFails === 0) { peg$fail(peg$e51); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c47) { + if (s1.toLowerCase() === peg$c49) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e50); } + if (peg$silentFails === 0) { peg$fail(peg$e52); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f37(); + s1 = peg$f38(); } s0 = s1; } @@ -1999,15 +2036,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c48) { + if (s1.toLowerCase() === peg$c50) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e51); } + if (peg$silentFails === 0) { peg$fail(peg$e53); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f38(); + s1 = peg$f39(); } s0 = s1; @@ -2019,15 +2056,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c49) { + if (s1.toLowerCase() === peg$c51) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e52); } + if (peg$silentFails === 0) { peg$fail(peg$e54); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f39(); + s1 = peg$f40(); } s0 = s1; @@ -2039,15 +2076,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c50) { + if (s1.toLowerCase() === peg$c52) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e53); } + if (peg$silentFails === 0) { peg$fail(peg$e55); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f40(); + s1 = peg$f41(); } s0 = s1; @@ -2059,15 +2096,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c51) { + if (s1.toLowerCase() === peg$c53) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e54); } + if (peg$silentFails === 0) { peg$fail(peg$e56); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f41(); + s1 = peg$f42(); } s0 = s1; @@ -2079,15 +2116,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c52) { + if (s1.toLowerCase() === peg$c54) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e55); } + if (peg$silentFails === 0) { peg$fail(peg$e57); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f42(); + s1 = peg$f43(); } s0 = s1; @@ -2099,15 +2136,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c53) { + if (s1.toLowerCase() === peg$c55) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e56); } + if (peg$silentFails === 0) { peg$fail(peg$e58); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f43(); + s1 = peg$f44(); } s0 = s1; @@ -2118,24 +2155,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 7); - if (s0.toLowerCase() === peg$c54) { + if (s0.toLowerCase() === peg$c56) { peg$currPos += 7; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } + if (peg$silentFails === 0) { peg$fail(peg$e59); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c55) { + if (s1.toLowerCase() === peg$c57) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e58); } + if (peg$silentFails === 0) { peg$fail(peg$e60); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f44(); + s1 = peg$f45(); } s0 = s1; } @@ -2148,15 +2185,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c56) { + if (s1.toLowerCase() === peg$c58) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e59); } + if (peg$silentFails === 0) { peg$fail(peg$e61); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f45(); + s1 = peg$f46(); } s0 = s1; @@ -2168,15 +2205,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c57) { + if (s1.toLowerCase() === peg$c59) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e60); } + if (peg$silentFails === 0) { peg$fail(peg$e62); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f46(); + s1 = peg$f47(); } s0 = s1; @@ -2188,15 +2225,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c58) { + if (s1.toLowerCase() === peg$c60) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e61); } + if (peg$silentFails === 0) { peg$fail(peg$e63); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f47(); + s1 = peg$f48(); } s0 = s1; @@ -2208,15 +2245,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c59) { + if (s1.toLowerCase() === peg$c61) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e62); } + if (peg$silentFails === 0) { peg$fail(peg$e64); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f48(); + s1 = peg$f49(); } s0 = s1; @@ -2227,24 +2264,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 9); - if (s0.toLowerCase() === peg$c60) { + if (s0.toLowerCase() === peg$c62) { peg$currPos += 9; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e63); } + if (peg$silentFails === 0) { peg$fail(peg$e65); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c61) { + if (s1.toLowerCase() === peg$c63) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e64); } + if (peg$silentFails === 0) { peg$fail(peg$e66); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f49(); + s1 = peg$f50(); } s0 = s1; } @@ -2257,15 +2294,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c62) { + if (s1.toLowerCase() === peg$c64) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e65); } + if (peg$silentFails === 0) { peg$fail(peg$e67); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f50(); + s1 = peg$f51(); } s0 = s1; @@ -2277,15 +2314,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c63) { + if (s1.toLowerCase() === peg$c65) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e66); } + if (peg$silentFails === 0) { peg$fail(peg$e68); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f51(); + s1 = peg$f52(); } s0 = s1; @@ -2297,15 +2334,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 3); - if (s1.toLowerCase() === peg$c64) { + if (s1.toLowerCase() === peg$c66) { peg$currPos += 3; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e67); } + if (peg$silentFails === 0) { peg$fail(peg$e69); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f52(); + s1 = peg$f53(); } s0 = s1; @@ -2317,15 +2354,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 2); - if (s1.toLowerCase() === peg$c65) { + if (s1.toLowerCase() === peg$c67) { peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e68); } + if (peg$silentFails === 0) { peg$fail(peg$e70); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f53(); + s1 = peg$f54(); } s0 = s1; @@ -2336,24 +2373,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 14); - if (s0.toLowerCase() === peg$c66) { + if (s0.toLowerCase() === peg$c68) { peg$currPos += 14; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e69); } + if (peg$silentFails === 0) { peg$fail(peg$e71); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c67) { + if (s1.toLowerCase() === peg$c69) { peg$currPos += 15; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e70); } + if (peg$silentFails === 0) { peg$fail(peg$e72); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f54(); + s1 = peg$f55(); } s0 = s1; } @@ -2365,24 +2402,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 16); - if (s0.toLowerCase() === peg$c68) { + if (s0.toLowerCase() === peg$c70) { peg$currPos += 16; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e71); } + if (peg$silentFails === 0) { peg$fail(peg$e73); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 17); - if (s1.toLowerCase() === peg$c69) { + if (s1.toLowerCase() === peg$c71) { peg$currPos += 17; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e72); } + if (peg$silentFails === 0) { peg$fail(peg$e74); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f55(); + s1 = peg$f56(); } s0 = s1; } @@ -2395,15 +2432,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 7); - if (s1.toLowerCase() === peg$c70) { + if (s1.toLowerCase() === peg$c72) { peg$currPos += 7; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e73); } + if (peg$silentFails === 0) { peg$fail(peg$e75); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f56(); + s1 = peg$f57(); } s0 = s1; @@ -2415,15 +2452,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c71) { + if (s1.toLowerCase() === peg$c73) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e74); } + if (peg$silentFails === 0) { peg$fail(peg$e76); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f57(); + s1 = peg$f58(); } s0 = s1; @@ -2435,7 +2472,7 @@ function peg$parse(input, options) { s0 = peg$currPos; peg$savedPos = peg$currPos; - s1 = peg$f58(); + s1 = peg$f59(); if (s1) { s1 = undefined; } else { @@ -2555,11 +2592,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c72) { + if (s1.toLowerCase() === peg$c74) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e75); } + if (peg$silentFails === 0) { peg$fail(peg$e77); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -2574,7 +2611,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f59(); + s0 = peg$f60(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2592,19 +2629,19 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c73) { + if (s1.toLowerCase() === peg$c75) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e76); } + if (peg$silentFails === 0) { peg$fail(peg$e78); } } if (s1 === peg$FAILED) { s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c74) { + if (s1.toLowerCase() === peg$c76) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e77); } + if (peg$silentFails === 0) { peg$fail(peg$e79); } } } if (s1 !== peg$FAILED) { @@ -2620,7 +2657,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f60(); + s0 = peg$f61(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2638,11 +2675,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c75) { + if (s1.toLowerCase() === peg$c77) { peg$currPos += 15; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e78); } + if (peg$silentFails === 0) { peg$fail(peg$e80); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -2657,7 +2694,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f61(); + s0 = peg$f62(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2675,11 +2712,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 3); - if (s1.toLowerCase() === peg$c76) { + if (s1.toLowerCase() === peg$c78) { peg$currPos += 3; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e79); } + if (peg$silentFails === 0) { peg$fail(peg$e81); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -2694,7 +2731,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f62(); + s0 = peg$f63(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2731,7 +2768,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f63(); + s0 = peg$f64(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2749,11 +2786,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c77) { + if (s1.toLowerCase() === peg$c79) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e80); } + if (peg$silentFails === 0) { peg$fail(peg$e82); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -2768,7 +2805,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f64(); + s0 = peg$f65(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2786,11 +2823,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c37) { + if (s1.toLowerCase() === peg$c39) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e40); } + if (peg$silentFails === 0) { peg$fail(peg$e42); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -2805,7 +2842,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f65(); + s0 = peg$f66(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2842,7 +2879,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f66(); + s0 = peg$f67(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2860,11 +2897,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c78) { + if (s1.toLowerCase() === peg$c80) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e81); } + if (peg$silentFails === 0) { peg$fail(peg$e83); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -2879,7 +2916,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f67(); + s0 = peg$f68(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2916,7 +2953,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f68(); + s0 = peg$f69(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2934,11 +2971,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c79) { + if (s1.toLowerCase() === peg$c81) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e82); } + if (peg$silentFails === 0) { peg$fail(peg$e84); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -2953,7 +2990,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f69(); + s0 = peg$f70(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2978,7 +3015,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e83); } + if (peg$silentFails === 0) { peg$fail(peg$e85); } } if (s2 !== peg$FAILED) { s1 = [s1, s2]; @@ -2997,11 +3034,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c80) { + if (s1.toLowerCase() === peg$c82) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e84); } + if (peg$silentFails === 0) { peg$fail(peg$e86); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3016,7 +3053,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f70(); + s0 = peg$f71(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3028,11 +3065,11 @@ function peg$parse(input, options) { if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c79) { + if (s1.toLowerCase() === peg$c81) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e82); } + if (peg$silentFails === 0) { peg$fail(peg$e84); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3047,7 +3084,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f71(); + s0 = peg$f72(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3066,11 +3103,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c81) { + if (s1.toLowerCase() === peg$c83) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e85); } + if (peg$silentFails === 0) { peg$fail(peg$e87); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3085,7 +3122,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f72(); + s0 = peg$f73(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3103,11 +3140,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c82) { + if (s1.toLowerCase() === peg$c84) { peg$currPos += 18; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e86); } + if (peg$silentFails === 0) { peg$fail(peg$e88); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3122,7 +3159,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f73(); + s0 = peg$f74(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3140,11 +3177,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 22); - if (s1.toLowerCase() === peg$c83) { + if (s1.toLowerCase() === peg$c85) { peg$currPos += 22; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e87); } + if (peg$silentFails === 0) { peg$fail(peg$e89); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3159,7 +3196,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f74(); + s0 = peg$f75(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3177,11 +3214,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c84) { + if (s1.toLowerCase() === peg$c86) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e88); } + if (peg$silentFails === 0) { peg$fail(peg$e90); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3196,7 +3233,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f75(); + s0 = peg$f76(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3214,11 +3251,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c85) { + if (s1.toLowerCase() === peg$c87) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e89); } + if (peg$silentFails === 0) { peg$fail(peg$e91); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3233,7 +3270,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f76(); + s0 = peg$f77(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3251,11 +3288,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c86) { + if (s1.toLowerCase() === peg$c88) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e90); } + if (peg$silentFails === 0) { peg$fail(peg$e92); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3270,7 +3307,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f77(); + s0 = peg$f78(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3288,11 +3325,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c87) { + if (s1.toLowerCase() === peg$c89) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e91); } + if (peg$silentFails === 0) { peg$fail(peg$e93); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3307,7 +3344,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f78(); + s0 = peg$f79(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3325,11 +3362,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c88) { + if (s1.toLowerCase() === peg$c90) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e92); } + if (peg$silentFails === 0) { peg$fail(peg$e94); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3344,7 +3381,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f79(); + s0 = peg$f80(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3362,11 +3399,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c89) { + if (s1.toLowerCase() === peg$c91) { peg$currPos += 18; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e93); } + if (peg$silentFails === 0) { peg$fail(peg$e95); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3381,7 +3418,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f80(); + s0 = peg$f81(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3399,11 +3436,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c90) { + if (s1.toLowerCase() === peg$c92) { peg$currPos += 15; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e94); } + if (peg$silentFails === 0) { peg$fail(peg$e96); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3418,7 +3455,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f81(); + s0 = peg$f82(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3436,11 +3473,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 19); - if (s1.toLowerCase() === peg$c91) { + if (s1.toLowerCase() === peg$c93) { peg$currPos += 19; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e95); } + if (peg$silentFails === 0) { peg$fail(peg$e97); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3455,7 +3492,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f82(); + s0 = peg$f83(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3473,11 +3510,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c92) { + if (s1.toLowerCase() === peg$c94) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e96); } + if (peg$silentFails === 0) { peg$fail(peg$e98); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3492,7 +3529,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f83(); + s0 = peg$f84(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3510,11 +3547,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c93) { + if (s1.toLowerCase() === peg$c95) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e97); } + if (peg$silentFails === 0) { peg$fail(peg$e99); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3529,7 +3566,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f84(); + s0 = peg$f85(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3547,11 +3584,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c94) { + if (s1.toLowerCase() === peg$c96) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e98); } + if (peg$silentFails === 0) { peg$fail(peg$e100); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3566,7 +3603,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f85(); + s0 = peg$f86(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3584,11 +3621,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c95) { + if (s1.toLowerCase() === peg$c97) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e99); } + if (peg$silentFails === 0) { peg$fail(peg$e101); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3603,7 +3640,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f86(); + s0 = peg$f87(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3621,11 +3658,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c96) { + if (s1.toLowerCase() === peg$c98) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e100); } + if (peg$silentFails === 0) { peg$fail(peg$e102); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3640,7 +3677,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f87(); + s0 = peg$f88(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3658,11 +3695,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c97) { + if (s1.toLowerCase() === peg$c99) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e101); } + if (peg$silentFails === 0) { peg$fail(peg$e103); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3677,7 +3714,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f88(); + s0 = peg$f89(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3695,11 +3732,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c98) { + if (s1.toLowerCase() === peg$c100) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e102); } + if (peg$silentFails === 0) { peg$fail(peg$e104); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3714,7 +3751,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f89(); + s0 = peg$f90(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3737,81 +3774,81 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e83); } + if (peg$silentFails === 0) { peg$fail(peg$e85); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f90(); + s1 = peg$f91(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c99) { - s1 = peg$c99; + if (input.substr(peg$currPos, 2) === peg$c101) { + s1 = peg$c101; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e104); } + if (peg$silentFails === 0) { peg$fail(peg$e106); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f91(); + s1 = peg$f92(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c100) { - s1 = peg$c100; + if (input.substr(peg$currPos, 2) === peg$c102) { + s1 = peg$c102; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e105); } + if (peg$silentFails === 0) { peg$fail(peg$e107); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f92(); + s1 = peg$f93(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 62) { - s1 = peg$c101; + s1 = peg$c103; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e106); } + if (peg$silentFails === 0) { peg$fail(peg$e108); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f93(); + s1 = peg$f94(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c102) { - s1 = peg$c102; + if (input.substr(peg$currPos, 2) === peg$c104) { + s1 = peg$c104; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e107); } + if (peg$silentFails === 0) { peg$fail(peg$e109); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f94(); + s1 = peg$f95(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 60) { - s1 = peg$c103; + s1 = peg$c105; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e108); } + if (peg$silentFails === 0) { peg$fail(peg$e110); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f95(); + s1 = peg$f96(); } s0 = s1; } @@ -3822,7 +3859,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e103); } + if (peg$silentFails === 0) { peg$fail(peg$e105); } } return s0; @@ -3835,7 +3872,7 @@ function peg$parse(input, options) { s1 = peg$parseoperator(); if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f96(s1); + s1 = peg$f97(s1); } s0 = s1; @@ -3853,7 +3890,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e110); } + if (peg$silentFails === 0) { peg$fail(peg$e112); } } if (s2 !== peg$FAILED) { while (s2 !== peg$FAILED) { @@ -3863,7 +3900,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e110); } + if (peg$silentFails === 0) { peg$fail(peg$e112); } } } } else { @@ -3871,13 +3908,13 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f97(s1); + s1 = peg$f98(s1); } s0 = s1; peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e109); } + if (peg$silentFails === 0) { peg$fail(peg$e111); } } return s0; @@ -3889,7 +3926,7 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = peg$parse_(); peg$savedPos = s0; - s1 = peg$f98(); + s1 = peg$f99(); s0 = s1; return s0; @@ -3905,7 +3942,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e112); } + if (peg$silentFails === 0) { peg$fail(peg$e114); } } while (s1 !== peg$FAILED) { s0.push(s1); @@ -3914,12 +3951,12 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e112); } + if (peg$silentFails === 0) { peg$fail(peg$e114); } } } peg$silentFails--; s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e111); } + if (peg$silentFails === 0) { peg$fail(peg$e113); } return s0; } @@ -3929,7 +3966,7 @@ function peg$parse(input, options) { s0 = peg$currPos; peg$savedPos = peg$currPos; - s1 = peg$f99(); + s1 = peg$f100(); if (s1) { s1 = undefined; } else { @@ -3966,7 +4003,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e114); } + if (peg$silentFails === 0) { peg$fail(peg$e116); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -3975,7 +4012,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e114); } + if (peg$silentFails === 0) { peg$fail(peg$e116); } } } s2 = input.charAt(peg$currPos); @@ -3983,7 +4020,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e115); } + if (peg$silentFails === 0) { peg$fail(peg$e117); } } if (s2 !== peg$FAILED) { s3 = []; @@ -3992,7 +4029,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e116); } + if (peg$silentFails === 0) { peg$fail(peg$e118); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -4001,7 +4038,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e116); } + if (peg$silentFails === 0) { peg$fail(peg$e118); } } } s4 = input.charAt(peg$currPos); @@ -4009,7 +4046,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e115); } + if (peg$silentFails === 0) { peg$fail(peg$e117); } } if (s4 !== peg$FAILED) { s5 = []; @@ -4018,7 +4055,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e110); } + if (peg$silentFails === 0) { peg$fail(peg$e112); } } while (s6 !== peg$FAILED) { s5.push(s6); @@ -4027,11 +4064,11 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e110); } + if (peg$silentFails === 0) { peg$fail(peg$e112); } } } peg$savedPos = s0; - s0 = peg$f100(s1, s3, s5); + s0 = peg$f101(s1, s3, s5); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4043,7 +4080,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e113); } + if (peg$silentFails === 0) { peg$fail(peg$e115); } } return s0; @@ -4060,7 +4097,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e114); } + if (peg$silentFails === 0) { peg$fail(peg$e116); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -4069,7 +4106,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e114); } + if (peg$silentFails === 0) { peg$fail(peg$e116); } } } s2 = input.charAt(peg$currPos); @@ -4077,7 +4114,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e115); } + if (peg$silentFails === 0) { peg$fail(peg$e117); } } if (s2 !== peg$FAILED) { s3 = []; @@ -4086,7 +4123,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e116); } + if (peg$silentFails === 0) { peg$fail(peg$e118); } } if (s4 === peg$FAILED) { s4 = peg$currPos; @@ -4102,15 +4139,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8220) { - s6 = peg$c104; + s6 = peg$c106; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e117); } + if (peg$silentFails === 0) { peg$fail(peg$e119); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f101(s1); + s4 = peg$f102(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4133,15 +4170,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8221) { - s6 = peg$c105; + s6 = peg$c107; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e118); } + if (peg$silentFails === 0) { peg$fail(peg$e120); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f102(s1); + s4 = peg$f103(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4164,15 +4201,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s6 = peg$c106; + s6 = peg$c108; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e119); } + if (peg$silentFails === 0) { peg$fail(peg$e121); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f103(s1); + s4 = peg$f104(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4191,7 +4228,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e116); } + if (peg$silentFails === 0) { peg$fail(peg$e118); } } if (s4 === peg$FAILED) { s4 = peg$currPos; @@ -4207,15 +4244,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8220) { - s6 = peg$c104; + s6 = peg$c106; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e117); } + if (peg$silentFails === 0) { peg$fail(peg$e119); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f101(s1); + s4 = peg$f102(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4238,15 +4275,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8221) { - s6 = peg$c105; + s6 = peg$c107; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e118); } + if (peg$silentFails === 0) { peg$fail(peg$e120); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f102(s1); + s4 = peg$f103(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4269,15 +4306,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s6 = peg$c106; + s6 = peg$c108; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e119); } + if (peg$silentFails === 0) { peg$fail(peg$e121); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f103(s1); + s4 = peg$f104(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4293,7 +4330,7 @@ function peg$parse(input, options) { s4 = peg$parseclosingQuote(); if (s4 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f104(s1, s3, s4); + s0 = peg$f105(s1, s3, s4); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4305,7 +4342,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e113); } + if (peg$silentFails === 0) { peg$fail(peg$e115); } } return s0; @@ -4320,7 +4357,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e115); } + if (peg$silentFails === 0) { peg$fail(peg$e117); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4358,7 +4395,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e120); } + if (peg$silentFails === 0) { peg$fail(peg$e122); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -4367,7 +4404,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e120); } + if (peg$silentFails === 0) { peg$fail(peg$e122); } } } s2 = []; @@ -4376,7 +4413,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e121); } + if (peg$silentFails === 0) { peg$fail(peg$e123); } } while (s3 !== peg$FAILED) { s2.push(s3); @@ -4385,7 +4422,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e121); } + if (peg$silentFails === 0) { peg$fail(peg$e123); } } } s3 = []; @@ -4394,7 +4431,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e122); } + if (peg$silentFails === 0) { peg$fail(peg$e124); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -4403,7 +4440,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e122); } + if (peg$silentFails === 0) { peg$fail(peg$e124); } } } s4 = peg$parseoperator(); @@ -4422,7 +4459,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e123); } + if (peg$silentFails === 0) { peg$fail(peg$e125); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -4431,7 +4468,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e123); } + if (peg$silentFails === 0) { peg$fail(peg$e125); } } } s2 = peg$currPos; @@ -4478,7 +4515,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e124); } + if (peg$silentFails === 0) { peg$fail(peg$e126); } } } } @@ -4494,7 +4531,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e125); } + if (peg$silentFails === 0) { peg$fail(peg$e127); } } if (s0 === peg$FAILED) { s0 = peg$currPos; diff --git a/src/libs/SearchParser/autocompleteParser.peggy b/src/libs/SearchParser/autocompleteParser.peggy index d7d8ea805784..9efaadf55527 100644 --- a/src/libs/SearchParser/autocompleteParser.peggy +++ b/src/libs/SearchParser/autocompleteParser.peggy @@ -93,6 +93,7 @@ autocompleteKey "key" / receiptType / withdrawalType / withdrawalStatus + / paidStatus / type / status / cardID diff --git a/src/libs/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy index 7b07bd74584e..b6ca372d6aa8 100644 --- a/src/libs/SearchParser/baseRules.peggy +++ b/src/libs/SearchParser/baseRules.peggy @@ -55,6 +55,9 @@ withdrawalType withdrawalStatus = "withdrawalStatus" / "withdrawal-status"i { return "withdrawalStatus"; } +paidStatus + = "paidStatus" + / "paid-status"i { return "paidStatus"; } withdrawalID = "withdrawalID"i / "withdrawal-id"i { return "withdrawalID"; } diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js index 68e284cb64e2..c67cbbb46533 100644 --- a/src/libs/SearchParser/searchParser.js +++ b/src/libs/SearchParser/searchParser.js @@ -220,77 +220,79 @@ function peg$parse(input, options) { var peg$c33 = "withdrawal-type"; var peg$c34 = "withdrawalStatus"; var peg$c35 = "withdrawal-status"; - var peg$c36 = "withdrawalid"; - var peg$c37 = "withdrawal-id"; - var peg$c38 = "billable"; - var peg$c39 = "reimbursable"; - var peg$c40 = "type"; - var peg$c41 = "status"; - var peg$c42 = "sortBy"; - var peg$c43 = "sort-by"; - var peg$c44 = "sortOrder"; - var peg$c45 = "sort-order"; - var peg$c46 = "policyID"; - var peg$c47 = "workspace"; - var peg$c48 = "submitted"; - var peg$c49 = "approved"; - var peg$c50 = "paid"; - var peg$c51 = "exported"; - var peg$c52 = "posted"; - var peg$c53 = "withdrawn"; - var peg$c54 = "groupby"; - var peg$c55 = "group-by"; - var peg$c56 = "limit"; - var peg$c57 = "feed"; - var peg$c58 = "title"; - var peg$c59 = "assignee"; - var peg$c60 = "createdby"; - var peg$c61 = "created-by"; - var peg$c62 = "action"; - var peg$c63 = "total"; - var peg$c64 = "has"; - var peg$c65 = "is"; - var peg$c66 = "purchaseamount"; - var peg$c67 = "purchase-amount"; - var peg$c68 = "purchasecurrency"; - var peg$c69 = "purchase-currency"; - var peg$c70 = "columns"; - var peg$c71 = "view"; - var peg$c72 = "per-diem"; - var peg$c73 = "drafts"; - var peg$c74 = "draft"; - var peg$c75 = "original-amount"; - var peg$c76 = "tax"; - var peg$c77 = "policy-name"; - var peg$c78 = "long-report-id"; - var peg$c79 = "exported-to"; - var peg$c80 = "exportedto"; - var peg$c81 = "exchange-rate"; - var peg$c82 = "reimbursable-total"; - var peg$c83 = "non-reimbursable-total"; - var peg$c84 = "group-from"; - var peg$c85 = "group-expenses"; - var peg$c86 = "group-total"; - var peg$c87 = "group-card"; - var peg$c88 = "group-feed"; - var peg$c89 = "group-bank-account"; - var peg$c90 = "group-withdrawn"; - var peg$c91 = "group-withdrawal-id"; - var peg$c92 = "group-category"; - var peg$c93 = "group-tag"; - var peg$c94 = "group-merchant"; - var peg$c95 = "group-month"; - var peg$c96 = "group-week"; - var peg$c97 = "group-year"; - var peg$c98 = "group-quarter"; - var peg$c99 = "!="; - var peg$c100 = ">="; - var peg$c101 = ">"; - var peg$c102 = "<="; - var peg$c103 = "<"; - var peg$c104 = "\u201C"; - var peg$c105 = "\u201D"; - var peg$c106 = "\""; + var peg$c36 = "paidStatus"; + var peg$c37 = "paid-status"; + var peg$c38 = "withdrawalid"; + var peg$c39 = "withdrawal-id"; + var peg$c40 = "billable"; + var peg$c41 = "reimbursable"; + var peg$c42 = "type"; + var peg$c43 = "status"; + var peg$c44 = "sortBy"; + var peg$c45 = "sort-by"; + var peg$c46 = "sortOrder"; + var peg$c47 = "sort-order"; + var peg$c48 = "policyID"; + var peg$c49 = "workspace"; + var peg$c50 = "submitted"; + var peg$c51 = "approved"; + var peg$c52 = "paid"; + var peg$c53 = "exported"; + var peg$c54 = "posted"; + var peg$c55 = "withdrawn"; + var peg$c56 = "groupby"; + var peg$c57 = "group-by"; + var peg$c58 = "limit"; + var peg$c59 = "feed"; + var peg$c60 = "title"; + var peg$c61 = "assignee"; + var peg$c62 = "createdby"; + var peg$c63 = "created-by"; + var peg$c64 = "action"; + var peg$c65 = "total"; + var peg$c66 = "has"; + var peg$c67 = "is"; + var peg$c68 = "purchaseamount"; + var peg$c69 = "purchase-amount"; + var peg$c70 = "purchasecurrency"; + var peg$c71 = "purchase-currency"; + var peg$c72 = "columns"; + var peg$c73 = "view"; + var peg$c74 = "per-diem"; + var peg$c75 = "drafts"; + var peg$c76 = "draft"; + var peg$c77 = "original-amount"; + var peg$c78 = "tax"; + var peg$c79 = "policy-name"; + var peg$c80 = "long-report-id"; + var peg$c81 = "exported-to"; + var peg$c82 = "exportedto"; + var peg$c83 = "exchange-rate"; + var peg$c84 = "reimbursable-total"; + var peg$c85 = "non-reimbursable-total"; + var peg$c86 = "group-from"; + var peg$c87 = "group-expenses"; + var peg$c88 = "group-total"; + var peg$c89 = "group-card"; + var peg$c90 = "group-feed"; + var peg$c91 = "group-bank-account"; + var peg$c92 = "group-withdrawn"; + var peg$c93 = "group-withdrawal-id"; + var peg$c94 = "group-category"; + var peg$c95 = "group-tag"; + var peg$c96 = "group-merchant"; + var peg$c97 = "group-month"; + var peg$c98 = "group-week"; + var peg$c99 = "group-year"; + var peg$c100 = "group-quarter"; + var peg$c101 = "!="; + var peg$c102 = ">="; + var peg$c103 = ">"; + var peg$c104 = "<="; + var peg$c105 = "<"; + var peg$c106 = "\u201C"; + var peg$c107 = "\u201D"; + var peg$c108 = "\""; var peg$r0 = /^[^ \t\r\n\xA0]/; var peg$r1 = /^[ \t\r\n\xA0,:=<>!]/; @@ -348,93 +350,95 @@ function peg$parse(input, options) { var peg$e38 = peg$literalExpectation("withdrawal-type", true); var peg$e39 = peg$literalExpectation("withdrawalStatus", false); var peg$e40 = peg$literalExpectation("withdrawal-status", true); - var peg$e41 = peg$literalExpectation("withdrawalID", true); - var peg$e42 = peg$literalExpectation("withdrawal-id", true); - var peg$e43 = peg$literalExpectation("billable", true); - var peg$e44 = peg$literalExpectation("reimbursable", true); - var peg$e45 = peg$literalExpectation("type", true); - var peg$e46 = peg$literalExpectation("status", true); - var peg$e47 = peg$literalExpectation("sortBy", false); - var peg$e48 = peg$literalExpectation("sort-by", true); - var peg$e49 = peg$literalExpectation("sortOrder", false); - var peg$e50 = peg$literalExpectation("sort-order", true); - var peg$e51 = peg$literalExpectation("policyID", false); - var peg$e52 = peg$literalExpectation("workspace", true); - var peg$e53 = peg$literalExpectation("submitted", true); - var peg$e54 = peg$literalExpectation("approved", true); - var peg$e55 = peg$literalExpectation("paid", true); - var peg$e56 = peg$literalExpectation("exported", true); - var peg$e57 = peg$literalExpectation("posted", true); - var peg$e58 = peg$literalExpectation("withdrawn", true); - var peg$e59 = peg$literalExpectation("groupBy", true); - var peg$e60 = peg$literalExpectation("group-by", true); - var peg$e61 = peg$literalExpectation("limit", true); - var peg$e62 = peg$literalExpectation("feed", true); - var peg$e63 = peg$literalExpectation("title", true); - var peg$e64 = peg$literalExpectation("assignee", true); - var peg$e65 = peg$literalExpectation("createdBy", true); - var peg$e66 = peg$literalExpectation("created-by", true); - var peg$e67 = peg$literalExpectation("action", true); - var peg$e68 = peg$literalExpectation("total", true); - var peg$e69 = peg$literalExpectation("has", true); - var peg$e70 = peg$literalExpectation("is", true); - var peg$e71 = peg$literalExpectation("purchaseAmount", true); - var peg$e72 = peg$literalExpectation("purchase-amount", true); - var peg$e73 = peg$literalExpectation("purchaseCurrency", true); - var peg$e74 = peg$literalExpectation("purchase-currency", true); - var peg$e75 = peg$literalExpectation("columns", true); - var peg$e76 = peg$literalExpectation("view", true); - var peg$e77 = peg$literalExpectation("per-diem", true); - var peg$e78 = peg$literalExpectation("drafts", true); - var peg$e79 = peg$literalExpectation("draft", true); - var peg$e80 = peg$literalExpectation("original-amount", true); - var peg$e81 = peg$literalExpectation("tax", true); - var peg$e82 = peg$literalExpectation("policy-name", true); - var peg$e83 = peg$literalExpectation("long-report-id", true); - var peg$e84 = peg$literalExpectation("exported-to", true); - var peg$e85 = peg$classExpectation([":", "="], false, false); - var peg$e86 = peg$literalExpectation("exportedTo", true); - var peg$e87 = peg$literalExpectation("exchange-rate", true); - var peg$e88 = peg$literalExpectation("reimbursable-total", true); - var peg$e89 = peg$literalExpectation("non-reimbursable-total", true); - var peg$e90 = peg$literalExpectation("group-from", true); - var peg$e91 = peg$literalExpectation("group-expenses", true); - var peg$e92 = peg$literalExpectation("group-total", true); - var peg$e93 = peg$literalExpectation("group-card", true); - var peg$e94 = peg$literalExpectation("group-feed", true); - var peg$e95 = peg$literalExpectation("group-bank-account", true); - var peg$e96 = peg$literalExpectation("group-withdrawn", true); - var peg$e97 = peg$literalExpectation("group-withdrawal-id", true); - var peg$e98 = peg$literalExpectation("group-category", true); - var peg$e99 = peg$literalExpectation("group-tag", true); - var peg$e100 = peg$literalExpectation("group-merchant", true); - var peg$e101 = peg$literalExpectation("group-month", true); - var peg$e102 = peg$literalExpectation("group-week", true); - var peg$e103 = peg$literalExpectation("group-year", true); - var peg$e104 = peg$literalExpectation("group-quarter", true); - var peg$e105 = peg$otherExpectation("operator"); - var peg$e106 = peg$literalExpectation("!=", false); - var peg$e107 = peg$literalExpectation(">=", false); - var peg$e108 = peg$literalExpectation(">", false); - var peg$e109 = peg$literalExpectation("<=", false); - var peg$e110 = peg$literalExpectation("<", false); - var peg$e111 = peg$otherExpectation("word"); - var peg$e112 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false); - var peg$e113 = peg$otherExpectation("whitespace"); - var peg$e114 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false); - var peg$e115 = peg$otherExpectation("quote"); - var peg$e116 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false); - var peg$e117 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false); - var peg$e118 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false); - var peg$e119 = peg$literalExpectation("\u201C", false); - var peg$e120 = peg$literalExpectation("\u201D", false); - var peg$e121 = peg$literalExpectation("\"", false); - var peg$e122 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false); - var peg$e123 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false); - var peg$e124 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false); - var peg$e125 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false); - var peg$e126 = peg$classExpectation([","], false, false); - var peg$e127 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false); + var peg$e41 = peg$literalExpectation("paidStatus", false); + var peg$e42 = peg$literalExpectation("paid-status", true); + var peg$e43 = peg$literalExpectation("withdrawalID", true); + var peg$e44 = peg$literalExpectation("withdrawal-id", true); + var peg$e45 = peg$literalExpectation("billable", true); + var peg$e46 = peg$literalExpectation("reimbursable", true); + var peg$e47 = peg$literalExpectation("type", true); + var peg$e48 = peg$literalExpectation("status", true); + var peg$e49 = peg$literalExpectation("sortBy", false); + var peg$e50 = peg$literalExpectation("sort-by", true); + var peg$e51 = peg$literalExpectation("sortOrder", false); + var peg$e52 = peg$literalExpectation("sort-order", true); + var peg$e53 = peg$literalExpectation("policyID", false); + var peg$e54 = peg$literalExpectation("workspace", true); + var peg$e55 = peg$literalExpectation("submitted", true); + var peg$e56 = peg$literalExpectation("approved", true); + var peg$e57 = peg$literalExpectation("paid", true); + var peg$e58 = peg$literalExpectation("exported", true); + var peg$e59 = peg$literalExpectation("posted", true); + var peg$e60 = peg$literalExpectation("withdrawn", true); + var peg$e61 = peg$literalExpectation("groupBy", true); + var peg$e62 = peg$literalExpectation("group-by", true); + var peg$e63 = peg$literalExpectation("limit", true); + var peg$e64 = peg$literalExpectation("feed", true); + var peg$e65 = peg$literalExpectation("title", true); + var peg$e66 = peg$literalExpectation("assignee", true); + var peg$e67 = peg$literalExpectation("createdBy", true); + var peg$e68 = peg$literalExpectation("created-by", true); + var peg$e69 = peg$literalExpectation("action", true); + var peg$e70 = peg$literalExpectation("total", true); + var peg$e71 = peg$literalExpectation("has", true); + var peg$e72 = peg$literalExpectation("is", true); + var peg$e73 = peg$literalExpectation("purchaseAmount", true); + var peg$e74 = peg$literalExpectation("purchase-amount", true); + var peg$e75 = peg$literalExpectation("purchaseCurrency", true); + var peg$e76 = peg$literalExpectation("purchase-currency", true); + var peg$e77 = peg$literalExpectation("columns", true); + var peg$e78 = peg$literalExpectation("view", true); + var peg$e79 = peg$literalExpectation("per-diem", true); + var peg$e80 = peg$literalExpectation("drafts", true); + var peg$e81 = peg$literalExpectation("draft", true); + var peg$e82 = peg$literalExpectation("original-amount", true); + var peg$e83 = peg$literalExpectation("tax", true); + var peg$e84 = peg$literalExpectation("policy-name", true); + var peg$e85 = peg$literalExpectation("long-report-id", true); + var peg$e86 = peg$literalExpectation("exported-to", true); + var peg$e87 = peg$classExpectation([":", "="], false, false); + var peg$e88 = peg$literalExpectation("exportedTo", true); + var peg$e89 = peg$literalExpectation("exchange-rate", true); + var peg$e90 = peg$literalExpectation("reimbursable-total", true); + var peg$e91 = peg$literalExpectation("non-reimbursable-total", true); + var peg$e92 = peg$literalExpectation("group-from", true); + var peg$e93 = peg$literalExpectation("group-expenses", true); + var peg$e94 = peg$literalExpectation("group-total", true); + var peg$e95 = peg$literalExpectation("group-card", true); + var peg$e96 = peg$literalExpectation("group-feed", true); + var peg$e97 = peg$literalExpectation("group-bank-account", true); + var peg$e98 = peg$literalExpectation("group-withdrawn", true); + var peg$e99 = peg$literalExpectation("group-withdrawal-id", true); + var peg$e100 = peg$literalExpectation("group-category", true); + var peg$e101 = peg$literalExpectation("group-tag", true); + var peg$e102 = peg$literalExpectation("group-merchant", true); + var peg$e103 = peg$literalExpectation("group-month", true); + var peg$e104 = peg$literalExpectation("group-week", true); + var peg$e105 = peg$literalExpectation("group-year", true); + var peg$e106 = peg$literalExpectation("group-quarter", true); + var peg$e107 = peg$otherExpectation("operator"); + var peg$e108 = peg$literalExpectation("!=", false); + var peg$e109 = peg$literalExpectation(">=", false); + var peg$e110 = peg$literalExpectation(">", false); + var peg$e111 = peg$literalExpectation("<=", false); + var peg$e112 = peg$literalExpectation("<", false); + var peg$e113 = peg$otherExpectation("word"); + var peg$e114 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false); + var peg$e115 = peg$otherExpectation("whitespace"); + var peg$e116 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false); + var peg$e117 = peg$otherExpectation("quote"); + var peg$e118 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false); + var peg$e119 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false); + var peg$e120 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false); + var peg$e121 = peg$literalExpectation("\u201C", false); + var peg$e122 = peg$literalExpectation("\u201D", false); + var peg$e123 = peg$literalExpectation("\"", false); + var peg$e124 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false); + var peg$e125 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false); + var peg$e126 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false); + var peg$e127 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false); + var peg$e128 = peg$classExpectation([","], false, false); + var peg$e129 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false); var peg$f0 = function(filters) { return applyDefaults(filters); }; var peg$f1 = function(head, tail) { @@ -544,95 +548,96 @@ function peg$parse(input, options) { var peg$f28 = function() { return "receiptType"; }; var peg$f29 = function() { return "withdrawalType"; }; var peg$f30 = function() { return "withdrawalStatus"; }; - var peg$f31 = function() { return "withdrawalID"; }; - var peg$f32 = function() { return "billable"; }; - var peg$f33 = function() { return "reimbursable"; }; - var peg$f34 = function() { return "type"; }; - var peg$f35 = function() { return "status"; }; - var peg$f36 = function() { return "sortBy"; }; - var peg$f37 = function() { return "sortOrder"; }; - var peg$f38 = function() { return "policyID"; }; - var peg$f39 = function() { return "submitted"; }; - var peg$f40 = function() { return "approved"; }; - var peg$f41 = function() { return "paid"; }; - var peg$f42 = function() { return "exported"; }; - var peg$f43 = function() { return "posted"; }; - var peg$f44 = function() { return "withdrawn"; }; - var peg$f45 = function() { return "groupBy"; }; - var peg$f46 = function() { return "limit"; }; - var peg$f47 = function() { return "feed"; }; - var peg$f48 = function() { return "title"; }; - var peg$f49 = function() { return "assignee"; }; - var peg$f50 = function() { return "createdBy"; }; - var peg$f51 = function() { return "action"; }; - var peg$f52 = function() {return "total"; }; - var peg$f53 = function() {return "has"; }; - var peg$f54 = function() {return "is"; }; - var peg$f55 = function() {return "purchaseAmount"}; - var peg$f56 = function() {return "purchaseCurrency"}; - var peg$f57 = function() { + var peg$f31 = function() { return "paidStatus"; }; + var peg$f32 = function() { return "withdrawalID"; }; + var peg$f33 = function() { return "billable"; }; + var peg$f34 = function() { return "reimbursable"; }; + var peg$f35 = function() { return "type"; }; + var peg$f36 = function() { return "status"; }; + var peg$f37 = function() { return "sortBy"; }; + var peg$f38 = function() { return "sortOrder"; }; + var peg$f39 = function() { return "policyID"; }; + var peg$f40 = function() { return "submitted"; }; + var peg$f41 = function() { return "approved"; }; + var peg$f42 = function() { return "paid"; }; + var peg$f43 = function() { return "exported"; }; + var peg$f44 = function() { return "posted"; }; + var peg$f45 = function() { return "withdrawn"; }; + var peg$f46 = function() { return "groupBy"; }; + var peg$f47 = function() { return "limit"; }; + var peg$f48 = function() { return "feed"; }; + var peg$f49 = function() { return "title"; }; + var peg$f50 = function() { return "assignee"; }; + var peg$f51 = function() { return "createdBy"; }; + var peg$f52 = function() { return "action"; }; + var peg$f53 = function() {return "total"; }; + var peg$f54 = function() {return "has"; }; + var peg$f55 = function() {return "is"; }; + var peg$f56 = function() {return "purchaseAmount"}; + var peg$f57 = function() {return "purchaseCurrency"}; + var peg$f58 = function() { isColumnsContext = true; return "columns"; }; - var peg$f58 = function() {return "view"}; - var peg$f59 = function() { return isColumnsContext; }; - var peg$f60 = function() { return "perDiem"; }; - var peg$f61 = function() { return "drafts"; }; - var peg$f62 = function() { return "originalamount"; }; - var peg$f63 = function() { return "taxAmount"; }; - var peg$f64 = function() { return "taxrate"; }; - var peg$f65 = function() { return "policyname"; }; - var peg$f66 = function() { return "withdrawalID"; }; - var peg$f67 = function() { return "bankAccount"; }; - var peg$f68 = function() { return "reportID"; }; - var peg$f69 = function() { return "base62ReportID"; }; - var peg$f70 = function() { return "exportedto"; }; - var peg$f71 = function() { return "exportedTo"; }; + var peg$f59 = function() {return "view"}; + var peg$f60 = function() { return isColumnsContext; }; + var peg$f61 = function() { return "perDiem"; }; + var peg$f62 = function() { return "drafts"; }; + var peg$f63 = function() { return "originalamount"; }; + var peg$f64 = function() { return "taxAmount"; }; + var peg$f65 = function() { return "taxrate"; }; + var peg$f66 = function() { return "policyname"; }; + var peg$f67 = function() { return "withdrawalID"; }; + var peg$f68 = function() { return "bankAccount"; }; + var peg$f69 = function() { return "reportID"; }; + var peg$f70 = function() { return "base62ReportID"; }; + var peg$f71 = function() { return "exportedto"; }; var peg$f72 = function() { return "exportedTo"; }; - var peg$f73 = function() { return "exchangeRate"; }; - var peg$f74 = function() { return "reimbursableTotal"; }; - var peg$f75 = function() { return "nonReimbursableTotal"; }; - var peg$f76 = function() { return "groupFrom"; }; - var peg$f77 = function() { return "groupExpenses"; }; - var peg$f78 = function() { return "groupTotal"; }; - var peg$f79 = function() { return "groupCard"; }; - var peg$f80 = function() { return "groupFeed"; }; - var peg$f81 = function() { return "groupBankAccount"; }; - var peg$f82 = function() { return "groupWithdrawn"; }; - var peg$f83 = function() { return "groupWithdrawalID"; }; - var peg$f84 = function() { return "groupCategory"; }; - var peg$f85 = function() { return "groupTag"; }; - var peg$f86 = function() { return "groupMerchant"; }; - var peg$f87 = function() { return "groupmonth"; }; - var peg$f88 = function() { return "groupweek"; }; - var peg$f89 = function() { return "groupyear"; }; - var peg$f90 = function() { return "groupquarter"; }; - var peg$f91 = function() { return "eq"; }; - var peg$f92 = function() { return "neq"; }; - var peg$f93 = function() { return "gte"; }; - var peg$f94 = function() { return "gt"; }; - var peg$f95 = function() { return "lte"; }; - var peg$f96 = function() { return "lt"; }; - var peg$f97 = function(o) { + var peg$f73 = function() { return "exportedTo"; }; + var peg$f74 = function() { return "exchangeRate"; }; + var peg$f75 = function() { return "reimbursableTotal"; }; + var peg$f76 = function() { return "nonReimbursableTotal"; }; + var peg$f77 = function() { return "groupFrom"; }; + var peg$f78 = function() { return "groupExpenses"; }; + var peg$f79 = function() { return "groupTotal"; }; + var peg$f80 = function() { return "groupCard"; }; + var peg$f81 = function() { return "groupFeed"; }; + var peg$f82 = function() { return "groupBankAccount"; }; + var peg$f83 = function() { return "groupWithdrawn"; }; + var peg$f84 = function() { return "groupWithdrawalID"; }; + var peg$f85 = function() { return "groupCategory"; }; + var peg$f86 = function() { return "groupTag"; }; + var peg$f87 = function() { return "groupMerchant"; }; + var peg$f88 = function() { return "groupmonth"; }; + var peg$f89 = function() { return "groupweek"; }; + var peg$f90 = function() { return "groupyear"; }; + var peg$f91 = function() { return "groupquarter"; }; + var peg$f92 = function() { return "eq"; }; + var peg$f93 = function() { return "neq"; }; + var peg$f94 = function() { return "gte"; }; + var peg$f95 = function() { return "gt"; }; + var peg$f96 = function() { return "lte"; }; + var peg$f97 = function() { return "lt"; }; + var peg$f98 = function(o) { if (nameOperator) { expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found } isColumnsContext = false; return o; }; - var peg$f98 = function(chars) { return chars.join("").trim(); }; - var peg$f99 = function() { + var peg$f99 = function(chars) { return chars.join("").trim(); }; + var peg$f100 = function() { isColumnsContext = false; return "and"; }; - var peg$f100 = function() { return expectingNestedQuote; }; - var peg$f101 = function(start, inner, end) { //handle no-breaking space + var peg$f101 = function() { return expectingNestedQuote; }; + var peg$f102 = function(start, inner, end) { //handle no-breaking space return [...start, '"', ...inner, '"', ...end].join(""); }; - var peg$f102 = function(start) {return "“"}; - var peg$f103 = function(start) {return "”"}; - var peg$f104 = function(start) {return "\""}; - var peg$f105 = function(start, inner, end) { + var peg$f103 = function(start) {return "“"}; + var peg$f104 = function(start) {return "”"}; + var peg$f105 = function(start) {return "\""}; + var peg$f106 = function(start, inner, end) { return [...start, '"', ...inner, '"'].join(""); }; var peg$currPos = options.peg$currPos | 0; @@ -1162,45 +1167,48 @@ function peg$parse(input, options) { if (s1 === peg$FAILED) { s1 = peg$parsewithdrawalStatus(); if (s1 === peg$FAILED) { - s1 = peg$parsewithdrawalID(); + s1 = peg$parsepaidStatus(); if (s1 === peg$FAILED) { - s1 = peg$parsesubmitted(); + s1 = peg$parsewithdrawalID(); if (s1 === peg$FAILED) { - s1 = peg$parseapproved(); + s1 = peg$parsesubmitted(); if (s1 === peg$FAILED) { - s1 = peg$parsepaid(); + s1 = peg$parseapproved(); if (s1 === peg$FAILED) { - s1 = peg$parseexportedTo(); + s1 = peg$parsepaid(); if (s1 === peg$FAILED) { - s1 = peg$parseexported(); + s1 = peg$parseexportedTo(); if (s1 === peg$FAILED) { - s1 = peg$parseposted(); + s1 = peg$parseexported(); if (s1 === peg$FAILED) { - s1 = peg$parsewithdrawn(); + s1 = peg$parseposted(); if (s1 === peg$FAILED) { - s1 = peg$parsefeed(); + s1 = peg$parsewithdrawn(); if (s1 === peg$FAILED) { - s1 = peg$parsetitle(); + s1 = peg$parsefeed(); if (s1 === peg$FAILED) { - s1 = peg$parseassignee(); + s1 = peg$parsetitle(); if (s1 === peg$FAILED) { - s1 = peg$parsecreatedBy(); + s1 = peg$parseassignee(); if (s1 === peg$FAILED) { - s1 = peg$parsereimbursable(); + s1 = peg$parsecreatedBy(); if (s1 === peg$FAILED) { - s1 = peg$parsebillable(); + s1 = peg$parsereimbursable(); if (s1 === peg$FAILED) { - s1 = peg$parseaction(); + s1 = peg$parsebillable(); if (s1 === peg$FAILED) { - s1 = peg$parsehas(); + s1 = peg$parseaction(); if (s1 === peg$FAILED) { - s1 = peg$parseis(); + s1 = peg$parsehas(); if (s1 === peg$FAILED) { - s1 = peg$parsepurchaseCurrency(); + s1 = peg$parseis(); if (s1 === peg$FAILED) { - s1 = peg$parsepurchaseAmount(); + s1 = peg$parsepurchaseCurrency(); if (s1 === peg$FAILED) { - s1 = peg$parsereportFieldDynamic(); + s1 = peg$parsepurchaseAmount(); + if (s1 === peg$FAILED) { + s1 = peg$parsereportFieldDynamic(); + } } } } @@ -1982,28 +1990,57 @@ function peg$parse(input, options) { return s0; } + function peg$parsepaidStatus() { + var s0, s1; + + if (input.substr(peg$currPos, 10) === peg$c36) { + s0 = peg$c36; + peg$currPos += 10; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e41); } + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + s1 = input.substr(peg$currPos, 11); + if (s1.toLowerCase() === peg$c37) { + peg$currPos += 11; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e42); } + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f31(); + } + s0 = s1; + } + + return s0; + } + function peg$parsewithdrawalID() { var s0, s1; s0 = input.substr(peg$currPos, 12); - if (s0.toLowerCase() === peg$c36) { + if (s0.toLowerCase() === peg$c38) { peg$currPos += 12; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e41); } + if (peg$silentFails === 0) { peg$fail(peg$e43); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c37) { + if (s1.toLowerCase() === peg$c39) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e42); } + if (peg$silentFails === 0) { peg$fail(peg$e44); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f31(); + s1 = peg$f32(); } s0 = s1; } @@ -2016,15 +2053,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c38) { + if (s1.toLowerCase() === peg$c40) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e43); } + if (peg$silentFails === 0) { peg$fail(peg$e45); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f32(); + s1 = peg$f33(); } s0 = s1; @@ -2036,15 +2073,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 12); - if (s1.toLowerCase() === peg$c39) { + if (s1.toLowerCase() === peg$c41) { peg$currPos += 12; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e44); } + if (peg$silentFails === 0) { peg$fail(peg$e46); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f33(); + s1 = peg$f34(); } s0 = s1; @@ -2056,15 +2093,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c40) { + if (s1.toLowerCase() === peg$c42) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } + if (peg$silentFails === 0) { peg$fail(peg$e47); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f34(); + s1 = peg$f35(); } s0 = s1; @@ -2076,15 +2113,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c41) { + if (s1.toLowerCase() === peg$c43) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e46); } + if (peg$silentFails === 0) { peg$fail(peg$e48); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f35(); + s1 = peg$f36(); } s0 = s1; @@ -2094,25 +2131,25 @@ function peg$parse(input, options) { function peg$parsesortBy() { var s0, s1; - if (input.substr(peg$currPos, 6) === peg$c42) { - s0 = peg$c42; + if (input.substr(peg$currPos, 6) === peg$c44) { + s0 = peg$c44; peg$currPos += 6; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e47); } + if (peg$silentFails === 0) { peg$fail(peg$e49); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 7); - if (s1.toLowerCase() === peg$c43) { + if (s1.toLowerCase() === peg$c45) { peg$currPos += 7; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e48); } + if (peg$silentFails === 0) { peg$fail(peg$e50); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f36(); + s1 = peg$f37(); } s0 = s1; } @@ -2123,25 +2160,25 @@ function peg$parse(input, options) { function peg$parsesortOrder() { var s0, s1; - if (input.substr(peg$currPos, 9) === peg$c44) { - s0 = peg$c44; + if (input.substr(peg$currPos, 9) === peg$c46) { + s0 = peg$c46; peg$currPos += 9; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e49); } + if (peg$silentFails === 0) { peg$fail(peg$e51); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c45) { + if (s1.toLowerCase() === peg$c47) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e50); } + if (peg$silentFails === 0) { peg$fail(peg$e52); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f37(); + s1 = peg$f38(); } s0 = s1; } @@ -2152,25 +2189,25 @@ function peg$parse(input, options) { function peg$parsepolicyID() { var s0, s1; - if (input.substr(peg$currPos, 8) === peg$c46) { - s0 = peg$c46; + if (input.substr(peg$currPos, 8) === peg$c48) { + s0 = peg$c48; peg$currPos += 8; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e51); } + if (peg$silentFails === 0) { peg$fail(peg$e53); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c47) { + if (s1.toLowerCase() === peg$c49) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e52); } + if (peg$silentFails === 0) { peg$fail(peg$e54); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f38(); + s1 = peg$f39(); } s0 = s1; } @@ -2183,15 +2220,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c48) { + if (s1.toLowerCase() === peg$c50) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e53); } + if (peg$silentFails === 0) { peg$fail(peg$e55); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f39(); + s1 = peg$f40(); } s0 = s1; @@ -2203,15 +2240,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c49) { + if (s1.toLowerCase() === peg$c51) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e54); } + if (peg$silentFails === 0) { peg$fail(peg$e56); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f40(); + s1 = peg$f41(); } s0 = s1; @@ -2223,15 +2260,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c50) { + if (s1.toLowerCase() === peg$c52) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e55); } + if (peg$silentFails === 0) { peg$fail(peg$e57); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f41(); + s1 = peg$f42(); } s0 = s1; @@ -2243,15 +2280,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c51) { + if (s1.toLowerCase() === peg$c53) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e56); } + if (peg$silentFails === 0) { peg$fail(peg$e58); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f42(); + s1 = peg$f43(); } s0 = s1; @@ -2263,15 +2300,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c52) { + if (s1.toLowerCase() === peg$c54) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } + if (peg$silentFails === 0) { peg$fail(peg$e59); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f43(); + s1 = peg$f44(); } s0 = s1; @@ -2283,15 +2320,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c53) { + if (s1.toLowerCase() === peg$c55) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e58); } + if (peg$silentFails === 0) { peg$fail(peg$e60); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f44(); + s1 = peg$f45(); } s0 = s1; @@ -2302,24 +2339,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 7); - if (s0.toLowerCase() === peg$c54) { + if (s0.toLowerCase() === peg$c56) { peg$currPos += 7; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e59); } + if (peg$silentFails === 0) { peg$fail(peg$e61); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c55) { + if (s1.toLowerCase() === peg$c57) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e60); } + if (peg$silentFails === 0) { peg$fail(peg$e62); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f45(); + s1 = peg$f46(); } s0 = s1; } @@ -2332,15 +2369,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c56) { + if (s1.toLowerCase() === peg$c58) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e61); } + if (peg$silentFails === 0) { peg$fail(peg$e63); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f46(); + s1 = peg$f47(); } s0 = s1; @@ -2352,15 +2389,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c57) { + if (s1.toLowerCase() === peg$c59) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e62); } + if (peg$silentFails === 0) { peg$fail(peg$e64); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f47(); + s1 = peg$f48(); } s0 = s1; @@ -2372,15 +2409,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c58) { + if (s1.toLowerCase() === peg$c60) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e63); } + if (peg$silentFails === 0) { peg$fail(peg$e65); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f48(); + s1 = peg$f49(); } s0 = s1; @@ -2392,15 +2429,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c59) { + if (s1.toLowerCase() === peg$c61) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e64); } + if (peg$silentFails === 0) { peg$fail(peg$e66); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f49(); + s1 = peg$f50(); } s0 = s1; @@ -2411,24 +2448,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 9); - if (s0.toLowerCase() === peg$c60) { + if (s0.toLowerCase() === peg$c62) { peg$currPos += 9; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e65); } + if (peg$silentFails === 0) { peg$fail(peg$e67); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c61) { + if (s1.toLowerCase() === peg$c63) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e66); } + if (peg$silentFails === 0) { peg$fail(peg$e68); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f50(); + s1 = peg$f51(); } s0 = s1; } @@ -2441,15 +2478,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c62) { + if (s1.toLowerCase() === peg$c64) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e67); } + if (peg$silentFails === 0) { peg$fail(peg$e69); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f51(); + s1 = peg$f52(); } s0 = s1; @@ -2461,15 +2498,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c63) { + if (s1.toLowerCase() === peg$c65) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e68); } + if (peg$silentFails === 0) { peg$fail(peg$e70); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f52(); + s1 = peg$f53(); } s0 = s1; @@ -2481,15 +2518,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 3); - if (s1.toLowerCase() === peg$c64) { + if (s1.toLowerCase() === peg$c66) { peg$currPos += 3; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e69); } + if (peg$silentFails === 0) { peg$fail(peg$e71); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f53(); + s1 = peg$f54(); } s0 = s1; @@ -2501,15 +2538,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 2); - if (s1.toLowerCase() === peg$c65) { + if (s1.toLowerCase() === peg$c67) { peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e70); } + if (peg$silentFails === 0) { peg$fail(peg$e72); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f54(); + s1 = peg$f55(); } s0 = s1; @@ -2520,24 +2557,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 14); - if (s0.toLowerCase() === peg$c66) { + if (s0.toLowerCase() === peg$c68) { peg$currPos += 14; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e71); } + if (peg$silentFails === 0) { peg$fail(peg$e73); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c67) { + if (s1.toLowerCase() === peg$c69) { peg$currPos += 15; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e72); } + if (peg$silentFails === 0) { peg$fail(peg$e74); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f55(); + s1 = peg$f56(); } s0 = s1; } @@ -2549,24 +2586,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 16); - if (s0.toLowerCase() === peg$c68) { + if (s0.toLowerCase() === peg$c70) { peg$currPos += 16; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e73); } + if (peg$silentFails === 0) { peg$fail(peg$e75); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 17); - if (s1.toLowerCase() === peg$c69) { + if (s1.toLowerCase() === peg$c71) { peg$currPos += 17; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e74); } + if (peg$silentFails === 0) { peg$fail(peg$e76); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f56(); + s1 = peg$f57(); } s0 = s1; } @@ -2579,15 +2616,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 7); - if (s1.toLowerCase() === peg$c70) { + if (s1.toLowerCase() === peg$c72) { peg$currPos += 7; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e75); } + if (peg$silentFails === 0) { peg$fail(peg$e77); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f57(); + s1 = peg$f58(); } s0 = s1; @@ -2599,15 +2636,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c71) { + if (s1.toLowerCase() === peg$c73) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e76); } + if (peg$silentFails === 0) { peg$fail(peg$e78); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f58(); + s1 = peg$f59(); } s0 = s1; @@ -2619,7 +2656,7 @@ function peg$parse(input, options) { s0 = peg$currPos; peg$savedPos = peg$currPos; - s1 = peg$f59(); + s1 = peg$f60(); if (s1) { s1 = undefined; } else { @@ -2739,11 +2776,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c72) { + if (s1.toLowerCase() === peg$c74) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e77); } + if (peg$silentFails === 0) { peg$fail(peg$e79); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -2758,7 +2795,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f60(); + s0 = peg$f61(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2776,19 +2813,19 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c73) { + if (s1.toLowerCase() === peg$c75) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e78); } + if (peg$silentFails === 0) { peg$fail(peg$e80); } } if (s1 === peg$FAILED) { s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c74) { + if (s1.toLowerCase() === peg$c76) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e79); } + if (peg$silentFails === 0) { peg$fail(peg$e81); } } } if (s1 !== peg$FAILED) { @@ -2804,7 +2841,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f61(); + s0 = peg$f62(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2822,11 +2859,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c75) { + if (s1.toLowerCase() === peg$c77) { peg$currPos += 15; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e80); } + if (peg$silentFails === 0) { peg$fail(peg$e82); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -2841,7 +2878,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f62(); + s0 = peg$f63(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2859,11 +2896,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 3); - if (s1.toLowerCase() === peg$c76) { + if (s1.toLowerCase() === peg$c78) { peg$currPos += 3; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e81); } + if (peg$silentFails === 0) { peg$fail(peg$e83); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -2878,7 +2915,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f63(); + s0 = peg$f64(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2915,7 +2952,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f64(); + s0 = peg$f65(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2933,11 +2970,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c77) { + if (s1.toLowerCase() === peg$c79) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e82); } + if (peg$silentFails === 0) { peg$fail(peg$e84); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -2952,7 +2989,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f65(); + s0 = peg$f66(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2970,11 +3007,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c37) { + if (s1.toLowerCase() === peg$c39) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e42); } + if (peg$silentFails === 0) { peg$fail(peg$e44); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -2989,7 +3026,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f66(); + s0 = peg$f67(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3026,7 +3063,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f67(); + s0 = peg$f68(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3044,11 +3081,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c78) { + if (s1.toLowerCase() === peg$c80) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e83); } + if (peg$silentFails === 0) { peg$fail(peg$e85); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3063,7 +3100,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f68(); + s0 = peg$f69(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3100,7 +3137,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f69(); + s0 = peg$f70(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3118,11 +3155,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c79) { + if (s1.toLowerCase() === peg$c81) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e84); } + if (peg$silentFails === 0) { peg$fail(peg$e86); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3137,7 +3174,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f70(); + s0 = peg$f71(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3162,7 +3199,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e85); } + if (peg$silentFails === 0) { peg$fail(peg$e87); } } if (s2 !== peg$FAILED) { s1 = [s1, s2]; @@ -3181,11 +3218,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c80) { + if (s1.toLowerCase() === peg$c82) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e86); } + if (peg$silentFails === 0) { peg$fail(peg$e88); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3200,7 +3237,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f71(); + s0 = peg$f72(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3212,11 +3249,11 @@ function peg$parse(input, options) { if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c79) { + if (s1.toLowerCase() === peg$c81) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e84); } + if (peg$silentFails === 0) { peg$fail(peg$e86); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3231,7 +3268,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f72(); + s0 = peg$f73(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3250,11 +3287,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c81) { + if (s1.toLowerCase() === peg$c83) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e87); } + if (peg$silentFails === 0) { peg$fail(peg$e89); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3269,7 +3306,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f73(); + s0 = peg$f74(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3287,11 +3324,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c82) { + if (s1.toLowerCase() === peg$c84) { peg$currPos += 18; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e88); } + if (peg$silentFails === 0) { peg$fail(peg$e90); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3306,7 +3343,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f74(); + s0 = peg$f75(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3324,11 +3361,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 22); - if (s1.toLowerCase() === peg$c83) { + if (s1.toLowerCase() === peg$c85) { peg$currPos += 22; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e89); } + if (peg$silentFails === 0) { peg$fail(peg$e91); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3343,7 +3380,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f75(); + s0 = peg$f76(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3361,11 +3398,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c84) { + if (s1.toLowerCase() === peg$c86) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e90); } + if (peg$silentFails === 0) { peg$fail(peg$e92); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3380,7 +3417,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f76(); + s0 = peg$f77(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3398,11 +3435,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c85) { + if (s1.toLowerCase() === peg$c87) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e91); } + if (peg$silentFails === 0) { peg$fail(peg$e93); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3417,7 +3454,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f77(); + s0 = peg$f78(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3435,11 +3472,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c86) { + if (s1.toLowerCase() === peg$c88) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e92); } + if (peg$silentFails === 0) { peg$fail(peg$e94); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3454,7 +3491,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f78(); + s0 = peg$f79(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3472,11 +3509,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c87) { + if (s1.toLowerCase() === peg$c89) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e93); } + if (peg$silentFails === 0) { peg$fail(peg$e95); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3491,7 +3528,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f79(); + s0 = peg$f80(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3509,11 +3546,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c88) { + if (s1.toLowerCase() === peg$c90) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e94); } + if (peg$silentFails === 0) { peg$fail(peg$e96); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3528,7 +3565,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f80(); + s0 = peg$f81(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3546,11 +3583,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c89) { + if (s1.toLowerCase() === peg$c91) { peg$currPos += 18; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e95); } + if (peg$silentFails === 0) { peg$fail(peg$e97); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3565,7 +3602,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f81(); + s0 = peg$f82(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3583,11 +3620,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c90) { + if (s1.toLowerCase() === peg$c92) { peg$currPos += 15; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e96); } + if (peg$silentFails === 0) { peg$fail(peg$e98); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3602,7 +3639,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f82(); + s0 = peg$f83(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3620,11 +3657,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 19); - if (s1.toLowerCase() === peg$c91) { + if (s1.toLowerCase() === peg$c93) { peg$currPos += 19; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e97); } + if (peg$silentFails === 0) { peg$fail(peg$e99); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3639,7 +3676,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f83(); + s0 = peg$f84(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3657,11 +3694,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c92) { + if (s1.toLowerCase() === peg$c94) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e98); } + if (peg$silentFails === 0) { peg$fail(peg$e100); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3676,7 +3713,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f84(); + s0 = peg$f85(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3694,11 +3731,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c93) { + if (s1.toLowerCase() === peg$c95) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e99); } + if (peg$silentFails === 0) { peg$fail(peg$e101); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3713,7 +3750,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f85(); + s0 = peg$f86(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3731,11 +3768,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c94) { + if (s1.toLowerCase() === peg$c96) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e100); } + if (peg$silentFails === 0) { peg$fail(peg$e102); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3750,7 +3787,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f86(); + s0 = peg$f87(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3768,11 +3805,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c95) { + if (s1.toLowerCase() === peg$c97) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e101); } + if (peg$silentFails === 0) { peg$fail(peg$e103); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3787,7 +3824,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f87(); + s0 = peg$f88(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3805,11 +3842,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c96) { + if (s1.toLowerCase() === peg$c98) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e102); } + if (peg$silentFails === 0) { peg$fail(peg$e104); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3824,7 +3861,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f88(); + s0 = peg$f89(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3842,11 +3879,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c97) { + if (s1.toLowerCase() === peg$c99) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e103); } + if (peg$silentFails === 0) { peg$fail(peg$e105); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3861,7 +3898,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f89(); + s0 = peg$f90(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3879,11 +3916,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c98) { + if (s1.toLowerCase() === peg$c100) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e104); } + if (peg$silentFails === 0) { peg$fail(peg$e106); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3898,7 +3935,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f90(); + s0 = peg$f91(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3921,81 +3958,81 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e85); } + if (peg$silentFails === 0) { peg$fail(peg$e87); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f91(); + s1 = peg$f92(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c99) { - s1 = peg$c99; + if (input.substr(peg$currPos, 2) === peg$c101) { + s1 = peg$c101; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e106); } + if (peg$silentFails === 0) { peg$fail(peg$e108); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f92(); + s1 = peg$f93(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c100) { - s1 = peg$c100; + if (input.substr(peg$currPos, 2) === peg$c102) { + s1 = peg$c102; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e107); } + if (peg$silentFails === 0) { peg$fail(peg$e109); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f93(); + s1 = peg$f94(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 62) { - s1 = peg$c101; + s1 = peg$c103; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e108); } + if (peg$silentFails === 0) { peg$fail(peg$e110); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f94(); + s1 = peg$f95(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c102) { - s1 = peg$c102; + if (input.substr(peg$currPos, 2) === peg$c104) { + s1 = peg$c104; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e109); } + if (peg$silentFails === 0) { peg$fail(peg$e111); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f95(); + s1 = peg$f96(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 60) { - s1 = peg$c103; + s1 = peg$c105; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e110); } + if (peg$silentFails === 0) { peg$fail(peg$e112); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f96(); + s1 = peg$f97(); } s0 = s1; } @@ -4006,7 +4043,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e105); } + if (peg$silentFails === 0) { peg$fail(peg$e107); } } return s0; @@ -4019,7 +4056,7 @@ function peg$parse(input, options) { s1 = peg$parseoperator(); if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f97(s1); + s1 = peg$f98(s1); } s0 = s1; @@ -4037,7 +4074,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e112); } + if (peg$silentFails === 0) { peg$fail(peg$e114); } } if (s2 !== peg$FAILED) { while (s2 !== peg$FAILED) { @@ -4047,7 +4084,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e112); } + if (peg$silentFails === 0) { peg$fail(peg$e114); } } } } else { @@ -4055,13 +4092,13 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f98(s1); + s1 = peg$f99(s1); } s0 = s1; peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e111); } + if (peg$silentFails === 0) { peg$fail(peg$e113); } } return s0; @@ -4073,7 +4110,7 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = peg$parse_(); peg$savedPos = s0; - s1 = peg$f99(); + s1 = peg$f100(); s0 = s1; return s0; @@ -4089,7 +4126,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e114); } + if (peg$silentFails === 0) { peg$fail(peg$e116); } } while (s1 !== peg$FAILED) { s0.push(s1); @@ -4098,12 +4135,12 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e114); } + if (peg$silentFails === 0) { peg$fail(peg$e116); } } } peg$silentFails--; s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e113); } + if (peg$silentFails === 0) { peg$fail(peg$e115); } return s0; } @@ -4113,7 +4150,7 @@ function peg$parse(input, options) { s0 = peg$currPos; peg$savedPos = peg$currPos; - s1 = peg$f100(); + s1 = peg$f101(); if (s1) { s1 = undefined; } else { @@ -4150,7 +4187,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e116); } + if (peg$silentFails === 0) { peg$fail(peg$e118); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -4159,7 +4196,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e116); } + if (peg$silentFails === 0) { peg$fail(peg$e118); } } } s2 = input.charAt(peg$currPos); @@ -4167,7 +4204,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e117); } + if (peg$silentFails === 0) { peg$fail(peg$e119); } } if (s2 !== peg$FAILED) { s3 = []; @@ -4176,7 +4213,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e118); } + if (peg$silentFails === 0) { peg$fail(peg$e120); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -4185,7 +4222,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e118); } + if (peg$silentFails === 0) { peg$fail(peg$e120); } } } s4 = input.charAt(peg$currPos); @@ -4193,7 +4230,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e117); } + if (peg$silentFails === 0) { peg$fail(peg$e119); } } if (s4 !== peg$FAILED) { s5 = []; @@ -4202,7 +4239,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e112); } + if (peg$silentFails === 0) { peg$fail(peg$e114); } } while (s6 !== peg$FAILED) { s5.push(s6); @@ -4211,11 +4248,11 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e112); } + if (peg$silentFails === 0) { peg$fail(peg$e114); } } } peg$savedPos = s0; - s0 = peg$f101(s1, s3, s5); + s0 = peg$f102(s1, s3, s5); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4227,7 +4264,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e115); } + if (peg$silentFails === 0) { peg$fail(peg$e117); } } return s0; @@ -4244,7 +4281,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e116); } + if (peg$silentFails === 0) { peg$fail(peg$e118); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -4253,7 +4290,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e116); } + if (peg$silentFails === 0) { peg$fail(peg$e118); } } } s2 = input.charAt(peg$currPos); @@ -4261,7 +4298,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e117); } + if (peg$silentFails === 0) { peg$fail(peg$e119); } } if (s2 !== peg$FAILED) { s3 = []; @@ -4270,7 +4307,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e118); } + if (peg$silentFails === 0) { peg$fail(peg$e120); } } if (s4 === peg$FAILED) { s4 = peg$currPos; @@ -4286,15 +4323,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8220) { - s6 = peg$c104; + s6 = peg$c106; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e119); } + if (peg$silentFails === 0) { peg$fail(peg$e121); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f102(s1); + s4 = peg$f103(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4317,15 +4354,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8221) { - s6 = peg$c105; + s6 = peg$c107; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e120); } + if (peg$silentFails === 0) { peg$fail(peg$e122); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f103(s1); + s4 = peg$f104(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4348,15 +4385,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s6 = peg$c106; + s6 = peg$c108; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e121); } + if (peg$silentFails === 0) { peg$fail(peg$e123); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f104(s1); + s4 = peg$f105(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4375,7 +4412,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e118); } + if (peg$silentFails === 0) { peg$fail(peg$e120); } } if (s4 === peg$FAILED) { s4 = peg$currPos; @@ -4391,15 +4428,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8220) { - s6 = peg$c104; + s6 = peg$c106; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e119); } + if (peg$silentFails === 0) { peg$fail(peg$e121); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f102(s1); + s4 = peg$f103(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4422,15 +4459,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8221) { - s6 = peg$c105; + s6 = peg$c107; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e120); } + if (peg$silentFails === 0) { peg$fail(peg$e122); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f103(s1); + s4 = peg$f104(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4453,15 +4490,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s6 = peg$c106; + s6 = peg$c108; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e121); } + if (peg$silentFails === 0) { peg$fail(peg$e123); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f104(s1); + s4 = peg$f105(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4477,7 +4514,7 @@ function peg$parse(input, options) { s4 = peg$parseclosingQuote(); if (s4 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f105(s1, s3, s4); + s0 = peg$f106(s1, s3, s4); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4489,7 +4526,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e115); } + if (peg$silentFails === 0) { peg$fail(peg$e117); } } return s0; @@ -4504,7 +4541,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e117); } + if (peg$silentFails === 0) { peg$fail(peg$e119); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4542,7 +4579,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e122); } + if (peg$silentFails === 0) { peg$fail(peg$e124); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -4551,7 +4588,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e122); } + if (peg$silentFails === 0) { peg$fail(peg$e124); } } } s2 = []; @@ -4560,7 +4597,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e123); } + if (peg$silentFails === 0) { peg$fail(peg$e125); } } while (s3 !== peg$FAILED) { s2.push(s3); @@ -4569,7 +4606,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e123); } + if (peg$silentFails === 0) { peg$fail(peg$e125); } } } s3 = []; @@ -4578,7 +4615,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e124); } + if (peg$silentFails === 0) { peg$fail(peg$e126); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -4587,7 +4624,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e124); } + if (peg$silentFails === 0) { peg$fail(peg$e126); } } } s4 = peg$parseoperator(); @@ -4606,7 +4643,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e125); } + if (peg$silentFails === 0) { peg$fail(peg$e127); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -4615,7 +4652,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e125); } + if (peg$silentFails === 0) { peg$fail(peg$e127); } } } s2 = peg$currPos; @@ -4662,7 +4699,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e126); } + if (peg$silentFails === 0) { peg$fail(peg$e128); } } } } @@ -4678,7 +4715,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e127); } + if (peg$silentFails === 0) { peg$fail(peg$e129); } } if (s0 === peg$FAILED) { s0 = peg$currPos; diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy index 6b3df3a7a508..da0dd44b9b6c 100644 --- a/src/libs/SearchParser/searchParser.peggy +++ b/src/libs/SearchParser/searchParser.peggy @@ -285,6 +285,7 @@ key "key" / receiptType / withdrawalType / withdrawalStatus + / paidStatus / withdrawalID / submitted / approved diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts index eaf59716c165..5b3b5531932e 100644 --- a/src/libs/SearchQueryUtils.ts +++ b/src/libs/SearchQueryUtils.ts @@ -96,6 +96,7 @@ const VALID_HAS_TYPES = new Set(Object.values(CONST.SEARCH.HAS_VALUES)); const VALID_IS_TYPES = new Set(Object.values(CONST.SEARCH.IS_VALUES)); const VALID_WITHDRAWAL_TYPES = new Set(Object.values(CONST.SEARCH.WITHDRAWAL_TYPE)); const VALID_WITHDRAWAL_STATUSES = new Set(Object.values(CONST.SEARCH.SETTLEMENT_STATUS)); +const VALID_PAID_STATUSES = new Set(Object.values(CONST.SEARCH.PAID_STATUS)); // Create reverse lookup maps for O(1) performance const createKeyToUserFriendlyMap = () => { @@ -989,7 +990,8 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial 0 ) { @@ -1183,6 +1185,14 @@ function buildFilterFormValuesFromQuery( ValueOf >; } + if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.PAID_STATUS) { + const paidStatusValues = filterValues.filter((paidStatus): paidStatus is ValueOf => VALID_PAID_STATUSES.has(paidStatus)); + if (isNegated) { + filtersForm[FILTER_KEYS.PAID_STATUS_NOT] = paidStatusValues; + } else { + filtersForm[FILTER_KEYS.PAID_STATUS] = paidStatusValues; + } + } if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID) { filtersForm[key as typeof filterKey] = filterValues.filter((card) => cardList?.[card]); } diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts index 400e1d045cf6..76b70b4c1a8d 100644 --- a/src/libs/SearchUIUtils.ts +++ b/src/libs/SearchUIUtils.ts @@ -48,6 +48,7 @@ import type { SearchDatePreset, SearchFilterKey, SearchGroupBy, + SearchPaidStatus, SearchQueryJSON, SearchSortBy, SearchStatus, @@ -5184,6 +5185,10 @@ const FILTER_VIEW_MAP = { labelKey: 'common.withdrawalStatus', icon: 'DotIndicator', }, + [CONST.SEARCH.SYNTAX_FILTER_KEYS.PAID_STATUS]: { + labelKey: 'common.paidStatus', + icon: 'MoneyBag', + }, [CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT]: { labelKey: 'iou.amount', icon: 'Coins', @@ -5385,6 +5390,10 @@ function getDisplayValue( return getWithdrawalStatusDisplayText(form[key], translate); } + if (key === FILTER_KEYS.PAID_STATUS) { + return getPaidStatusDisplayText(form[key], translate); + } + if (key === FILTER_KEYS.STATUS) { const status = form[key]; if (!status?.length) { @@ -5564,6 +5573,10 @@ function getMultiSelectFilterOptions(filterKey: SearchAdvancedFiltersKey, type: return getWithdrawalStatusOptions(translate); } + if (filterKey === FILTER_KEYS.PAID_STATUS) { + return getPaidStatusOptions(translate); + } + return []; } @@ -5585,6 +5598,20 @@ function getWithdrawalStatusDisplayText(value: SearchWithdrawalStatus | undefine .join(', '); } +function getPaidStatusOptions(translate: LocaleContextProps['translate']) { + return Object.values(CONST.SEARCH.PAID_STATUS).map((value) => ({text: translate(`paidStatus.${value}`), value})); +} + +function getPaidStatusDisplayText(value: SearchPaidStatus | undefined, translate: LocaleContextProps['translate']): string | undefined { + if (!value?.length) { + return undefined; + } + return getPaidStatusOptions(translate) + .filter((option) => value.includes(option.value)) + .map((option) => option.text) + .join(', '); +} + /** * A `PolicyCategoriesLookup` can either be a single policy's categories or an Onyx collection of * many policies' categories keyed by `policy_categories_`. A collection is the only diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts index 390560d95c9d..d6f069aafd79 100644 --- a/src/types/form/SearchAdvancedFiltersForm.ts +++ b/src/types/form/SearchAdvancedFiltersForm.ts @@ -8,6 +8,7 @@ import type { SearchCustomColumnIds, SearchDateFilterKeys, SearchGroupBy, + SearchPaidStatus, SearchView, SearchWithdrawalStatus, SearchWithdrawalType, @@ -77,6 +78,9 @@ const FILTER_KEYS = { WITHDRAWAL_STATUS_NOT: 'withdrawalStatusNot', WITHDRAWAL_STATUS: 'withdrawalStatus', + PAID_STATUS_NOT: 'paidStatusNot', + PAID_STATUS: 'paidStatus', + WITHDRAWN_NOT: 'withdrawnNot', WITHDRAWN_ON: 'withdrawnOn', WITHDRAWN_AFTER: 'withdrawnAfter', @@ -333,6 +337,8 @@ const ALLOWED_TYPE_FILTERS: Record> = { FILTER_KEYS.WITHDRAWAL_TYPE_NOT, FILTER_KEYS.WITHDRAWAL_STATUS, FILTER_KEYS.WITHDRAWAL_STATUS_NOT, + FILTER_KEYS.PAID_STATUS, + FILTER_KEYS.PAID_STATUS_NOT, FILTER_KEYS.WITHDRAWN_AFTER, FILTER_KEYS.WITHDRAWN_BEFORE, FILTER_KEYS.WITHDRAWN_ON, @@ -658,6 +664,9 @@ type SearchAdvancedFiltersForm = Form< [FILTER_KEYS.WITHDRAWAL_STATUS]: SearchWithdrawalStatus; [FILTER_KEYS.WITHDRAWAL_STATUS_NOT]: SearchWithdrawalStatus; + [FILTER_KEYS.PAID_STATUS]: SearchPaidStatus; + [FILTER_KEYS.PAID_STATUS_NOT]: SearchPaidStatus; + [FILTER_KEYS.WITHDRAWN_ON]: string; [FILTER_KEYS.WITHDRAWN_NOT]: string; [FILTER_KEYS.WITHDRAWN_AFTER]: string; diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts index 87b4f24be70b..6fbb325b2ea4 100644 --- a/tests/unit/Search/SearchQueryUtilsTest.ts +++ b/tests/unit/Search/SearchQueryUtilsTest.ts @@ -665,6 +665,30 @@ describe('SearchQueryUtils', () => { expect(result).toEqual('type:expense withdrawalStatus:pending,cleared,failed'); }); + test('with single paid status filter', () => { + const filterValues: Partial = { + type: 'expense-report', + status: CONST.SEARCH.STATUS.EXPENSE_REPORT.ALL, + paidStatus: [CONST.SEARCH.PAID_STATUS.MARKED_AS_PAID], + }; + + const result = buildQueryStringFromFilterFormValues(filterValues); + + expect(result).toEqual('type:expense-report paidStatus:markedAsPaid'); + }); + + test('with multi-value paid status filter', () => { + const filterValues: Partial = { + type: 'expense-report', + status: CONST.SEARCH.STATUS.EXPENSE_REPORT.ALL, + paidStatus: [CONST.SEARCH.PAID_STATUS.MARKED_AS_PAID, CONST.SEARCH.PAID_STATUS.WITHDRAWING, CONST.SEARCH.PAID_STATUS.CONFIRMED], + }; + + const result = buildQueryStringFromFilterFormValues(filterValues); + + expect(result).toEqual('type:expense-report paidStatus:markedAsPaid,withdrawing,confirmed'); + }); + test('with withdrawn filter', () => { const filterValues: Partial = { type: 'expense', @@ -1189,6 +1213,47 @@ describe('SearchQueryUtils', () => { }); }); + test('paid status filter parses valid values and drops invalid ones', () => { + const policyCategories = {}; + const policyTags = {}; + const currencyList = {}; + const personalDetails = {}; + const cardList = {}; + const reports = {}; + const taxRates = {}; + + let queryString = 'sortBy:date sortOrder:desc type:expense-report paid-status:markedAsPaid,withdrawing,confirmed'; + let queryJSON = buildSearchQueryJSON(queryString); + + if (!queryJSON) { + throw new Error('Failed to parse query string'); + } + + let result = buildFilterFormValuesFromQuery(queryJSON, policyCategories, policyTags, currencyList, personalDetails, cardList, reports, taxRates); + + expect(result).toEqual({ + type: 'expense-report', + status: CONST.SEARCH.STATUS.EXPENSE_REPORT.ALL, + paidStatus: [CONST.SEARCH.PAID_STATUS.MARKED_AS_PAID, CONST.SEARCH.PAID_STATUS.WITHDRAWING, CONST.SEARCH.PAID_STATUS.CONFIRMED], + }); + + // invalid values are dropped, valid ones retained + queryString = 'sortBy:date sortOrder:desc type:expense-report paid-status:markedAsPaid,INVALID,confirmed'; + queryJSON = buildSearchQueryJSON(queryString); + + if (!queryJSON) { + throw new Error('Failed to parse query string'); + } + + result = buildFilterFormValuesFromQuery(queryJSON, policyCategories, policyTags, currencyList, personalDetails, cardList, reports, taxRates); + + expect(result).toEqual({ + type: 'expense-report', + status: CONST.SEARCH.STATUS.EXPENSE_REPORT.ALL, + paidStatus: [CONST.SEARCH.PAID_STATUS.MARKED_AS_PAID, CONST.SEARCH.PAID_STATUS.CONFIRMED], + }); + }); + test('parses negative backend amounts into filter form values', () => { const policyCategories = {}; const policyTags = {}; diff --git a/tests/unit/SearchParserTest.ts b/tests/unit/SearchParserTest.ts index 8680fd85dbb3..03ed02a80565 100644 --- a/tests/unit/SearchParserTest.ts +++ b/tests/unit/SearchParserTest.ts @@ -574,6 +574,36 @@ const tests = [ }, }, }, + { + query: 'type:expense-report paid-status:markedAsPaid', + expected: { + type: CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT, + status: CONST.SEARCH.STATUS.EXPENSE.ALL, + sortBy: CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE, + sortOrder: CONST.SEARCH.SORT_ORDER.DESC, + view: 'table', + filters: { + operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, + left: CONST.SEARCH.SYNTAX_FILTER_KEYS.PAID_STATUS, + right: CONST.SEARCH.PAID_STATUS.MARKED_AS_PAID, + }, + }, + }, + { + query: 'type:expense-report paid-status:markedAsPaid,withdrawing,confirmed', + expected: { + type: CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT, + status: CONST.SEARCH.STATUS.EXPENSE.ALL, + sortBy: CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE, + sortOrder: CONST.SEARCH.SORT_ORDER.DESC, + view: 'table', + filters: { + operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, + left: CONST.SEARCH.SYNTAX_FILTER_KEYS.PAID_STATUS, + right: [CONST.SEARCH.PAID_STATUS.MARKED_AS_PAID, CONST.SEARCH.PAID_STATUS.WITHDRAWING, CONST.SEARCH.PAID_STATUS.CONFIRMED], + }, + }, + }, { query: 'type:expense withdrawn:last-month', expected: {