yapp 5.1.225 → 5.1.227

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -15,15 +15,33 @@ const nameTerminalNodeQuery = Query.fromExpressionString("//name/@*"),
15
15
 
16
16
  export default class XMLProcessor extends Processor {
17
17
  process(tokens, node) {
18
- if (node !== null) {
19
- this.replaceTerminalNodesSignificantToken(tokens, node, (content) => ErrorToken, errorTerminalNodeQuery);
18
+ if (node === null) {
19
+ return;
20
+ }
20
21
 
21
- this.replaceTerminalNodesSignificantToken(tokens, node, (content) => NameToken, nameTerminalNodeQuery);
22
+ this.replaceTerminalNodesSignificantToken(tokens, node, (content) => {
23
+ const token = NameToken;
22
24
 
23
- this.replaceTerminalNodesSignificantToken(tokens, node, (content) => AttributeToken, attributeTerminalNodeQuery);
25
+ return token;
26
+ }, nameTerminalNodeQuery);
24
27
 
25
- this.replaceNonTerminalNodesSignificantTokens(tokens, node, (content) => CommentToken, commentNonTerminalNodeQuery);
26
- }
28
+ this.replaceTerminalNodesSignificantToken(tokens, node, (content) => {
29
+ const token = ErrorToken;
30
+
31
+ return token;
32
+ }, errorTerminalNodeQuery);
33
+
34
+ this.replaceTerminalNodesSignificantToken(tokens, node, (content) => {
35
+ const token = AttributeToken;
36
+
37
+ return token;
38
+ }, attributeTerminalNodeQuery);
39
+
40
+ this.replaceNonTerminalNodesSignificantTokens(tokens, node, (content) => {
41
+ const token = CommentToken;
42
+
43
+ return token;
44
+ }, commentNonTerminalNodeQuery);
27
45
  }
28
46
 
29
47
  static fromNothing() { return Processor.fromNothing(XMLProcessor); }
package/src/processor.js CHANGED
@@ -2,50 +2,9 @@
2
2
 
3
3
  import { Query } from "occam-query";
4
4
 
5
- import ErrorToken from "./token/significant/error";
6
-
7
- const terminalNodeQuery = Query.fromExpressionString("//@*"),
8
- errorTerminalNodeQuery = Query.fromExpressionString("/*/error/@*");
5
+ const terminalNodeQuery = Query.fromExpressionString("//@*");
9
6
 
10
7
  class Processor {
11
- process(tokens, node) {
12
- if (node !== null) {
13
- this.replaceTerminalNodesSignificantToken(tokens, node, (content) => ErrorToken, errorTerminalNodeQuery);
14
- }
15
- }
16
-
17
- replaceNonTerminalNodesSignificantTokens(tokens, node, callback, ...nonTerminalNodeQueries) {
18
- nonTerminalNodeQueries.forEach((nonTerminalNodeQuery) => {
19
- const nonTerminalNodes = nonTerminalNodeQuery.execute(node);
20
-
21
- nonTerminalNodes.forEach((nonTerminalNode) => this.replaceNonTerminalNodeSignificantTokens(nonTerminalNode, tokens, callback));
22
- });
23
- }
24
-
25
- replaceTerminalNodesSignificantToken(tokens, node, callback, ...terminalNodeQueries) {
26
- const contents = [];
27
-
28
- terminalNodeQueries.forEach((terminalNodeQuery) => {
29
- const terminalNodes = terminalNodeQuery.execute(node);
30
-
31
- terminalNodes.forEach((terminalNode) => {
32
- const content = this.replaceTerminalNodeSignificantToken(terminalNode, tokens, callback);
33
-
34
- if (content !== null) {
35
- contents.push(content);
36
- }
37
- });
38
- });
39
-
40
- return contents;
41
- }
42
-
43
- replaceNonTerminalNodeSignificantTokens(nonTerminalNode, tokens, callback) {
44
- const terminalNodes = terminalNodeQuery.execute(nonTerminalNode);
45
-
46
- terminalNodes.forEach((terminalNode) => this.replaceTerminalNodeSignificantToken(terminalNode, tokens, callback));
47
- }
48
-
49
8
  replaceTerminalNodeSignificantToken(terminalNode, tokens, callback) {
50
9
  let significantToken;
51
10
 
@@ -81,6 +40,42 @@ class Processor {
81
40
  return content;
82
41
  }
83
42
 
43
+ replaceTerminalNodesSignificantToken(tokens, node, callback, ...terminalNodeQueries) {
44
+ const contents = [];
45
+
46
+ terminalNodeQueries.forEach((terminalNodeQuery) => {
47
+ const terminalNodes = terminalNodeQuery.execute(node);
48
+
49
+ terminalNodes.forEach((terminalNode) => {
50
+ const content = this.replaceTerminalNodeSignificantToken(terminalNode, tokens, callback);
51
+
52
+ if (content !== null) {
53
+ contents.push(content);
54
+ }
55
+ });
56
+ });
57
+
58
+ return contents;
59
+ }
60
+
61
+ replaceNonTerminalNodeSignificantTokens(nonTerminalNode, tokens, callback) {
62
+ const terminalNodes = terminalNodeQuery.execute(nonTerminalNode);
63
+
64
+ terminalNodes.forEach((terminalNode) => {
65
+ this.replaceTerminalNodeSignificantToken(terminalNode, tokens, callback);
66
+ });
67
+ }
68
+
69
+ replaceNonTerminalNodesSignificantTokens(tokens, node, callback, ...nonTerminalNodeQueries) {
70
+ nonTerminalNodeQueries.forEach((nonTerminalNodeQuery) => {
71
+ const nonTerminalNodes = nonTerminalNodeQuery.execute(node);
72
+
73
+ nonTerminalNodes.forEach((nonTerminalNode) => {
74
+ this.replaceNonTerminalNodeSignificantTokens(nonTerminalNode, tokens, callback);
75
+ });
76
+ });
77
+ }
78
+
84
79
  static fromNothing(Class) { return new Class(); }
85
80
  }
86
81