@@ -9,65 +9,65 @@ |
||
9 | 9 | { |
10 | 10 | protected $precedenceMap = array( |
11 | 11 | // [precedence, associativity] where for the latter -1 is %left, 0 is %nonassoc and 1 is %right |
12 | - 'Expr_BinaryOp_Pow' => array( 0, 1), |
|
13 | - 'Expr_BitwiseNot' => array( 10, 1), |
|
14 | - 'Expr_PreInc' => array( 10, 1), |
|
15 | - 'Expr_PreDec' => array( 10, 1), |
|
16 | - 'Expr_PostInc' => array( 10, -1), |
|
17 | - 'Expr_PostDec' => array( 10, -1), |
|
18 | - 'Expr_UnaryPlus' => array( 10, 1), |
|
19 | - 'Expr_UnaryMinus' => array( 10, 1), |
|
20 | - 'Expr_Cast_Int' => array( 10, 1), |
|
21 | - 'Expr_Cast_Double' => array( 10, 1), |
|
22 | - 'Expr_Cast_String' => array( 10, 1), |
|
23 | - 'Expr_Cast_Array' => array( 10, 1), |
|
24 | - 'Expr_Cast_Object' => array( 10, 1), |
|
25 | - 'Expr_Cast_Bool' => array( 10, 1), |
|
26 | - 'Expr_Cast_Unset' => array( 10, 1), |
|
27 | - 'Expr_ErrorSuppress' => array( 10, 1), |
|
28 | - 'Expr_Instanceof' => array( 20, 0), |
|
29 | - 'Expr_BooleanNot' => array( 30, 1), |
|
30 | - 'Expr_BinaryOp_Mul' => array( 40, -1), |
|
31 | - 'Expr_BinaryOp_Div' => array( 40, -1), |
|
32 | - 'Expr_BinaryOp_Mod' => array( 40, -1), |
|
33 | - 'Expr_BinaryOp_Plus' => array( 50, -1), |
|
34 | - 'Expr_BinaryOp_Minus' => array( 50, -1), |
|
35 | - 'Expr_BinaryOp_Concat' => array( 50, -1), |
|
36 | - 'Expr_BinaryOp_ShiftLeft' => array( 60, -1), |
|
37 | - 'Expr_BinaryOp_ShiftRight' => array( 60, -1), |
|
38 | - 'Expr_BinaryOp_Smaller' => array( 70, 0), |
|
39 | - 'Expr_BinaryOp_SmallerOrEqual' => array( 70, 0), |
|
40 | - 'Expr_BinaryOp_Greater' => array( 70, 0), |
|
41 | - 'Expr_BinaryOp_GreaterOrEqual' => array( 70, 0), |
|
42 | - 'Expr_BinaryOp_Equal' => array( 80, 0), |
|
43 | - 'Expr_BinaryOp_NotEqual' => array( 80, 0), |
|
44 | - 'Expr_BinaryOp_Identical' => array( 80, 0), |
|
45 | - 'Expr_BinaryOp_NotIdentical' => array( 80, 0), |
|
46 | - 'Expr_BinaryOp_Spaceship' => array( 80, 0), |
|
47 | - 'Expr_BinaryOp_BitwiseAnd' => array( 90, -1), |
|
12 | + 'Expr_BinaryOp_Pow' => array(0, 1), |
|
13 | + 'Expr_BitwiseNot' => array(10, 1), |
|
14 | + 'Expr_PreInc' => array(10, 1), |
|
15 | + 'Expr_PreDec' => array(10, 1), |
|
16 | + 'Expr_PostInc' => array(10, -1), |
|
17 | + 'Expr_PostDec' => array(10, -1), |
|
18 | + 'Expr_UnaryPlus' => array(10, 1), |
|
19 | + 'Expr_UnaryMinus' => array(10, 1), |
|
20 | + 'Expr_Cast_Int' => array(10, 1), |
|
21 | + 'Expr_Cast_Double' => array(10, 1), |
|
22 | + 'Expr_Cast_String' => array(10, 1), |
|
23 | + 'Expr_Cast_Array' => array(10, 1), |
|
24 | + 'Expr_Cast_Object' => array(10, 1), |
|
25 | + 'Expr_Cast_Bool' => array(10, 1), |
|
26 | + 'Expr_Cast_Unset' => array(10, 1), |
|
27 | + 'Expr_ErrorSuppress' => array(10, 1), |
|
28 | + 'Expr_Instanceof' => array(20, 0), |
|
29 | + 'Expr_BooleanNot' => array(30, 1), |
|
30 | + 'Expr_BinaryOp_Mul' => array(40, -1), |
|
31 | + 'Expr_BinaryOp_Div' => array(40, -1), |
|
32 | + 'Expr_BinaryOp_Mod' => array(40, -1), |
|
33 | + 'Expr_BinaryOp_Plus' => array(50, -1), |
|
34 | + 'Expr_BinaryOp_Minus' => array(50, -1), |
|
35 | + 'Expr_BinaryOp_Concat' => array(50, -1), |
|
36 | + 'Expr_BinaryOp_ShiftLeft' => array(60, -1), |
|
37 | + 'Expr_BinaryOp_ShiftRight' => array(60, -1), |
|
38 | + 'Expr_BinaryOp_Smaller' => array(70, 0), |
|
39 | + 'Expr_BinaryOp_SmallerOrEqual' => array(70, 0), |
|
40 | + 'Expr_BinaryOp_Greater' => array(70, 0), |
|
41 | + 'Expr_BinaryOp_GreaterOrEqual' => array(70, 0), |
|
42 | + 'Expr_BinaryOp_Equal' => array(80, 0), |
|
43 | + 'Expr_BinaryOp_NotEqual' => array(80, 0), |
|
44 | + 'Expr_BinaryOp_Identical' => array(80, 0), |
|
45 | + 'Expr_BinaryOp_NotIdentical' => array(80, 0), |
|
46 | + 'Expr_BinaryOp_Spaceship' => array(80, 0), |
|
47 | + 'Expr_BinaryOp_BitwiseAnd' => array(90, -1), |
|
48 | 48 | 'Expr_BinaryOp_BitwiseXor' => array(100, -1), |
49 | 49 | 'Expr_BinaryOp_BitwiseOr' => array(110, -1), |
50 | 50 | 'Expr_BinaryOp_BooleanAnd' => array(120, -1), |
51 | 51 | 'Expr_BinaryOp_BooleanOr' => array(130, -1), |
52 | - 'Expr_BinaryOp_Coalesce' => array(140, 1), |
|
52 | + 'Expr_BinaryOp_Coalesce' => array(140, 1), |
|
53 | 53 | 'Expr_Ternary' => array(150, -1), |
54 | 54 | // parser uses %left for assignments, but they really behave as %right |
55 | - 'Expr_Assign' => array(160, 1), |
|
56 | - 'Expr_AssignRef' => array(160, 1), |
|
57 | - 'Expr_AssignOp_Plus' => array(160, 1), |
|
58 | - 'Expr_AssignOp_Minus' => array(160, 1), |
|
59 | - 'Expr_AssignOp_Mul' => array(160, 1), |
|
60 | - 'Expr_AssignOp_Div' => array(160, 1), |
|
61 | - 'Expr_AssignOp_Concat' => array(160, 1), |
|
62 | - 'Expr_AssignOp_Mod' => array(160, 1), |
|
63 | - 'Expr_AssignOp_BitwiseAnd' => array(160, 1), |
|
64 | - 'Expr_AssignOp_BitwiseOr' => array(160, 1), |
|
65 | - 'Expr_AssignOp_BitwiseXor' => array(160, 1), |
|
66 | - 'Expr_AssignOp_ShiftLeft' => array(160, 1), |
|
67 | - 'Expr_AssignOp_ShiftRight' => array(160, 1), |
|
68 | - 'Expr_AssignOp_Pow' => array(160, 1), |
|
69 | - 'Expr_YieldFrom' => array(165, 1), |
|
70 | - 'Expr_Print' => array(168, 1), |
|
55 | + 'Expr_Assign' => array(160, 1), |
|
56 | + 'Expr_AssignRef' => array(160, 1), |
|
57 | + 'Expr_AssignOp_Plus' => array(160, 1), |
|
58 | + 'Expr_AssignOp_Minus' => array(160, 1), |
|
59 | + 'Expr_AssignOp_Mul' => array(160, 1), |
|
60 | + 'Expr_AssignOp_Div' => array(160, 1), |
|
61 | + 'Expr_AssignOp_Concat' => array(160, 1), |
|
62 | + 'Expr_AssignOp_Mod' => array(160, 1), |
|
63 | + 'Expr_AssignOp_BitwiseAnd' => array(160, 1), |
|
64 | + 'Expr_AssignOp_BitwiseOr' => array(160, 1), |
|
65 | + 'Expr_AssignOp_BitwiseXor' => array(160, 1), |
|
66 | + 'Expr_AssignOp_ShiftLeft' => array(160, 1), |
|
67 | + 'Expr_AssignOp_ShiftRight' => array(160, 1), |
|
68 | + 'Expr_AssignOp_Pow' => array(160, 1), |
|
69 | + 'Expr_YieldFrom' => array(165, 1), |
|
70 | + 'Expr_Print' => array(168, 1), |
|
71 | 71 | 'Expr_BinaryOp_LogicalAnd' => array(170, -1), |
72 | 72 | 'Expr_BinaryOp_LogicalXor' => array(180, -1), |
73 | 73 | 'Expr_BinaryOp_LogicalOr' => array(190, -1), |
@@ -25,10 +25,10 @@ |
||
25 | 25 | $this->writer->startDocument('1.0', 'UTF-8'); |
26 | 26 | |
27 | 27 | $this->writer->startElement('AST'); |
28 | - $this->writer->writeAttribute('xmlns:node', 'http://nikic.github.com/PHPParser/XML/node'); |
|
29 | - $this->writer->writeAttribute('xmlns:subNode', 'http://nikic.github.com/PHPParser/XML/subNode'); |
|
28 | + $this->writer->writeAttribute('xmlns:node', 'http://nikic.github.com/PHPParser/XML/node'); |
|
29 | + $this->writer->writeAttribute('xmlns:subNode', 'http://nikic.github.com/PHPParser/XML/subNode'); |
|
30 | 30 | $this->writer->writeAttribute('xmlns:attribute', 'http://nikic.github.com/PHPParser/XML/attribute'); |
31 | - $this->writer->writeAttribute('xmlns:scalar', 'http://nikic.github.com/PHPParser/XML/scalar'); |
|
31 | + $this->writer->writeAttribute('xmlns:scalar', 'http://nikic.github.com/PHPParser/XML/scalar'); |
|
32 | 32 | |
33 | 33 | $this->_serialize($nodes); |
34 | 34 |
@@ -180,22 +180,22 @@ |
||
180 | 180 | } else { |
181 | 181 | echo "\n\n", '==========', "\n\n", 'There were: ', "\n"; |
182 | 182 | if (0 !== $parseFail) { |
183 | - echo ' ', $parseFail, ' parse failures.', "\n"; |
|
183 | + echo ' ', $parseFail, ' parse failures.', "\n"; |
|
184 | 184 | } |
185 | 185 | if (0 !== $ppFail) { |
186 | - echo ' ', $ppFail, ' pretty print failures.', "\n"; |
|
186 | + echo ' ', $ppFail, ' pretty print failures.', "\n"; |
|
187 | 187 | } |
188 | 188 | if (0 !== $compareFail) { |
189 | - echo ' ', $compareFail, ' compare failures.', "\n"; |
|
189 | + echo ' ', $compareFail, ' compare failures.', "\n"; |
|
190 | 190 | } |
191 | 191 | } |
192 | 192 | |
193 | 193 | echo "\n", |
194 | - 'Tested files: ', $count, "\n", |
|
194 | + 'Tested files: ', $count, "\n", |
|
195 | 195 | "\n", |
196 | - 'Reading files took: ', $readTime, "\n", |
|
197 | - 'Parsing took: ', $parseTime, "\n", |
|
198 | - 'Pretty printing took: ', $ppTime, "\n", |
|
196 | + 'Reading files took: ', $readTime, "\n", |
|
197 | + 'Parsing took: ', $parseTime, "\n", |
|
198 | + 'Pretty printing took: ', $ppTime, "\n", |
|
199 | 199 | 'Reparsing took: ', $reparseTime, "\n", |
200 | 200 | 'Comparing took: ', $compareTime, "\n", |
201 | 201 | "\n", |