4162522529

Build Type

github

Committed by GitHub

Commit Message

Merge e50698301 into a951decaa

Pull Request Pull Request #577: Dramatically improve parse errors

Run Details

4894 of 5691 branches covered (86.0%)

Branch coverage included in aggregate %.

31 of 32 new or added lines in 6 files covered. (96.88%)

7 existing lines in 2 files now uncovered.

10527 of 11166 relevant lines covered (94.28%)

97410.64 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

93.75

/src/parsing/nameParser.ts

import { followed, map, or, Parser, preceded, star, then } from 'prsc';
import { IAST } from './astHelper';
import { QNameAST } from './literalParser';
import { precededMultiple, regex } from './parsingFunctions';
import * as tokens from './tokens';
import { whitespace } from './whitespaceParser';

const ncNameStartChar: Parser<string> = or([
        regex(
                /[A-Z_a-z\xC0-\xD6\xD8-\xF6\xF8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/
        ),
        then(regex(/[\uD800-\uDB7F]/), regex(/[\uDC00-\uDFFF]/), (a, b) => a + b),
]);

const ncNameChar: Parser<string> = or([
        ncNameStartChar,
        regex(/[\-\.0-9\xB7\u0300-\u036F\u203F\u2040]/),
]);

export const ncName: Parser<string> = then(
        ncNameStartChar,
        star(ncNameChar),
        (a, b) => a + b.join('')
);

export const prefix: Parser<IAST> = map(ncName, (x) => ['prefix', x]);

const nameStartChar: Parser<string> = or([ncNameStartChar, tokens.COLON]);

const nameChar: Parser<string> = or([ncNameChar, tokens.COLON]);

export const name: Parser<string> = then(
        nameStartChar,
        star(nameChar),
        (start, rest) => start + rest.join('')
);

const localPart: Parser<string> = ncName;

const unprefixedName: Parser<QNameAST> = map(localPart, (x) => [
        { ['prefix']: '', ['URI']: null },
        x,
]);

const xmlPrefix: Parser<string> = ncName;

const prefixedName: Parser<QNameAST> = then(
        xmlPrefix,
        preceded(tokens.COLON, localPart),
        (prefixPart, local) => [{ ['prefix']: prefixPart, ['URI']: null }, local]
);

export const qName: Parser<QNameAST> = or([prefixedName, unprefixedName]);

export const bracedURILiteral: Parser<string> = followed(
        precededMultiple(
                [tokens.Q_UPPER, whitespace, tokens.CURLY_BRACE_OPEN],
                map(star(regex(/[^{}]/)), (x) => x.join('').replace(/\s+/g, ' ').trim())
        ),
        tokens.CURLY_BRACE_CLOSE
);

const uriQualifiedName: Parser<[string, string]> = then(
        bracedURILiteral,
        ncName,
        (uri, localName) => [uri, localName]
);

export const eqName: Parser<QNameAST> = or([
        map(uriQualifiedName, (x) => [{ ['prefix']: null, ['URI']: x[0] }, x[1]]),
        qName,
]);

export const elementName = eqName;

export const elementNameOrWildCard: Parser<IAST> = or([
        map(elementName, (qname) => ['QName', ...qname] as IAST),
        map(tokens.ASTERIX, (_) => ['star']),
]);

export const varName: Parser<QNameAST> = eqName;

export const varRef: Parser<IAST> = map(preceded(tokens.DOLLAR, varName), (x) => [
        'varRef',
        ['name', ...x],
]);

1	import { followed, map, or, Parser, preceded, star, then } from 'prsc';	9✔
2	import { IAST } from './astHelper';
3	import { QNameAST } from './literalParser';
4	import { precededMultiple, regex } from './parsingFunctions';	9✔
5	import * as tokens from './tokens';	9✔
6	import { whitespace } from './whitespaceParser';	9✔
7
8	const ncNameStartChar: Parser<string> = or([	9✔
9	regex(
10	/[A-Z_a-z\xC0-\xD6\xD8-\xF6\xF8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/
11	),
12	then(regex(/[\uD800-\uDB7F]/), regex(/[\uDC00-\uDFFF]/), (a, b) => a + b),	×
13	]);
14
15	const ncNameChar: Parser<string> = or([	9✔
16	ncNameStartChar,
17	regex(/[\-\.0-9\xB7\u0300-\u036F\u203F\u2040]/),
18	]);
19
20	export const ncName: Parser<string> = then(	9✔
21	ncNameStartChar,
22	star(ncNameChar),
23	(a, b) => a + b.join('')	653,787✔
24	);
25
26	export const prefix: Parser<IAST> = map(ncName, (x) => ['prefix', x]);	9✔
27
28	const nameStartChar: Parser<string> = or([ncNameStartChar, tokens.COLON]);	9✔
29
30	const nameChar: Parser<string> = or([ncNameChar, tokens.COLON]);	9✔
31
32	export const name: Parser<string> = then(	9✔
33	nameStartChar,
34	star(nameChar),
UNCOV 35	(start, rest) => start + rest.join('')	×
36	);
37
38	const localPart: Parser<string> = ncName;	9✔
39
40	const unprefixedName: Parser<QNameAST> = map(localPart, (x) => [	278,379✔
41	{ ['prefix']: '', ['URI']: null },
42	x,
43	]);
44
45	const xmlPrefix: Parser<string> = ncName;	9✔
46
47	const prefixedName: Parser<QNameAST> = then(	9✔
48	xmlPrefix,
49	preceded(tokens.COLON, localPart),
50	(prefixPart, local) => [{ ['prefix']: prefixPart, ['URI']: null }, local]	19,110✔
51	);
52
53	export const qName: Parser<QNameAST> = or([prefixedName, unprefixedName]);	9✔
54
55	export const bracedURILiteral: Parser<string> = followed(	9✔
56	precededMultiple(
57	[tokens.Q_UPPER, whitespace, tokens.CURLY_BRACE_OPEN],
58	map(star(regex(/[^{}]/)), (x) => x.join('').replace(/\s+/g, ' ').trim())	450✔
59	),
60	tokens.CURLY_BRACE_CLOSE
61	);
62
63	const uriQualifiedName: Parser<[string, string]> = then(	9✔
64	bracedURILiteral,
65	ncName,
66	(uri, localName) => [uri, localName]	327✔
67	);
68
69	export const eqName: Parser<QNameAST> = or([	9✔
70	map(uriQualifiedName, (x) => [{ ['prefix']: null, ['URI']: x[0] }, x[1]]),	327✔
71	qName,
72	]);
73
74	export const elementName = eqName;	9✔
75
76	export const elementNameOrWildCard: Parser<IAST> = or([	9✔
77	map(elementName, (qname) => ['QName', ...qname] as IAST),	384✔
78	map(tokens.ASTERIX, (_) => ['star']),	117✔
79	]);
80
81	export const varName: Parser<QNameAST> = eqName;	9✔
82
83	export const varRef: Parser<IAST> = map(preceded(tokens.DOLLAR, varName), (x) => [	47,340✔
84	'varRef',
85	['name', ...x],
86	]);

FontoXML / fontoxpath / 4162522529

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous