diff --git a/README.md b/README.md index d940837d..535fc494 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,7 @@ PHP Parser This is a PHP parser written in PHP. It's purpose is to simplify static code analysis and manipulation. -***Note: This project is work in progress. It is known to not function perfectly correct yet (see -the "Known Issues" section at the end of this document).*** +***Note: This project is highly experimental. It may not always function correctly.*** Components ========== @@ -19,33 +18,34 @@ This package currently bundles several components: Parser and ParserDebug ---------------------- -Parsing is performed using `Parser->parse()`. This method accepts a `Lexer` as the only parameter -and returns an array of statement nodes. If an error occurs it throws a ParseErrorException. +Parsing is performed using `PHPParser_Parser->parse()`. This method accepts a `PHPParser_Lexer` +as the only parameter and returns an array of statement nodes. If an error occurs it throws a +PHPParser_ParseErrorException. $code = 'parse(new Lexer($code)); - } catch (ParseErrorException $e) { + $parser = new PHPParser_Parser; + $stmts = $parser->parse(new PHPParser_Lexer($code)); + } catch (PHPParser_ParseErrorException $e) { echo 'Parse Error: ', $e->getMessage(); } -The `ParserDebug` class also parses a PHP code, but outputs a debug trace while doing so. +The `PHPParser_ParserDebug` class also parses a PHP code, but outputs a debug trace while doing so. Node Tree --------- -The output of the parser is an array of statement nodes. All nodes are instances of `NodeAbstract`. -Furthermore nodes are divided into three categories: +The output of the parser is an array of statement nodes. All nodes are instances of +`PHPParser_NodeAbstract`. Furthermore nodes are divided into three categories: - * `Node_Stmt`: A statement - * `Node_Expr`: An expression - * `Node_Scalar`: A scalar (which is a string, a number, aso.) - `Node_Scalar` inherits from `Node_Expr`. + * `PHPParser_Node_Stmt`: A statement + * `PHPParser_Node_Expr`: An expression + * `PHPParser_Node_Scalar`: A scalar (which is a string, a number, aso.) + `PHPParser_Node_Scalar` inherits from `PHPParser_Node_Expr`. -Each node may have subnodes. For example `Node_Expr_Plus` has two subnodes, namely `left` and -`right`, which represend the left hand side and right hand side expressions of the plus operation. +Each node may have subnodes. For example `PHPParser_Node_Expr_Plus` has two subnodes, namely `left` +and `right`, which represend the left hand side and right hand side expressions of the plus operation. Subnodes are accessed as normal properties: $node->left @@ -56,7 +56,7 @@ respective files. NodeDumper ---------- -Nodes can be dumped into a string representation using the `NodeDumper->dump()` method: +Nodes can be dumped into a string representation using the `PHPParser_NodeDumper->dump()` method: $code = <<<'CODE' dump()` CODE; try { - $parser = new Parser; - $stmts = $parser->parse(new Lexer($code)); + $parser = new PHPParser_Parser; + $stmts = $parser->parse(new PHPParser_Lexer($code)); - $nodeDumper = new NodeDumper; + $nodeDumper = new PHPParser_NodeDumper; echo '
' . htmlspecialchars($nodeDumper->dump($stmts)) . '
'; - } catch (ParseErrorException $e) { + } catch (PHPParser_ParseErrorException $e) { echo 'Parse Error: ', $e->getMessage(); } @@ -132,7 +132,7 @@ PrettyPrinter The pretty printer compiles nodes back to PHP code. "Pretty printing" here is just the formal name of the process and does not mean that the output is in any way pretty. - $prettyPrinter = new PrettyPrinter_Zend; + $prettyPrinter = new PHPParser_PrettyPrinter_Zend; echo '
' . htmlspecialchars($prettyPrinter->prettyPrint($stmts)) . '
'; For the code mentioned in the above section this should create the output: @@ -141,7 +141,4 @@ For the code mentioned in the above section this should create the output: { echo $msg, "\n"; } - printLine('Hallo World!!!'); - -Known Issues -============ + printLine('Hallo World!!!'); \ No newline at end of file diff --git a/grammar/php.kmyacc b/grammar/php.kmyacc index b4b3b62f..b60c78a0 100644 --- a/grammar/php.kmyacc +++ b/grammar/php.kmyacc @@ -142,11 +142,11 @@ class YYParser * Parses PHP code into a node tree and prints out debugging information. #endif * - * @param Lexer $lex A lexer + * @param PHPParser_Lexer $lex A lexer * * @return array Array of statements */ - public function parse(Lexer $lex) { + public function parse(PHPParser_Lexer $lex) { $this->yyastk = array(); $yysstk = array(); $this->yysp = 0; @@ -230,11 +230,11 @@ class YYParser #endif try { if ('HALT_COMPILER' === $this->{'yyn' . $yyn}()) { - $this->yyval = new Node_Stmt_HaltCompiler( + $this->yyval = new PHPParser_Node_Stmt_HaltCompiler( array('remaining' => $lex->handleHaltCompiler()) ); } - } catch (ParseErrorException $e) { + } catch (PHPParser_ParseErrorException $e) { $e->setRawLine($lex->getLine()); throw $e; @@ -260,7 +260,7 @@ class YYParser /*switch ($yyerrflag) { case 0:*/ #endif - throw new ParseErrorException( + throw new PHPParser_ParseErrorException( 'Unexpected token ' . self::$yyterminals[$yychar], $lex->getLine() ); diff --git a/grammar/preprocessor.php b/grammar/preprocessor.php index 67d417a4..341aecd0 100644 --- a/grammar/preprocessor.php +++ b/grammar/preprocessor.php @@ -36,7 +36,7 @@ echo '
';
 
 $code = file_get_contents(IN);
 
-$code = preg_replace('~[A-Z][a-zA-Z_]++::~', 'Node_$0', $code);
+$code = preg_replace('~[A-Z][a-zA-Z_]++::~', 'PHPParser_Node_$0', $code);
 $code = resolveNodes($code);
 $code = resolveMacros($code);
 
@@ -63,7 +63,7 @@ function resolveNodes($code) {
                 $paramCodes[] = '\'' . $key . '\' => ' . $value;
             }
 
-            return 'new Node_' . $matches['name'] . '(array(' . implode(', ', $paramCodes) . '))';
+            return 'new PHPParser_Node_' . $matches['name'] . '(array(' . implode(', ', $paramCodes) . '))';
         },
         $code
     );
diff --git a/grammar/rebuildParser.php b/grammar/rebuildParser.php
index 706ce4a2..c174ab66 100644
--- a/grammar/rebuildParser.php
+++ b/grammar/rebuildParser.php
@@ -3,7 +3,7 @@
 echo '
';
 
 echo 'Building parser. Output: "',
-     `kmyacc -l -v -L c -m php.kmyacc -p Parser zend_language_parser.phpy`,
+     `kmyacc -l -v -L c -m php.kmyacc -p PHPParser_Parser zend_language_parser.phpy`,
      '"', "\n";
 
 $source = file_get_contents('y.tab.c');
@@ -13,12 +13,12 @@ $source = str_replace(
     $source
 );
 
-echo 'Moving parser to lib/Parser.php.', "\n";
-file_put_contents(dirname(__DIR__) . '/lib/Parser.php', $source);
+echo 'Moving parser to lib/PHPParser/Parser.php.', "\n";
+file_put_contents(dirname(__DIR__) . '/lib/PHPParser/Parser.php', $source);
 unlink(__DIR__ . '/y.tab.c');
 
 echo 'Building debug parser. Output: "',
-     `kmyacc -l -v -t -L c -m php.kmyacc -p ParserDebug zend_language_parser.phpy`,
+     `kmyacc -l -v -t -L c -m php.kmyacc -p PHPParser_ParserDebug zend_language_parser.phpy`,
      '"', "\n";
 
 $source = file_get_contents('y.tab.c');
@@ -34,8 +34,8 @@ $source = str_replace(
     $source
 );
 
-echo 'Moving debug parser to lib/ParserDebug.php.', "\n";
-file_put_contents(dirname(__DIR__) . '/lib/ParserDebug.php', $source);
+echo 'Moving debug parser to lib/PHPParser/ParserDebug.php.', "\n";
+file_put_contents(dirname(__DIR__) . '/lib/PHPParser/ParserDebug.php', $source);
 unlink(__DIR__ . '/y.tab.c');
 
 echo 'Done.';
diff --git a/grammar/y.output b/grammar/y.output
index 39496e18..c8f9c940 100644
--- a/grammar/y.output
+++ b/grammar/y.output
@@ -1530,8 +1530,8 @@ state 15
 	.		reduce (93)
 
 state 16
-	(24) inner_statement_list : inner_statement_list . inner_statement
 	(105) new_else_single : T_ELSE ':' inner_statement_list .
+	(24) inner_statement_list : inner_statement_list . inner_statement
 
 	T_INCLUDE	shift 56
 	T_INCLUDE_ONCE	shift 57
@@ -1730,8 +1730,8 @@ state 17
 	.		reduce (92)
 
 state 18
-	(24) inner_statement_list : inner_statement_list . inner_statement
 	(101) new_elseif_list : new_elseif_list T_ELSEIF '(' expr ')' ':' inner_statement_list .
+	(24) inner_statement_list : inner_statement_list . inner_statement
 
 	T_INCLUDE	shift 56
 	T_INCLUDE_ONCE	shift 57
@@ -11966,6 +11966,7 @@ state 163
 	.		error
 
 state 164
+	(101) new_elseif_list : new_elseif_list T_ELSEIF '(' expr . ')' ':' inner_statement_list
 	(181) expr : expr . T_BOOLEAN_OR expr
 	(182) expr : expr . T_BOOLEAN_AND expr
 	(183) expr : expr . T_LOGICAL_OR expr
@@ -11993,7 +11994,6 @@ state 164
 	(209) expr : expr . T_INSTANCEOF class_name_reference
 	(211) expr : expr . '?' expr ':' expr
 	(212) expr : expr . '?' ':' expr
-	(101) new_elseif_list : new_elseif_list T_ELSEIF '(' expr . ')' ':' inner_statement_list
 
 	T_LOGICAL_OR	shift 83
 	T_LOGICAL_XOR	shift 84
@@ -16273,8 +16273,8 @@ state 305
 	.		reduce (102)
 
 state 306
-	(32) statement : T_IF '(' expr ')' ':' inner_statement_list new_elseif_list . new_else_single T_ENDIF ';'
 	(101) new_elseif_list : new_elseif_list . T_ELSEIF '(' expr ')' ':' inner_statement_list
+	(32) statement : T_IF '(' expr ')' ':' inner_statement_list new_elseif_list . new_else_single T_ENDIF ';'
 	(104) new_else_single : .
 
 	T_ELSEIF	shift 493
@@ -17399,9 +17399,9 @@ state 443
 	.		error
 
 state 444
+	(106) parameter_list : non_empty_parameter_list .
 	(110) non_empty_parameter_list : non_empty_parameter_list . ',' optional_class_type optional_ref T_VARIABLE
 	(111) non_empty_parameter_list : non_empty_parameter_list . ',' optional_class_type optional_ref T_VARIABLE '=' static_scalar
-	(106) parameter_list : non_empty_parameter_list .
 
 	','		shift 262
 	.		reduce (106)
@@ -19432,4 +19432,4 @@ Statistics for zend_language_parser.phpy:
 	3815 items
 	1124 lookahead sets used
 	13442+794=14236 action entries
-	228096 bytes used
+	229400 bytes used
diff --git a/grammar/zend_language_parser.phpy b/grammar/zend_language_parser.phpy
index a6992212..dc1d44b6 100644
--- a/grammar/zend_language_parser.phpy
+++ b/grammar/zend_language_parser.phpy
@@ -113,7 +113,7 @@ top_statement_list:
 ;
 
 namespace_name:
-    namespace_name_sub                                      { $$ = new Node_Name(array('parts' => $1)); }
+    namespace_name_sub                                      { $$ = new PHPParser_Node_Name(array('parts' => $1)); }
 ;
 
 namespace_name_sub:
@@ -126,11 +126,11 @@ top_statement:
     | function_declaration_statement                        { $$ = $1; }
     | class_declaration_statement                           { $$ = $1; }
     | T_HALT_COMPILER                                       { return 'HALT_COMPILER'; }
-    | T_NAMESPACE namespace_name ';'                        { $$ = new Node_Stmt_Namespace(array('ns' => $2)); }
-    | T_NAMESPACE namespace_name '{' top_statement_list '}' { $$ = array(new Node_Stmt_Namespace(array('ns' => $2)), $4); }
-    | T_NAMESPACE '{' top_statement_list '}'                { $$ = array(new Node_Stmt_Namespace(array('ns' => null)), $3); }
-    | T_USE use_declarations ';'                            { $$ = new Node_Stmt_Use(array('uses' => $2)); }
-    | constant_declaration ';'                              { $$ = new Node_Stmt_Const(array('consts' => $1)); }
+    | T_NAMESPACE namespace_name ';'                        { $$ = new PHPParser_Node_Stmt_Namespace(array('ns' => $2)); }
+    | T_NAMESPACE namespace_name '{' top_statement_list '}' { $$ = array(new PHPParser_Node_Stmt_Namespace(array('ns' => $2)), $4); }
+    | T_NAMESPACE '{' top_statement_list '}'                { $$ = array(new PHPParser_Node_Stmt_Namespace(array('ns' => null)), $3); }
+    | T_USE use_declarations ';'                            { $$ = new PHPParser_Node_Stmt_Use(array('uses' => $2)); }
+    | constant_declaration ';'                              { $$ = new PHPParser_Node_Stmt_Const(array('consts' => $1)); }
 ;
 
 use_declarations:
@@ -139,15 +139,15 @@ use_declarations:
 ;
 
 use_declaration:
-      namespace_name                                        { $$ = new Node_Stmt_UseUse(array('ns' => $1, 'alias' => null)); }
-    | namespace_name T_AS T_STRING                          { $$ = new Node_Stmt_UseUse(array('ns' => $1, 'alias' => $3)); }
-    | T_NS_SEPARATOR namespace_name                         { $$ = new Node_Stmt_UseUse(array('ns' => $2, 'alias' => null)); }
-    | T_NS_SEPARATOR namespace_name T_AS T_STRING           { $$ = new Node_Stmt_UseUse(array('ns' => $2, 'alias' => $4)); }
+      namespace_name                                        { $$ = new PHPParser_Node_Stmt_UseUse(array('ns' => $1, 'alias' => null)); }
+    | namespace_name T_AS T_STRING                          { $$ = new PHPParser_Node_Stmt_UseUse(array('ns' => $1, 'alias' => $3)); }
+    | T_NS_SEPARATOR namespace_name                         { $$ = new PHPParser_Node_Stmt_UseUse(array('ns' => $2, 'alias' => null)); }
+    | T_NS_SEPARATOR namespace_name T_AS T_STRING           { $$ = new PHPParser_Node_Stmt_UseUse(array('ns' => $2, 'alias' => $4)); }
 ;
 
 constant_declaration:
-      constant_declaration ',' T_STRING '=' static_scalar   { $1[] = new Node_Stmt_ConstConst(array('name' => $3, 'value' => $5)); $$ = $1; }
-    | T_CONST T_STRING '=' static_scalar                    { $$ = array(new Node_Stmt_ConstConst(array('name' => $2, 'value' => $4))); }
+      constant_declaration ',' T_STRING '=' static_scalar   { $1[] = new PHPParser_Node_Stmt_ConstConst(array('name' => $3, 'value' => $5)); $$ = $1; }
+    | T_CONST T_STRING '=' static_scalar                    { $$ = array(new PHPParser_Node_Stmt_ConstConst(array('name' => $2, 'value' => $4))); }
 ;
 
 inner_statement_list:
@@ -164,38 +164,38 @@ inner_statement:
 
 statement:
       '{' inner_statement_list '}'                          { $$ = $2; }
-    | T_IF '(' expr ')' statement elseif_list else_single   { $$ = new Node_Stmt_If(array('cond' => $3, 'stmts' => is_array($5) ? $5 : array($5), 'elseifList' => $6, 'else' => $7)); }
+    | T_IF '(' expr ')' statement elseif_list else_single   { $$ = new PHPParser_Node_Stmt_If(array('cond' => $3, 'stmts' => is_array($5) ? $5 : array($5), 'elseifList' => $6, 'else' => $7)); }
     | T_IF '(' expr ')' ':' inner_statement_list new_elseif_list new_else_single T_ENDIF ';'
-          { $$ = new Node_Stmt_If(array('cond' => $3, 'stmts' => $6, 'elseifList' => $7, 'else' => $8)); }
-    | T_WHILE '(' expr ')' while_statement                  { $$ = new Node_Stmt_While(array('cond' => $3, 'stmts' => is_array($5) ? $5 : array($5))); }
-    | T_DO statement T_WHILE '(' expr ')' ';'               { $$ = new Node_Stmt_Do(array('stmts' => is_array($2) ? $2 : array($2), 'cond' => $5)); }
+          { $$ = new PHPParser_Node_Stmt_If(array('cond' => $3, 'stmts' => $6, 'elseifList' => $7, 'else' => $8)); }
+    | T_WHILE '(' expr ')' while_statement                  { $$ = new PHPParser_Node_Stmt_While(array('cond' => $3, 'stmts' => is_array($5) ? $5 : array($5))); }
+    | T_DO statement T_WHILE '(' expr ')' ';'               { $$ = new PHPParser_Node_Stmt_Do(array('stmts' => is_array($2) ? $2 : array($2), 'cond' => $5)); }
     | T_FOR '(' for_expr ';'  for_expr ';' for_expr ')' for_statement
-          { $$ = new Node_Stmt_For(array('init' => $3, 'cond' => $5, 'loop' => $7, 'stmts' => is_array($9) ? $9 : array($9))); }
-    | T_SWITCH '(' expr ')' switch_case_list                { $$ = new Node_Stmt_Switch(array('cond' => $3, 'caseList' => $5)); }
-    | T_BREAK ';'                                           { $$ = new Node_Stmt_Break(array('num' => null)); }
-    | T_BREAK expr ';'                                      { $$ = new Node_Stmt_Break(array('num' => $2)); }
-    | T_CONTINUE ';'                                        { $$ = new Node_Stmt_Continue(array('num' => null)); }
-    | T_CONTINUE expr ';'                                   { $$ = new Node_Stmt_Continue(array('num' => $2)); }
-    | T_RETURN ';'                                          { $$ = new Node_Stmt_Return(array('expr' => null)); }
-    | T_RETURN expr ';'                                     { $$ = new Node_Stmt_Return(array('expr' => $2)); }
-    | T_GLOBAL global_var_list ';'                          { $$ = new Node_Stmt_Global(array('vars' => $2)); }
-    | T_STATIC static_var_list ';'                          { $$ = new Node_Stmt_Static(array('vars' => $2)); }
-    | T_ECHO expr_list ';'                                  { $$ = new Node_Stmt_Echo(array('exprs' => $2)); }
-    | T_INLINE_HTML                                         { $$ = new Node_Stmt_InlineHTML(array('value' => $1)); }
+          { $$ = new PHPParser_Node_Stmt_For(array('init' => $3, 'cond' => $5, 'loop' => $7, 'stmts' => is_array($9) ? $9 : array($9))); }
+    | T_SWITCH '(' expr ')' switch_case_list                { $$ = new PHPParser_Node_Stmt_Switch(array('cond' => $3, 'caseList' => $5)); }
+    | T_BREAK ';'                                           { $$ = new PHPParser_Node_Stmt_Break(array('num' => null)); }
+    | T_BREAK expr ';'                                      { $$ = new PHPParser_Node_Stmt_Break(array('num' => $2)); }
+    | T_CONTINUE ';'                                        { $$ = new PHPParser_Node_Stmt_Continue(array('num' => null)); }
+    | T_CONTINUE expr ';'                                   { $$ = new PHPParser_Node_Stmt_Continue(array('num' => $2)); }
+    | T_RETURN ';'                                          { $$ = new PHPParser_Node_Stmt_Return(array('expr' => null)); }
+    | T_RETURN expr ';'                                     { $$ = new PHPParser_Node_Stmt_Return(array('expr' => $2)); }
+    | T_GLOBAL global_var_list ';'                          { $$ = new PHPParser_Node_Stmt_Global(array('vars' => $2)); }
+    | T_STATIC static_var_list ';'                          { $$ = new PHPParser_Node_Stmt_Static(array('vars' => $2)); }
+    | T_ECHO expr_list ';'                                  { $$ = new PHPParser_Node_Stmt_Echo(array('exprs' => $2)); }
+    | T_INLINE_HTML                                         { $$ = new PHPParser_Node_Stmt_InlineHTML(array('value' => $1)); }
     | expr ';'                                              { $$ = $1; }
-    | T_UNSET '(' variables_list ')' ';'                    { $$ = new Node_Stmt_Unset(array('vars' => $3)); }
+    | T_UNSET '(' variables_list ')' ';'                    { $$ = new PHPParser_Node_Stmt_Unset(array('vars' => $3)); }
     | T_FOREACH '(' expr T_AS variable ')' foreach_statement
-          { $$ = new Node_Stmt_Foreach(array('expr' => $3, 'keyVar' => null, 'byRef' => false, 'valueVar' => $5, 'stmts' => is_array($7) ? $7 : array($7))); }
+          { $$ = new PHPParser_Node_Stmt_Foreach(array('expr' => $3, 'keyVar' => null, 'byRef' => false, 'valueVar' => $5, 'stmts' => is_array($7) ? $7 : array($7))); }
     | T_FOREACH '(' expr T_AS '&' variable ')' foreach_statement
-          { $$ = new Node_Stmt_Foreach(array('expr' => $3, 'keyVar' => null, 'byRef' => true, 'valueVar' => $6, 'stmts' => is_array($8) ? $8 : array($8))); }
+          { $$ = new PHPParser_Node_Stmt_Foreach(array('expr' => $3, 'keyVar' => null, 'byRef' => true, 'valueVar' => $6, 'stmts' => is_array($8) ? $8 : array($8))); }
     | T_FOREACH '(' expr T_AS variable T_DOUBLE_ARROW optional_ref variable ')' foreach_statement
-          { $$ = new Node_Stmt_Foreach(array('expr' => $3, 'keyVar' => $5, 'byRef' => $7, 'valueVar' => $8, 'stmts' => is_array($10) ? $10 : array($10))); }
-    | T_DECLARE '(' declare_list ')' declare_statement      { $$ = new Node_Stmt_Declare(array('declares' => $3, 'stmts' => is_array($5) ? $5 : array($5))); }
+          { $$ = new PHPParser_Node_Stmt_Foreach(array('expr' => $3, 'keyVar' => $5, 'byRef' => $7, 'valueVar' => $8, 'stmts' => is_array($10) ? $10 : array($10))); }
+    | T_DECLARE '(' declare_list ')' declare_statement      { $$ = new PHPParser_Node_Stmt_Declare(array('declares' => $3, 'stmts' => is_array($5) ? $5 : array($5))); }
     | ';'                                                   { $$ = array(); /* means: no statement */ }
-    | T_TRY '{' inner_statement_list '}' catches            { $$ = new Node_Stmt_TryCatch(array('stmts' => $3, 'catches' => $5)); }
-    | T_THROW expr ';'                                      { $$ = new Node_Stmt_Throw(array('expr' => $2)); }
-    | T_GOTO T_STRING ';'                                   { $$ = new Node_Stmt_Goto(array('name' => $2)); }
-    | T_STRING ':'                                          { $$ = new Node_Stmt_Label(array('name' => $1)); }
+    | T_TRY '{' inner_statement_list '}' catches            { $$ = new PHPParser_Node_Stmt_TryCatch(array('stmts' => $3, 'catches' => $5)); }
+    | T_THROW expr ';'                                      { $$ = new PHPParser_Node_Stmt_Throw(array('expr' => $2)); }
+    | T_GOTO T_STRING ';'                                   { $$ = new PHPParser_Node_Stmt_Goto(array('name' => $2)); }
+    | T_STRING ':'                                          { $$ = new PHPParser_Node_Stmt_Label(array('name' => $1)); }
 ;
 
 catches:
@@ -205,7 +205,7 @@ catches:
 
 catch:
     T_CATCH '(' name T_VARIABLE ')' '{' inner_statement_list '}'
-        { $$ = new Node_Stmt_Catch(array('type' => $3, 'var' => substr($4, 1), 'stmts' => $7)); }
+        { $$ = new PHPParser_Node_Stmt_Catch(array('type' => $3, 'var' => substr($4, 1), 'stmts' => $7)); }
 ;
 
 variables_list:
@@ -220,20 +220,20 @@ optional_ref:
 
 function_declaration_statement:
     T_FUNCTION optional_ref T_STRING '(' parameter_list ')' '{' inner_statement_list '}'
-        { $$ = new Node_Stmt_Func(array('byRef' => $2, 'name' => $3, 'params' => $5, 'stmts' => $8)); }
+        { $$ = new PHPParser_Node_Stmt_Func(array('byRef' => $2, 'name' => $3, 'params' => $5, 'stmts' => $8)); }
 ;
 
 class_declaration_statement:
       class_entry_type T_STRING extends_from implements_list '{' class_statement_list '}'
-          { $$ = new Node_Stmt_Class(array('type' => $1, 'name' => $2, 'extends' => $3, 'implements' => $4, 'stmts' => $6)); }
+          { $$ = new PHPParser_Node_Stmt_Class(array('type' => $1, 'name' => $2, 'extends' => $3, 'implements' => $4, 'stmts' => $6)); }
     | T_INTERFACE T_STRING interface_extends_list '{' class_statement_list '}'
-          { $$ = new Node_Stmt_Interface(array('name' => $2, 'extends' => $3, 'stmts' => $5)); }
+          { $$ = new PHPParser_Node_Stmt_Interface(array('name' => $2, 'extends' => $3, 'stmts' => $5)); }
 ;
 
 class_entry_type:
       T_CLASS                                               { $$ = 0; }
-    | T_ABSTRACT T_CLASS                                    { $$ = Node_Stmt_Class::MODIFIER_ABSTRACT; }
-    | T_FINAL T_CLASS                                       { $$ = Node_Stmt_Class::MODIFIER_FINAL; }
+    | T_ABSTRACT T_CLASS                                    { $$ = PHPParser_Node_Stmt_Class::MODIFIER_ABSTRACT; }
+    | T_FINAL T_CLASS                                       { $$ = PHPParser_Node_Stmt_Class::MODIFIER_FINAL; }
 ;
 
 extends_from:
@@ -272,8 +272,8 @@ declare_statement:
 ;
 
 declare_list:
-      T_STRING '=' static_scalar                            { $$ = array(new Node_Stmt_DeclareDeclare(array('key' => $1, 'value' => $3))); }
-    | declare_list ',' T_STRING '=' static_scalar           { $1[] = new Node_Stmt_DeclareDeclare(array('key' => $3, 'value' => $5)); $$ = $1; }
+      T_STRING '=' static_scalar                            { $$ = array(new PHPParser_Node_Stmt_DeclareDeclare(array('key' => $1, 'value' => $3))); }
+    | declare_list ',' T_STRING '=' static_scalar           { $1[] = new PHPParser_Node_Stmt_DeclareDeclare(array('key' => $3, 'value' => $5)); $$ = $1; }
 ;
 
 switch_case_list:
@@ -286,9 +286,9 @@ switch_case_list:
 case_list:
       /* empty */                                           { $$ = array(); }
     | case_list T_CASE expr case_separator inner_statement_list
-          { $1[] = new Node_Stmt_Case(array('cond' => $3, 'stmts' => $5)); $$ = $1; }
+          { $1[] = new PHPParser_Node_Stmt_Case(array('cond' => $3, 'stmts' => $5)); $$ = $1; }
     | case_list T_DEFAULT case_separator inner_statement_list
-          { $1[] = new Node_Stmt_Case(array('cond' => null, 'stmts' => $4)); $$ = $1; }
+          { $1[] = new PHPParser_Node_Stmt_Case(array('cond' => null, 'stmts' => $4)); $$ = $1; }
 ;
 
 case_separator:
@@ -303,23 +303,23 @@ while_statement:
 
 elseif_list:
       /* empty */                                           { $$ = array();}
-    | elseif_list T_ELSEIF '(' expr ')' statement           { $1[] = new Node_Stmt_ElseIf(array('cond' => $4, 'stmts' => is_array($6) ? $6 : array($6))); $$ = $1; }
+    | elseif_list T_ELSEIF '(' expr ')' statement           { $1[] = new PHPParser_Node_Stmt_ElseIf(array('cond' => $4, 'stmts' => is_array($6) ? $6 : array($6))); $$ = $1; }
 ;
 
 new_elseif_list:
       /* empty */                                           { $$ = array(); }
     | new_elseif_list T_ELSEIF '(' expr ')' ':' inner_statement_list
-          { $1[] = new Node_Stmt_ElseIf(array('cond' => $4, 'stmts' => $7)); $$ = $1; }
+          { $1[] = new PHPParser_Node_Stmt_ElseIf(array('cond' => $4, 'stmts' => $7)); $$ = $1; }
 ;
 
 else_single:
       /* empty */                                           { $$ = null; }
-    | T_ELSE statement                                      { $$ = new Node_Stmt_Else(array('stmts' => is_array($2) ? $2 : array($2))); }
+    | T_ELSE statement                                      { $$ = new PHPParser_Node_Stmt_Else(array('stmts' => is_array($2) ? $2 : array($2))); }
 ;
 
 new_else_single:
       /* empty */                                           { $$ = null; }
-    | T_ELSE ':' inner_statement_list                       { $$ = new Node_Stmt_Else(array('stmts' => $3)); }
+    | T_ELSE ':' inner_statement_list                       { $$ = new PHPParser_Node_Stmt_Else(array('stmts' => $3)); }
 ;
 
 parameter_list:
@@ -329,13 +329,13 @@ parameter_list:
 
 non_empty_parameter_list:
       optional_class_type optional_ref T_VARIABLE
-          { $$ = array(new Node_Stmt_FuncParam(array('type' => $1, 'name' => substr($3, 1), 'byRef' => $2, 'default' => null))); }
+          { $$ = array(new PHPParser_Node_Stmt_FuncParam(array('type' => $1, 'name' => substr($3, 1), 'byRef' => $2, 'default' => null))); }
     | optional_class_type optional_ref T_VARIABLE '=' static_scalar
-          { $$ = array(new Node_Stmt_FuncParam(array('type' => $1, 'name' => substr($3, 1), 'byRef' => $2, 'default' => $5))); }
+          { $$ = array(new PHPParser_Node_Stmt_FuncParam(array('type' => $1, 'name' => substr($3, 1), 'byRef' => $2, 'default' => $5))); }
     | non_empty_parameter_list ',' optional_class_type optional_ref T_VARIABLE
-          { $1[] = new Node_Stmt_FuncParam(array('type' => $3, 'name' => substr($5, 1), 'byRef' => $4, 'default' => null)); $$ = $1; }
+          { $1[] = new PHPParser_Node_Stmt_FuncParam(array('type' => $3, 'name' => substr($5, 1), 'byRef' => $4, 'default' => null)); $$ = $1; }
     | non_empty_parameter_list ',' optional_class_type optional_ref T_VARIABLE '=' static_scalar
-          { $1[] = new Node_Stmt_FuncParam(array('type' => $3, 'name' => substr($5, 1), 'byRef' => $4, 'default' => $7)); $$ = $1; }
+          { $1[] = new PHPParser_Node_Stmt_FuncParam(array('type' => $3, 'name' => substr($5, 1), 'byRef' => $4, 'default' => $7)); $$ = $1; }
 ;
 
 optional_class_type:
@@ -350,12 +350,12 @@ function_call_argument_list:
 ;
 
 non_empty_function_call_argument_list:
-      expr                                                  { $$ = array(new Node_Expr_FuncCallArg(array('value' => $1, 'byRef' => false))); }
-    | '&' variable                                          { $$ = array(new Node_Expr_FuncCallArg(array('value' => $2, 'byRef' => true))); }
+      expr                                                  { $$ = array(new PHPParser_Node_Expr_FuncCallArg(array('value' => $1, 'byRef' => false))); }
+    | '&' variable                                          { $$ = array(new PHPParser_Node_Expr_FuncCallArg(array('value' => $2, 'byRef' => true))); }
     | non_empty_function_call_argument_list ',' expr
-          { $1[] = new Node_Expr_FuncCallArg(array('value' => $3, 'byRef' => false)); $$ = $1; }
+          { $1[] = new PHPParser_Node_Expr_FuncCallArg(array('value' => $3, 'byRef' => false)); $$ = $1; }
     | non_empty_function_call_argument_list ',' '&' variable
-          { $1[] = new Node_Expr_FuncCallArg(array('value' => $4, 'byRef' => true)); $$ = $1; }
+          { $1[] = new PHPParser_Node_Expr_FuncCallArg(array('value' => $4, 'byRef' => true)); $$ = $1; }
 ;
 
 global_var_list:
@@ -364,16 +364,16 @@ global_var_list:
 ;
 
 global_var:
-      T_VARIABLE                                            { $$ = new Node_Variable(array('name' => substr($1, 1))); }
-    | '$' variable                                          { $$ = new Node_Variable(array('name' => $2)); }
-    | '$' '{' expr '}'                                      { $$ = new Node_Variable(array('name' => $3)); }
+      T_VARIABLE                                            { $$ = new PHPParser_Node_Variable(array('name' => substr($1, 1))); }
+    | '$' variable                                          { $$ = new PHPParser_Node_Variable(array('name' => $2)); }
+    | '$' '{' expr '}'                                      { $$ = new PHPParser_Node_Variable(array('name' => $3)); }
 ;
 
 static_var_list:
-      static_var_list ',' T_VARIABLE                        { $1[] = new Node_Stmt_StaticVar(array('name' => substr($3, 1), 'default' => null)); $$ = $1; }
-    | static_var_list ',' T_VARIABLE '=' static_scalar      { $1[] = new Node_Stmt_StaticVar(array('name' => substr($3, 1), 'default' => $5)); $$ = $1; }
-    | T_VARIABLE                                            { $$ = array(new Node_Stmt_StaticVar(array('name' => substr($1, 1), 'default' => null))); }
-    | T_VARIABLE '=' static_scalar                          { $$ = array(new Node_Stmt_StaticVar(array('name' => substr($1, 1), 'default' => $3))); }
+      static_var_list ',' T_VARIABLE                        { $1[] = new PHPParser_Node_Stmt_StaticVar(array('name' => substr($3, 1), 'default' => null)); $$ = $1; }
+    | static_var_list ',' T_VARIABLE '=' static_scalar      { $1[] = new PHPParser_Node_Stmt_StaticVar(array('name' => substr($3, 1), 'default' => $5)); $$ = $1; }
+    | T_VARIABLE                                            { $$ = array(new PHPParser_Node_Stmt_StaticVar(array('name' => substr($1, 1), 'default' => null))); }
+    | T_VARIABLE '=' static_scalar                          { $$ = array(new PHPParser_Node_Stmt_StaticVar(array('name' => substr($1, 1), 'default' => $3))); }
 ;
 
 class_statement_list:
@@ -382,10 +382,10 @@ class_statement_list:
 ;
 
 class_statement:
-      variable_modifiers class_variable_declaration ';'     { $$ = new Node_Stmt_Property(array('type' => $1, 'props' => $2)); }
-    | class_constant_declaration ';'                        { $$ = new Node_Stmt_ClassConst(array('consts' => $1)); }
+      variable_modifiers class_variable_declaration ';'     { $$ = new PHPParser_Node_Stmt_Property(array('type' => $1, 'props' => $2)); }
+    | class_constant_declaration ';'                        { $$ = new PHPParser_Node_Stmt_ClassConst(array('consts' => $1)); }
     | method_modifiers T_FUNCTION optional_ref T_STRING '(' parameter_list ')' method_body
-          { $$ = new Node_Stmt_ClassMethod(array('type' => $1, 'byRef' => $3, 'name' => $4, 'params' => $6, 'stmts' => $8)); }
+          { $$ = new PHPParser_Node_Stmt_ClassMethod(array('type' => $1, 'byRef' => $3, 'name' => $4, 'params' => $6, 'stmts' => $8)); }
 ;
 
 method_body:
@@ -395,43 +395,43 @@ method_body:
 
 variable_modifiers:
       non_empty_member_modifiers                            { $$ = $1; }
-    | T_VAR                                                 { $$ = Node_Stmt_Class::MODIFIER_PUBLIC; }
+    | T_VAR                                                 { $$ = PHPParser_Node_Stmt_Class::MODIFIER_PUBLIC; }
 ;
 
 method_modifiers:
-      /* empty */                                           { $$ = Node_Stmt_Class::MODIFIER_PUBLIC; }
+      /* empty */                                           { $$ = PHPParser_Node_Stmt_Class::MODIFIER_PUBLIC; }
     | non_empty_member_modifiers                            { $$ = $1; }
 ;
 
 non_empty_member_modifiers:
       member_modifier                                       { $$ = $1; }
-    | non_empty_member_modifiers member_modifier            { Node_Stmt_Class::verifyModifier($1, $2); $$ = $1 | $2; }
+    | non_empty_member_modifiers member_modifier            { PHPParser_Node_Stmt_Class::verifyModifier($1, $2); $$ = $1 | $2; }
 ;
 
 member_modifier:
-      T_PUBLIC                                              { $$ = Node_Stmt_Class::MODIFIER_PUBLIC; }
-    | T_PROTECTED                                           { $$ = Node_Stmt_Class::MODIFIER_PROTECTED; }
-    | T_PRIVATE                                             { $$ = Node_Stmt_Class::MODIFIER_PRIVATE; }
-    | T_STATIC                                              { $$ = Node_Stmt_Class::MODIFIER_STATIC; }
-    | T_ABSTRACT                                            { $$ = Node_Stmt_Class::MODIFIER_ABSTRACT; }
-    | T_FINAL                                               { $$ = Node_Stmt_Class::MODIFIER_FINAL; }
+      T_PUBLIC                                              { $$ = PHPParser_Node_Stmt_Class::MODIFIER_PUBLIC; }
+    | T_PROTECTED                                           { $$ = PHPParser_Node_Stmt_Class::MODIFIER_PROTECTED; }
+    | T_PRIVATE                                             { $$ = PHPParser_Node_Stmt_Class::MODIFIER_PRIVATE; }
+    | T_STATIC                                              { $$ = PHPParser_Node_Stmt_Class::MODIFIER_STATIC; }
+    | T_ABSTRACT                                            { $$ = PHPParser_Node_Stmt_Class::MODIFIER_ABSTRACT; }
+    | T_FINAL                                               { $$ = PHPParser_Node_Stmt_Class::MODIFIER_FINAL; }
 ;
 
 class_variable_declaration:
       class_variable_declaration ',' T_VARIABLE
-          { $1[] = new Node_Stmt_PropertyProperty(array('name' => substr($3, 1), 'default' => null)); $$ = $1; }
+          { $1[] = new PHPParser_Node_Stmt_PropertyProperty(array('name' => substr($3, 1), 'default' => null)); $$ = $1; }
     | class_variable_declaration ',' T_VARIABLE '=' static_scalar
-          { $1[] = new Node_Stmt_PropertyProperty(array('name' => substr($3, 1), 'default' => $5)); $$ = $1; }
+          { $1[] = new PHPParser_Node_Stmt_PropertyProperty(array('name' => substr($3, 1), 'default' => $5)); $$ = $1; }
     | T_VARIABLE
-          { $$ = array(new Node_Stmt_PropertyProperty(array('name' => substr($1, 1), 'default' => null))); }
+          { $$ = array(new PHPParser_Node_Stmt_PropertyProperty(array('name' => substr($1, 1), 'default' => null))); }
     | T_VARIABLE '=' static_scalar
-          { $$ = array(new Node_Stmt_PropertyProperty(array('name' => substr($1, 1), 'default' => $3))); }
+          { $$ = array(new PHPParser_Node_Stmt_PropertyProperty(array('name' => substr($1, 1), 'default' => $3))); }
 ;
 
 class_constant_declaration:
       class_constant_declaration ',' T_STRING '=' static_scalar
-          { $1[] = new Node_Stmt_ClassConstConst(array('name' => $3, 'value' => $5)); $$ = $1; }
-    | T_CONST T_STRING '=' static_scalar                    { $$ = array(new Node_Stmt_ClassConstConst(array('name' => $2, 'value' => $4))); }
+          { $1[] = new PHPParser_Node_Stmt_ClassConstConst(array('name' => $3, 'value' => $5)); $$ = $1; }
+    | T_CONST T_STRING '=' static_scalar                    { $$ = array(new PHPParser_Node_Stmt_ClassConstConst(array('name' => $2, 'value' => $4))); }
 ;
 
 expr_list:
@@ -446,83 +446,83 @@ for_expr:
 
 expr:
       variable                                              { $$ = $1; }
-    | T_LIST '(' assignment_list ')' '=' expr               { $$ = new Node_Expr_List(array('assignList' => $3, 'expr' => $6)); }
-    | variable '=' expr                                     { $$ = new Node_Expr_Assign(array('var' => $1, 'expr' => $3)); }
-    | variable '=' '&' variable                             { $$ = new Node_Expr_AssignRef(array('var' => $1, 'refVar' => $4)); }
+    | T_LIST '(' assignment_list ')' '=' expr               { $$ = new PHPParser_Node_Expr_List(array('assignList' => $3, 'expr' => $6)); }
+    | variable '=' expr                                     { $$ = new PHPParser_Node_Expr_Assign(array('var' => $1, 'expr' => $3)); }
+    | variable '=' '&' variable                             { $$ = new PHPParser_Node_Expr_AssignRef(array('var' => $1, 'refVar' => $4)); }
     | variable '=' '&' T_NEW class_name_reference ctor_arguments
-          { $$ = new Node_Expr_Assign(array('var' => $1, 'expr' => new Node_Expr_New(array('class' => $5, 'args' => $6)))); }
+          { $$ = new PHPParser_Node_Expr_Assign(array('var' => $1, 'expr' => new PHPParser_Node_Expr_New(array('class' => $5, 'args' => $6)))); }
           /* reference dropped intentially, TODO: Throw error? */
-    | T_NEW class_name_reference ctor_arguments             { $$ = new Node_Expr_New(array('class' => $2, 'args' => $3)); }
-    | T_CLONE expr                                          { $$ = new Node_Expr_Clone(array('expr' => $2)); }
-    | variable T_PLUS_EQUAL expr                            { $$ = new Node_Expr_AssignPlus(array('var' => $1, 'expr' => $3)); }
-    | variable T_MINUS_EQUAL expr                           { $$ = new Node_Expr_AssignMinus(array('var' => $1, 'expr' => $3)); }
-    | variable T_MUL_EQUAL expr                             { $$ = new Node_Expr_AssignMul(array('var' => $1, 'expr' => $3)); }
-    | variable T_DIV_EQUAL expr                             { $$ = new Node_Expr_AssignDiv(array('var' => $1, 'expr' => $3)); }
-    | variable T_CONCAT_EQUAL expr                          { $$ = new Node_Expr_AssignConcat(array('var' => $1, 'expr' => $3)); }
-    | variable T_MOD_EQUAL expr                             { $$ = new Node_Expr_AssignMod(array('var' => $1, 'expr' => $3)); }
-    | variable T_AND_EQUAL expr                             { $$ = new Node_Expr_AssignBinAnd(array('var' => $1, 'expr' => $3)); }
-    | variable T_OR_EQUAL expr                              { $$ = new Node_Expr_AssignBinOr(array('var' => $1, 'expr' => $3)); }
-    | variable T_XOR_EQUAL expr                             { $$ = new Node_Expr_AssignBinXor(array('var' => $1, 'expr' => $3)); }
-    | variable T_SL_EQUAL expr                              { $$ = new Node_Expr_AssignShiftLeft(array('var' => $1, 'expr' => $3)); }
-    | variable T_SR_EQUAL expr                              { $$ = new Node_Expr_AssignShiftRight(array('var' => $1, 'expr' => $3)); }
-    | variable T_INC                                        { $$ = new Node_Expr_PostInc(array('var' => $1)); }
-    | T_INC variable                                        { $$ = new Node_Expr_PreInc(array('var' => $2)); }
-    | variable T_DEC                                        { $$ = new Node_Expr_PostDec(array('var' => $1)); }
-    | T_DEC variable                                        { $$ = new Node_Expr_PreDec(array('var' => $2)); }
-    | expr T_BOOLEAN_OR expr                                { $$ = new Node_Expr_BooleanOr(array('left' => $1, 'right' => $3)); }
-    | expr T_BOOLEAN_AND expr                               { $$ = new Node_Expr_BooleanAnd(array('left' => $1, 'right' => $3)); }
-    | expr T_LOGICAL_OR expr                                { $$ = new Node_Expr_LogicalOr(array('left' => $1, 'right' => $3)); }
-    | expr T_LOGICAL_AND expr                               { $$ = new Node_Expr_LogicalAnd(array('left' => $1, 'right' => $3)); }
-    | expr T_LOGICAL_XOR expr                               { $$ = new Node_Expr_LogicalXor(array('left' => $1, 'right' => $3)); }
-    | expr '|' expr                                         { $$ = new Node_Expr_BinaryOr(array('left' => $1, 'right' => $3)); }
-    | expr '&' expr                                         { $$ = new Node_Expr_BinaryAnd(array('left' => $1, 'right' => $3)); }
-    | expr '^' expr                                         { $$ = new Node_Expr_BinaryXor(array('left' => $1, 'right' => $3)); }
-    | expr '.' expr                                         { $$ = new Node_Expr_Concat(array('left' => $1, 'right' => $3)); }
-    | expr '+' expr                                         { $$ = new Node_Expr_Plus(array('left' => $1, 'right' => $3)); }
-    | expr '-' expr                                         { $$ = new Node_Expr_Minus(array('left' => $1, 'right' => $3)); }
-    | expr '*' expr                                         { $$ = new Node_Expr_Mul(array('left' => $1, 'right' => $3)); }
-    | expr '/' expr                                         { $$ = new Node_Expr_Div(array('left' => $1, 'right' => $3)); }
-    | expr '%' expr                                         { $$ = new Node_Expr_Mod(array('left' => $1, 'right' => $3)); }
-    | expr T_SL expr                                        { $$ = new Node_Expr_ShiftLeft(array('left' => $1, 'right' => $3)); }
-    | expr T_SR expr                                        { $$ = new Node_Expr_ShiftRight(array('left' => $1, 'right' => $3)); }
-    | '+' expr %prec T_INC                                  { $$ = new Node_Expr_UnaryPlus(array('expr' => $2)); }
-    | '-' expr %prec T_INC                                  { $$ = new Node_Expr_UnaryMinus(array('expr' => $2)); }
-    | '!' expr                                              { $$ = new Node_Expr_BooleanNot(array('expr' => $2)); }
-    | '~' expr                                              { $$ = new Node_Expr_BinaryNot(array('expr' => $2)); }
-    | expr T_IS_IDENTICAL expr                              { $$ = new Node_Expr_Identical(array('left' => $1, 'right' => $3)); }
-    | expr T_IS_NOT_IDENTICAL expr                          { $$ = new Node_Expr_NotIdentical(array('left' => $1, 'right' => $3)); }
-    | expr T_IS_EQUAL expr                                  { $$ = new Node_Expr_Equal(array('left' => $1, 'right' => $3)); }
-    | expr T_IS_NOT_EQUAL expr                              { $$ = new Node_Expr_NotEqual(array('left' => $1, 'right' => $3)); }
-    | expr '<' expr                                         { $$ = new Node_Expr_Smaller(array('left' => $1, 'right' => $3)); }
-    | expr T_IS_SMALLER_OR_EQUAL expr                       { $$ = new Node_Expr_SmallerOrEqual(array('left' => $1, 'right' => $3)); }
-    | expr '>' expr                                         { $$ = new Node_Expr_Greater(array('left' => $1, 'right' => $3)); }
-    | expr T_IS_GREATER_OR_EQUAL expr                       { $$ = new Node_Expr_GreaterOrEqual(array('left' => $1, 'right' => $3)); }
-    | expr T_INSTANCEOF class_name_reference                { $$ = new Node_Expr_Instanceof(array('expr' => $1, 'class' => $3)); }
+    | T_NEW class_name_reference ctor_arguments             { $$ = new PHPParser_Node_Expr_New(array('class' => $2, 'args' => $3)); }
+    | T_CLONE expr                                          { $$ = new PHPParser_Node_Expr_Clone(array('expr' => $2)); }
+    | variable T_PLUS_EQUAL expr                            { $$ = new PHPParser_Node_Expr_AssignPlus(array('var' => $1, 'expr' => $3)); }
+    | variable T_MINUS_EQUAL expr                           { $$ = new PHPParser_Node_Expr_AssignMinus(array('var' => $1, 'expr' => $3)); }
+    | variable T_MUL_EQUAL expr                             { $$ = new PHPParser_Node_Expr_AssignMul(array('var' => $1, 'expr' => $3)); }
+    | variable T_DIV_EQUAL expr                             { $$ = new PHPParser_Node_Expr_AssignDiv(array('var' => $1, 'expr' => $3)); }
+    | variable T_CONCAT_EQUAL expr                          { $$ = new PHPParser_Node_Expr_AssignConcat(array('var' => $1, 'expr' => $3)); }
+    | variable T_MOD_EQUAL expr                             { $$ = new PHPParser_Node_Expr_AssignMod(array('var' => $1, 'expr' => $3)); }
+    | variable T_AND_EQUAL expr                             { $$ = new PHPParser_Node_Expr_AssignBinAnd(array('var' => $1, 'expr' => $3)); }
+    | variable T_OR_EQUAL expr                              { $$ = new PHPParser_Node_Expr_AssignBinOr(array('var' => $1, 'expr' => $3)); }
+    | variable T_XOR_EQUAL expr                             { $$ = new PHPParser_Node_Expr_AssignBinXor(array('var' => $1, 'expr' => $3)); }
+    | variable T_SL_EQUAL expr                              { $$ = new PHPParser_Node_Expr_AssignShiftLeft(array('var' => $1, 'expr' => $3)); }
+    | variable T_SR_EQUAL expr                              { $$ = new PHPParser_Node_Expr_AssignShiftRight(array('var' => $1, 'expr' => $3)); }
+    | variable T_INC                                        { $$ = new PHPParser_Node_Expr_PostInc(array('var' => $1)); }
+    | T_INC variable                                        { $$ = new PHPParser_Node_Expr_PreInc(array('var' => $2)); }
+    | variable T_DEC                                        { $$ = new PHPParser_Node_Expr_PostDec(array('var' => $1)); }
+    | T_DEC variable                                        { $$ = new PHPParser_Node_Expr_PreDec(array('var' => $2)); }
+    | expr T_BOOLEAN_OR expr                                { $$ = new PHPParser_Node_Expr_BooleanOr(array('left' => $1, 'right' => $3)); }
+    | expr T_BOOLEAN_AND expr                               { $$ = new PHPParser_Node_Expr_BooleanAnd(array('left' => $1, 'right' => $3)); }
+    | expr T_LOGICAL_OR expr                                { $$ = new PHPParser_Node_Expr_LogicalOr(array('left' => $1, 'right' => $3)); }
+    | expr T_LOGICAL_AND expr                               { $$ = new PHPParser_Node_Expr_LogicalAnd(array('left' => $1, 'right' => $3)); }
+    | expr T_LOGICAL_XOR expr                               { $$ = new PHPParser_Node_Expr_LogicalXor(array('left' => $1, 'right' => $3)); }
+    | expr '|' expr                                         { $$ = new PHPParser_Node_Expr_BinaryOr(array('left' => $1, 'right' => $3)); }
+    | expr '&' expr                                         { $$ = new PHPParser_Node_Expr_BinaryAnd(array('left' => $1, 'right' => $3)); }
+    | expr '^' expr                                         { $$ = new PHPParser_Node_Expr_BinaryXor(array('left' => $1, 'right' => $3)); }
+    | expr '.' expr                                         { $$ = new PHPParser_Node_Expr_Concat(array('left' => $1, 'right' => $3)); }
+    | expr '+' expr                                         { $$ = new PHPParser_Node_Expr_Plus(array('left' => $1, 'right' => $3)); }
+    | expr '-' expr                                         { $$ = new PHPParser_Node_Expr_Minus(array('left' => $1, 'right' => $3)); }
+    | expr '*' expr                                         { $$ = new PHPParser_Node_Expr_Mul(array('left' => $1, 'right' => $3)); }
+    | expr '/' expr                                         { $$ = new PHPParser_Node_Expr_Div(array('left' => $1, 'right' => $3)); }
+    | expr '%' expr                                         { $$ = new PHPParser_Node_Expr_Mod(array('left' => $1, 'right' => $3)); }
+    | expr T_SL expr                                        { $$ = new PHPParser_Node_Expr_ShiftLeft(array('left' => $1, 'right' => $3)); }
+    | expr T_SR expr                                        { $$ = new PHPParser_Node_Expr_ShiftRight(array('left' => $1, 'right' => $3)); }
+    | '+' expr %prec T_INC                                  { $$ = new PHPParser_Node_Expr_UnaryPlus(array('expr' => $2)); }
+    | '-' expr %prec T_INC                                  { $$ = new PHPParser_Node_Expr_UnaryMinus(array('expr' => $2)); }
+    | '!' expr                                              { $$ = new PHPParser_Node_Expr_BooleanNot(array('expr' => $2)); }
+    | '~' expr                                              { $$ = new PHPParser_Node_Expr_BinaryNot(array('expr' => $2)); }
+    | expr T_IS_IDENTICAL expr                              { $$ = new PHPParser_Node_Expr_Identical(array('left' => $1, 'right' => $3)); }
+    | expr T_IS_NOT_IDENTICAL expr                          { $$ = new PHPParser_Node_Expr_NotIdentical(array('left' => $1, 'right' => $3)); }
+    | expr T_IS_EQUAL expr                                  { $$ = new PHPParser_Node_Expr_Equal(array('left' => $1, 'right' => $3)); }
+    | expr T_IS_NOT_EQUAL expr                              { $$ = new PHPParser_Node_Expr_NotEqual(array('left' => $1, 'right' => $3)); }
+    | expr '<' expr                                         { $$ = new PHPParser_Node_Expr_Smaller(array('left' => $1, 'right' => $3)); }
+    | expr T_IS_SMALLER_OR_EQUAL expr                       { $$ = new PHPParser_Node_Expr_SmallerOrEqual(array('left' => $1, 'right' => $3)); }
+    | expr '>' expr                                         { $$ = new PHPParser_Node_Expr_Greater(array('left' => $1, 'right' => $3)); }
+    | expr T_IS_GREATER_OR_EQUAL expr                       { $$ = new PHPParser_Node_Expr_GreaterOrEqual(array('left' => $1, 'right' => $3)); }
+    | expr T_INSTANCEOF class_name_reference                { $$ = new PHPParser_Node_Expr_Instanceof(array('expr' => $1, 'class' => $3)); }
     | '(' expr ')'                                          { $$ = $2; }
-    | expr '?' expr ':' expr                                { $$ = new Node_Expr_Ternary(array('cond' => $1, 'if' => $3, 'else' => $5)); }
-    | expr '?' ':' expr                                     { $$ = new Node_Expr_Ternary(array('cond' => $1, 'if' => null, 'else' => $4)); }
-    | T_ISSET '(' variables_list ')'                        { $$ = new Node_Expr_Isset(array('vars' => $3)); }
-    | T_EMPTY '(' variable ')'                              { $$ = new Node_Expr_Empty(array('var' => $3)); }
-    | T_INCLUDE expr                                        { $$ = new Node_Expr_Include(array('expr' => $2, 'type' => Node_Expr_Include::TYPE_INCLUDE)); }
-    | T_INCLUDE_ONCE expr                                   { $$ = new Node_Expr_Include(array('expr' => $2, 'type' => Node_Expr_Include::TYPE_INCLUDE_ONCE)); }
-    | T_EVAL '(' expr ')'                                   { $$ = new Node_Expr_Eval(array('expr' => $3)); }
-    | T_REQUIRE expr                                        { $$ = new Node_Expr_Include(array('expr' => $2, 'type' => Node_Expr_Include::TYPE_REQUIRE)); }
-    | T_REQUIRE_ONCE expr                                   { $$ = new Node_Expr_Include(array('expr' => $2, 'type' => Node_Expr_Include::TYPE_REQUIRE_ONCE)); }
-    | T_INT_CAST expr                                       { $$ = new Node_Expr_IntCast(array('expr' => $2)); }
-    | T_DOUBLE_CAST expr                                    { $$ = new Node_Expr_DoubleCast(array('expr' => $2)); }
-    | T_STRING_CAST expr                                    { $$ = new Node_Expr_StringCast(array('expr' => $2)); }
-    | T_ARRAY_CAST expr                                     { $$ = new Node_Expr_ArrayCast(array('expr' => $2)); }
-    | T_OBJECT_CAST expr                                    { $$ = new Node_Expr_ObjectCast(array('expr' => $2)); }
-    | T_BOOL_CAST expr                                      { $$ = new Node_Expr_BoolCast(array('expr' => $2)); }
-    | T_UNSET_CAST expr                                     { $$ = new Node_Expr_UnsetCast(array('expr' => $2)); }
-    | T_EXIT exit_expr                                      { $$ = new Node_Expr_Exit(array('expr' => $2)); }
-    | '@' expr                                              { $$ = new Node_Expr_ErrorSuppress(array('expr' => $2)); }
+    | expr '?' expr ':' expr                                { $$ = new PHPParser_Node_Expr_Ternary(array('cond' => $1, 'if' => $3, 'else' => $5)); }
+    | expr '?' ':' expr                                     { $$ = new PHPParser_Node_Expr_Ternary(array('cond' => $1, 'if' => null, 'else' => $4)); }
+    | T_ISSET '(' variables_list ')'                        { $$ = new PHPParser_Node_Expr_Isset(array('vars' => $3)); }
+    | T_EMPTY '(' variable ')'                              { $$ = new PHPParser_Node_Expr_Empty(array('var' => $3)); }
+    | T_INCLUDE expr                                        { $$ = new PHPParser_Node_Expr_Include(array('expr' => $2, 'type' => PHPParser_Node_Expr_Include::TYPE_INCLUDE)); }
+    | T_INCLUDE_ONCE expr                                   { $$ = new PHPParser_Node_Expr_Include(array('expr' => $2, 'type' => PHPParser_Node_Expr_Include::TYPE_INCLUDE_ONCE)); }
+    | T_EVAL '(' expr ')'                                   { $$ = new PHPParser_Node_Expr_Eval(array('expr' => $3)); }
+    | T_REQUIRE expr                                        { $$ = new PHPParser_Node_Expr_Include(array('expr' => $2, 'type' => PHPParser_Node_Expr_Include::TYPE_REQUIRE)); }
+    | T_REQUIRE_ONCE expr                                   { $$ = new PHPParser_Node_Expr_Include(array('expr' => $2, 'type' => PHPParser_Node_Expr_Include::TYPE_REQUIRE_ONCE)); }
+    | T_INT_CAST expr                                       { $$ = new PHPParser_Node_Expr_IntCast(array('expr' => $2)); }
+    | T_DOUBLE_CAST expr                                    { $$ = new PHPParser_Node_Expr_DoubleCast(array('expr' => $2)); }
+    | T_STRING_CAST expr                                    { $$ = new PHPParser_Node_Expr_StringCast(array('expr' => $2)); }
+    | T_ARRAY_CAST expr                                     { $$ = new PHPParser_Node_Expr_ArrayCast(array('expr' => $2)); }
+    | T_OBJECT_CAST expr                                    { $$ = new PHPParser_Node_Expr_ObjectCast(array('expr' => $2)); }
+    | T_BOOL_CAST expr                                      { $$ = new PHPParser_Node_Expr_BoolCast(array('expr' => $2)); }
+    | T_UNSET_CAST expr                                     { $$ = new PHPParser_Node_Expr_UnsetCast(array('expr' => $2)); }
+    | T_EXIT exit_expr                                      { $$ = new PHPParser_Node_Expr_Exit(array('expr' => $2)); }
+    | '@' expr                                              { $$ = new PHPParser_Node_Expr_ErrorSuppress(array('expr' => $2)); }
     | scalar                                                { $$ = $1; }
-    | T_ARRAY '(' array_pair_list ')'                       { $$ = new Node_Expr_Array(array('items' => $3)); }
-    | '`' backticks_expr '`'                                { $$ = new Node_Expr_ShellExec(array('parts' => $2)); }
-    | T_PRINT expr                                          { $$ = new Node_Expr_Print(array('expr' => $2)); }
+    | T_ARRAY '(' array_pair_list ')'                       { $$ = new PHPParser_Node_Expr_Array(array('items' => $3)); }
+    | '`' backticks_expr '`'                                { $$ = new PHPParser_Node_Expr_ShellExec(array('parts' => $2)); }
+    | T_PRINT expr                                          { $$ = new PHPParser_Node_Expr_Print(array('expr' => $2)); }
     | T_FUNCTION optional_ref '(' parameter_list ')' lexical_vars '{' inner_statement_list '}'
-          { $$ = new Node_Expr_LambdaFunc(array('byRef' => $2, 'params' => $4, 'useVars' => $6, 'stmts' => $8)); }
+          { $$ = new PHPParser_Node_Expr_LambdaFunc(array('byRef' => $2, 'params' => $4, 'useVars' => $6, 'stmts' => $8)); }
 ;
 
 lexical_vars:
@@ -532,34 +532,34 @@ lexical_vars:
 
 lexical_var_list:
       lexical_var_list ',' optional_ref T_VARIABLE
-          { $1[] = new Node_Expr_LambdaFuncUse(array('var' => substr($4, 1), 'byRef' => $3)); $$ = $1; }
+          { $1[] = new PHPParser_Node_Expr_LambdaFuncUse(array('var' => substr($4, 1), 'byRef' => $3)); $$ = $1; }
     | optional_ref T_VARIABLE
-          { $$ = array(new Node_Expr_LambdaFuncUse(array('var' => substr($2, 1), 'byRef' => $1))); }
+          { $$ = array(new PHPParser_Node_Expr_LambdaFuncUse(array('var' => substr($2, 1), 'byRef' => $1))); }
 ;
 
 function_call:
-      name '(' function_call_argument_list ')'             { $$ = new Node_Expr_FuncCall(array('func' => $1, 'args' => $3)); }
+      name '(' function_call_argument_list ')'             { $$ = new PHPParser_Node_Expr_FuncCall(array('func' => $1, 'args' => $3)); }
     | class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING '(' function_call_argument_list ')'
-          { $$ = new Node_Expr_StaticCall(array('class' => $1, 'func' => $3, 'args' => $5)); }
+          { $$ = new PHPParser_Node_Expr_StaticCall(array('class' => $1, 'func' => $3, 'args' => $5)); }
     | reference_variable T_PAAMAYIM_NEKUDOTAYIM T_STRING '(' function_call_argument_list ')'
-          { $$ = new Node_Expr_StaticCall(array('class' => $1, 'func' => $3, 'args' => $5)); }
+          { $$ = new PHPParser_Node_Expr_StaticCall(array('class' => $1, 'func' => $3, 'args' => $5)); }
     | static_property_with_arrays '(' function_call_argument_list ')' {
-            if ($1 instanceof Node_Expr_StaticPropertyFetch) {
-                $$ = new Node_Expr_StaticCall(array('class' => $1->class, 'func' => $1->name, 'args' => $3));
-            } elseif ($1 instanceof Node_Expr_ArrayDimFetch) {
+            if ($1 instanceof PHPParser_Node_Expr_StaticPropertyFetch) {
+                $$ = new PHPParser_Node_Expr_StaticCall(array('class' => $1->class, 'func' => $1->name, 'args' => $3));
+            } elseif ($1 instanceof PHPParser_Node_Expr_ArrayDimFetch) {
                 $2 = $1; // $2 is just a temporary variable. Nothing to do with the '('
-                while ($2->var instanceof Node_Expr_ArrayDimFetch) {
+                while ($2->var instanceof PHPParser_Node_Expr_ArrayDimFetch) {
                     $2 = $2->var;
                 }
 
-                $$ = new Node_Expr_StaticCall(array('class' => $2->var->class, 'func' => $1, 'args' => $3));
-                $2->var = new Node_Variable(array('name' => $2->var->name));
+                $$ = new PHPParser_Node_Expr_StaticCall(array('class' => $2->var->class, 'func' => $1, 'args' => $3));
+                $2->var = new PHPParser_Node_Variable(array('name' => $2->var->name));
             } else {
                 throw new Exception;
             }
           }
     | variable_without_objects '(' function_call_argument_list ')'
-          { $$ = new Node_Expr_FuncCall(array('func' => $1, 'args' => $3)); }
+          { $$ = new PHPParser_Node_Expr_FuncCall(array('func' => $1, 'args' => $3)); }
 ;
 
 class_name:
@@ -569,8 +569,8 @@ class_name:
 
 name:
       namespace_name                                        { $$ = $1; }
-    | T_NAMESPACE T_NS_SEPARATOR namespace_name             { $3->resolveType(Node_Name::RELATIVE); $$ = $3; }
-    | T_NS_SEPARATOR namespace_name                         { $2->resolveType(Node_Name::ABSOLUTE); $$ = $2; }
+    | T_NAMESPACE T_NS_SEPARATOR namespace_name             { $3->resolveType(PHPParser_Node_Name::RELATIVE); $$ = $3; }
+    | T_NS_SEPARATOR namespace_name                         { $2->resolveType(PHPParser_Node_Name::ABSOLUTE); $$ = $2; }
 ;
 
 class_name_reference:
@@ -585,11 +585,11 @@ dynamic_class_name_reference:
 
 object_access_for_dcnr:
     | base_variable T_OBJECT_OPERATOR object_property
-          { $$ = new Node_Expr_PropertyFetch(array('var' => $1, 'name' => $3)); }
+          { $$ = new PHPParser_Node_Expr_PropertyFetch(array('var' => $1, 'name' => $3)); }
     | object_access_for_dcnr T_OBJECT_OPERATOR object_property
-          { $$ = new Node_Expr_PropertyFetch(array('var' => $1, 'name' => $3)); }
-    | object_access_for_dcnr '[' dim_offset ']'             { $$ = new Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
-    | object_access_for_dcnr '{' expr '}'                   { $$ = new Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
+          { $$ = new PHPParser_Node_Expr_PropertyFetch(array('var' => $1, 'name' => $3)); }
+    | object_access_for_dcnr '[' dim_offset ']'             { $$ = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
+    | object_access_for_dcnr '{' expr '}'                   { $$ = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
 ;
 
 exit_expr:
@@ -600,7 +600,7 @@ exit_expr:
 
 backticks_expr:
       /* empty */                                           { $$ = array(); }
-    | T_ENCAPSED_AND_WHITESPACE                             { $$ = array(Node_Scalar_String::parseEscapeSequences($1)); }
+    | T_ENCAPSED_AND_WHITESPACE                             { $$ = array(PHPParser_Node_Scalar_String::parseEscapeSequences($1)); }
     | encaps_list                                           { $$ = $1; }
 ;
 
@@ -610,38 +610,38 @@ ctor_arguments:
 ;
 
 common_scalar:
-      T_LNUMBER                                             { $$ = new Node_Scalar_LNumber(array('value' => (int) $1)); }
-    | T_DNUMBER                                             { $$ = new Node_Scalar_DNumber(array('value' => (double) $1)); }
-    | T_CONSTANT_ENCAPSED_STRING                            { $$ = Node_Scalar_String::create($1); }
-    | T_LINE                                                { $$ = new Node_Scalar_LineConst(array()); }
-    | T_FILE                                                { $$ = new Node_Scalar_FileConst(array()); }
-    | T_DIR                                                 { $$ = new Node_Scalar_DirConst(array()); }
-    | T_CLASS_C                                             { $$ = new Node_Scalar_ClassConst(array()); }
-    | T_METHOD_C                                            { $$ = new Node_Scalar_MethodConst(array()); }
-    | T_FUNC_C                                              { $$ = new Node_Scalar_FuncConst(array()); }
-    | T_NS_C                                                { $$ = new Node_Scalar_NSConst(array()); }
+      T_LNUMBER                                             { $$ = new PHPParser_Node_Scalar_LNumber(array('value' => (int) $1)); }
+    | T_DNUMBER                                             { $$ = new PHPParser_Node_Scalar_DNumber(array('value' => (double) $1)); }
+    | T_CONSTANT_ENCAPSED_STRING                            { $$ = PHPParser_Node_Scalar_String::create($1); }
+    | T_LINE                                                { $$ = new PHPParser_Node_Scalar_LineConst(array()); }
+    | T_FILE                                                { $$ = new PHPParser_Node_Scalar_FileConst(array()); }
+    | T_DIR                                                 { $$ = new PHPParser_Node_Scalar_DirConst(array()); }
+    | T_CLASS_C                                             { $$ = new PHPParser_Node_Scalar_ClassConst(array()); }
+    | T_METHOD_C                                            { $$ = new PHPParser_Node_Scalar_MethodConst(array()); }
+    | T_FUNC_C                                              { $$ = new PHPParser_Node_Scalar_FuncConst(array()); }
+    | T_NS_C                                                { $$ = new PHPParser_Node_Scalar_NSConst(array()); }
     | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC
-          { $$ = new Node_Scalar_String(array('value' => Node_Scalar_String::parseEscapeSequences($2), 'isBinary' => false, 'type' => '\'' === $1[3] ? Node_Scalar_String::SINGLE_QUOTED : Node_Scalar_String::DOUBLE_QUOTED)); }
+          { $$ = new PHPParser_Node_Scalar_String(array('value' => PHPParser_Node_Scalar_String::parseEscapeSequences($2), 'isBinary' => false, 'type' => '\'' === $1[3] ? PHPParser_Node_Scalar_String::SINGLE_QUOTED : PHPParser_Node_Scalar_String::DOUBLE_QUOTED)); }
     | T_START_HEREDOC T_END_HEREDOC
-          { $$ = new Node_Scalar_String(array('value' => '', 'isBinary' => false, 'type' => Node_Scalar_String::SINGLE_QUOTED)); }
+          { $$ = new PHPParser_Node_Scalar_String(array('value' => '', 'isBinary' => false, 'type' => PHPParser_Node_Scalar_String::SINGLE_QUOTED)); }
 ;
 
 static_scalar: /* compile-time evaluated scalars */
       common_scalar                                         { $$ = $1; }
-    | name                                                  { $$ = new Node_Expr_ConstFetch(array('name' => $1)); }
-    | '+' static_scalar                                     { $$ = new Node_Expr_UnaryPlus(array('expr' => $2)); }
-    | '-' static_scalar                                     { $$ = new Node_Expr_UnaryMinus(array('expr' => $2)); }
-    | T_ARRAY '(' static_array_pair_list ')'                { $$ = new Node_Expr_Array(array('items' => $3)); }
-    | class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING            { $$ = new Node_Expr_ClassConstFetch(array('class' => $1, 'name' => $3)); }
+    | name                                                  { $$ = new PHPParser_Node_Expr_ConstFetch(array('name' => $1)); }
+    | '+' static_scalar                                     { $$ = new PHPParser_Node_Expr_UnaryPlus(array('expr' => $2)); }
+    | '-' static_scalar                                     { $$ = new PHPParser_Node_Expr_UnaryMinus(array('expr' => $2)); }
+    | T_ARRAY '(' static_array_pair_list ')'                { $$ = new PHPParser_Node_Expr_Array(array('items' => $3)); }
+    | class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING            { $$ = new PHPParser_Node_Expr_ClassConstFetch(array('class' => $1, 'name' => $3)); }
 ;
 
 scalar:
-      T_STRING_VARNAME                                      { $$ = new Node_Scalar_String(array('value' => $1, 'isBinary' => false, 'type' => Node_Scalar_String::SINGLE_QUOTED)); }
+      T_STRING_VARNAME                                      { $$ = new PHPParser_Node_Scalar_String(array('value' => $1, 'isBinary' => false, 'type' => PHPParser_Node_Scalar_String::SINGLE_QUOTED)); }
     | class_constant                                        { $$ = $1; }
-    | name                                                  { $$ = new Node_Expr_ConstFetch(array('name' => $1)); }
+    | name                                                  { $$ = new PHPParser_Node_Expr_ConstFetch(array('name' => $1)); }
     | common_scalar                                         { $$ = $1; }
-    | '"' encaps_list '"'                                   { $$ = new Node_Scalar_Encapsed(array('parts' => $2)); }
-    | T_START_HEREDOC encaps_list T_END_HEREDOC             { $$ = new Node_Scalar_Encapsed(array('parts' => $2)); }
+    | '"' encaps_list '"'                                   { $$ = new PHPParser_Node_Scalar_Encapsed(array('parts' => $2)); }
+    | T_START_HEREDOC encaps_list T_END_HEREDOC             { $$ = new PHPParser_Node_Scalar_Encapsed(array('parts' => $2)); }
 ;
 
 static_array_pair_list:
@@ -656,10 +656,10 @@ optional_comma:
 
 non_empty_static_array_pair_list:
       non_empty_static_array_pair_list ',' static_scalar T_DOUBLE_ARROW static_scalar
-          { $1[] = new Node_Expr_ArrayItem(array('key' => $3, 'value' => $5, 'byRef' => false)); $$ = $1; }
-    | non_empty_static_array_pair_list ',' static_scalar    { $1[] = new Node_Expr_ArrayItem(array('key' => null, 'value' => $3, 'byRef' => false)); $$ = $1; }
-    | static_scalar T_DOUBLE_ARROW static_scalar            { $$ = array(new Node_Expr_ArrayItem(array('key' => $1, 'value' => $3, 'byRef' => false))); }
-    | static_scalar                                         { $$ = array(new Node_Expr_ArrayItem(array('key' => null, 'value' => $1, 'byRef' => false))); }
+          { $1[] = new PHPParser_Node_Expr_ArrayItem(array('key' => $3, 'value' => $5, 'byRef' => false)); $$ = $1; }
+    | non_empty_static_array_pair_list ',' static_scalar    { $1[] = new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $3, 'byRef' => false)); $$ = $1; }
+    | static_scalar T_DOUBLE_ARROW static_scalar            { $$ = array(new PHPParser_Node_Expr_ArrayItem(array('key' => $1, 'value' => $3, 'byRef' => false))); }
+    | static_scalar                                         { $$ = array(new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $1, 'byRef' => false))); }
 ;
 
 variable:
@@ -671,50 +671,50 @@ variable:
 object_access:
       object_access_arrayable                               { $$ = $1; }
     | object_access_arrayable '(' function_call_argument_list ')'
-          { $$ = new Node_Expr_FuncCall(array('func' => $1, 'args' => $3)); }
+          { $$ = new PHPParser_Node_Expr_FuncCall(array('func' => $1, 'args' => $3)); }
     | variable T_OBJECT_OPERATOR object_property '(' function_call_argument_list ')'
-          { $$ = new Node_Expr_MethodCall(array('var' => $1, 'name' => $3, 'args' => $5)); }
+          { $$ = new PHPParser_Node_Expr_MethodCall(array('var' => $1, 'name' => $3, 'args' => $5)); }
 ;
 
 object_access_arrayable:
       variable T_OBJECT_OPERATOR object_property
-          { $$ = new Node_Expr_PropertyFetch(array('var' => $1, 'name' => $3)); }
-    | object_access_arrayable '[' dim_offset ']'            { $$ = new Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
-    | object_access_arrayable '{' expr '}'                  { $$ = new Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
+          { $$ = new PHPParser_Node_Expr_PropertyFetch(array('var' => $1, 'name' => $3)); }
+    | object_access_arrayable '[' dim_offset ']'            { $$ = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
+    | object_access_arrayable '{' expr '}'                  { $$ = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
 ;
 
 variable_without_objects:
       reference_variable                                    { $$ = $1; }
-    | '$' reference_variable                                { $$ = new Node_Variable(array('name' => $2)); }
+    | '$' reference_variable                                { $$ = new PHPParser_Node_Variable(array('name' => $2)); }
 ;
 
 base_variable:
       variable_without_objects                              { $$ = $1; }
     | class_name T_PAAMAYIM_NEKUDOTAYIM '$' reference_variable
-          { $$ = new Node_Expr_StaticPropertyFetch(array('class' => $1, 'name' => $4)); }
+          { $$ = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $1, 'name' => $4)); }
     | reference_variable T_PAAMAYIM_NEKUDOTAYIM '$' reference_variable
-          { $$ = new Node_Expr_StaticPropertyFetch(array('class' => $1, 'name' => $4)); }
+          { $$ = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $1, 'name' => $4)); }
     | static_property_with_arrays                           { $$ = $1; }
 ;
 
 static_property_with_arrays:
       class_name T_PAAMAYIM_NEKUDOTAYIM T_VARIABLE
-          { $$ = new Node_Expr_StaticPropertyFetch(array('class' => $1, 'name' => substr($3, 1))); }
+          { $$ = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $1, 'name' => substr($3, 1))); }
     | reference_variable T_PAAMAYIM_NEKUDOTAYIM T_VARIABLE
-          { $$ = new Node_Expr_StaticPropertyFetch(array('class' => $1, 'name' => substr($3, 1))); }
+          { $$ = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $1, 'name' => substr($3, 1))); }
     | class_name T_PAAMAYIM_NEKUDOTAYIM '$' '{' expr '}'
-          { $$ = new Node_Expr_StaticPropertyFetch(array('class' => $1, 'name' => $5)); }
+          { $$ = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $1, 'name' => $5)); }
     | reference_variable T_PAAMAYIM_NEKUDOTAYIM '$' '{' expr '}'
-          { $$ = new Node_Expr_StaticPropertyFetch(array('class' => $1, 'name' => $5)); }
-    | static_property_with_arrays '[' dim_offset ']'        { $$ = new Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
-    | static_property_with_arrays '{' expr '}'              { $$ = new Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
+          { $$ = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $1, 'name' => $5)); }
+    | static_property_with_arrays '[' dim_offset ']'        { $$ = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
+    | static_property_with_arrays '{' expr '}'              { $$ = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
 ;
 
 reference_variable:
-      reference_variable '[' dim_offset ']'                 { $$ = new Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
-    | reference_variable '{' expr '}'                       { $$ = new Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
-    | T_VARIABLE                                            { $$ = new Node_Variable(array('name' => substr($1, 1))); }
-    | '$' '{' expr '}'                                      { $$ = new Node_Variable(array('name' => $3)); }
+      reference_variable '[' dim_offset ']'                 { $$ = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
+    | reference_variable '{' expr '}'                       { $$ = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $1, 'dim' => $3)); }
+    | T_VARIABLE                                            { $$ = new PHPParser_Node_Variable(array('name' => substr($1, 1))); }
+    | '$' '{' expr '}'                                      { $$ = new PHPParser_Node_Variable(array('name' => $3)); }
 ;
 
 dim_offset:
@@ -746,43 +746,43 @@ array_pair_list:
 
 non_empty_array_pair_list:
       non_empty_array_pair_list ',' expr T_DOUBLE_ARROW expr
-          { $1[] = new Node_Expr_ArrayItem(array('key' => $3, 'value' => $5, 'byRef' => false)); $$ = $1; }
-    | non_empty_array_pair_list ',' expr                    { $1[] = new Node_Expr_ArrayItem(array('key' => null, 'value' => $3, 'byRef' => false)); $$ = $1; }
-    | expr T_DOUBLE_ARROW expr                              { $$ = array(new Node_Expr_ArrayItem(array('key' => $1, 'value' => $3, 'byRef' => false))); }
-    | expr                                                  { $$ = array(new Node_Expr_ArrayItem(array('key' => null, 'value' => $1, 'byRef' => false))); }
+          { $1[] = new PHPParser_Node_Expr_ArrayItem(array('key' => $3, 'value' => $5, 'byRef' => false)); $$ = $1; }
+    | non_empty_array_pair_list ',' expr                    { $1[] = new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $3, 'byRef' => false)); $$ = $1; }
+    | expr T_DOUBLE_ARROW expr                              { $$ = array(new PHPParser_Node_Expr_ArrayItem(array('key' => $1, 'value' => $3, 'byRef' => false))); }
+    | expr                                                  { $$ = array(new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $1, 'byRef' => false))); }
     | non_empty_array_pair_list ',' expr T_DOUBLE_ARROW '&' variable
-          { $1[] = new Node_Expr_ArrayItem(array('key' => $3, 'value' => $6, 'byRef' => true)); $$ = $1; }
-    | non_empty_array_pair_list ',' '&' variable            { $1[] = new Node_Expr_ArrayItem(array('key' => null, 'value' => $4, 'byRef' => true)); $$ = $1; }
-    | expr T_DOUBLE_ARROW '&' variable                      { $$ = array(new Node_Expr_ArrayItem(array('key' => $1, 'value' => $4, 'byRef' => true))); }
-    | '&' variable                                          { $$ = array(new Node_Expr_ArrayItem(array('key' => null, 'value' => $2, 'byRef' => true))); }
+          { $1[] = new PHPParser_Node_Expr_ArrayItem(array('key' => $3, 'value' => $6, 'byRef' => true)); $$ = $1; }
+    | non_empty_array_pair_list ',' '&' variable            { $1[] = new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $4, 'byRef' => true)); $$ = $1; }
+    | expr T_DOUBLE_ARROW '&' variable                      { $$ = array(new PHPParser_Node_Expr_ArrayItem(array('key' => $1, 'value' => $4, 'byRef' => true))); }
+    | '&' variable                                          { $$ = array(new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $2, 'byRef' => true))); }
 ;
 
 encaps_list:
       encaps_list encaps_var                                { $1[] = $2; $$ = $1; }
-    | encaps_list T_ENCAPSED_AND_WHITESPACE                 { $1[] = Node_Scalar_String::parseEscapeSequences($2); $$ = $1; }
+    | encaps_list T_ENCAPSED_AND_WHITESPACE                 { $1[] = PHPParser_Node_Scalar_String::parseEscapeSequences($2); $$ = $1; }
     | encaps_var                                            { $$ = array($1); }
-    | T_ENCAPSED_AND_WHITESPACE encaps_var                  { $$ = array(Node_Scalar_String::parseEscapeSequences($1), $2); }
+    | T_ENCAPSED_AND_WHITESPACE encaps_var                  { $$ = array(PHPParser_Node_Scalar_String::parseEscapeSequences($1), $2); }
 ;
 
 encaps_var:
-      T_VARIABLE                                            { $$ = new Node_Variable(array('name' => substr($1, 1))); }
-    | T_VARIABLE '[' encaps_var_offset ']'                  { $$ = new Node_Expr_ArrayDimFetch(array('var' => new Node_Variable(array('name' => substr($1, 1))), 'dim' => $3)); }
-    | T_VARIABLE T_OBJECT_OPERATOR T_STRING                 { $$ = new Node_Expr_PropertyFetch(array('var' => new Node_Variable(array('name' => substr($1, 1))), 'name' => $3)); }
-    | T_DOLLAR_OPEN_CURLY_BRACES expr '}'                   { $$ = new Node_Variable(array('name' => $2)); }
+      T_VARIABLE                                            { $$ = new PHPParser_Node_Variable(array('name' => substr($1, 1))); }
+    | T_VARIABLE '[' encaps_var_offset ']'                  { $$ = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => new PHPParser_Node_Variable(array('name' => substr($1, 1))), 'dim' => $3)); }
+    | T_VARIABLE T_OBJECT_OPERATOR T_STRING                 { $$ = new PHPParser_Node_Expr_PropertyFetch(array('var' => new PHPParser_Node_Variable(array('name' => substr($1, 1))), 'name' => $3)); }
+    | T_DOLLAR_OPEN_CURLY_BRACES expr '}'                   { $$ = new PHPParser_Node_Variable(array('name' => $2)); }
     | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}'
-          { $$ = new Node_Expr_ArrayDimFetch(array('var' => new Node_Variable(array('name' => $2)), 'dim' => $4)); }
+          { $$ = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => new PHPParser_Node_Variable(array('name' => $2)), 'dim' => $4)); }
     | T_CURLY_OPEN variable '}'                             { $$ = $2; }
 ;
 
 encaps_var_offset:
-      T_STRING                                              { $$ = new Node_Scalar_String(array('value' => $1, 'isBinary' => false, 'type' => Node_Scalar_String::SINGLE_QUOTED)); }
-    | T_NUM_STRING                                          { $$ = new Node_Scalar_LNumber(array('value' => (int) $1)); }
-    | T_VARIABLE                                            { $$ = new Node_Variable(array('name' => substr($1, 1))); }
+      T_STRING                                              { $$ = new PHPParser_Node_Scalar_String(array('value' => $1, 'isBinary' => false, 'type' => PHPParser_Node_Scalar_String::SINGLE_QUOTED)); }
+    | T_NUM_STRING                                          { $$ = new PHPParser_Node_Scalar_LNumber(array('value' => (int) $1)); }
+    | T_VARIABLE                                            { $$ = new PHPParser_Node_Variable(array('name' => substr($1, 1))); }
 ;
 
 class_constant:
-      class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING            { $$ = new Node_Expr_ClassConstFetch(array('class' => $1, 'name' => $3)); }
-    | reference_variable T_PAAMAYIM_NEKUDOTAYIM T_STRING    { $$ = new Node_Expr_ClassConstFetch(array('class' => $1, 'name' => $3)); }
+      class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING            { $$ = new PHPParser_Node_Expr_ClassConstFetch(array('class' => $1, 'name' => $3)); }
+    | reference_variable T_PAAMAYIM_NEKUDOTAYIM T_STRING    { $$ = new PHPParser_Node_Expr_ClassConstFetch(array('class' => $1, 'name' => $3)); }
 ;
 
 %%
diff --git a/grammar/zend_language_parser.pre.phpy b/grammar/zend_language_parser.pre.phpy
index 30513d59..1c524433 100644
--- a/grammar/zend_language_parser.pre.phpy
+++ b/grammar/zend_language_parser.pre.phpy
@@ -544,11 +544,11 @@ function_call:
     | reference_variable T_PAAMAYIM_NEKUDOTAYIM T_STRING '(' function_call_argument_list ')'
           { $$ = Expr_StaticCall[class: $1, func: $3, args: $5]; }
     | static_property_with_arrays '(' function_call_argument_list ')' {
-            if ($1 instanceof Node_Expr_StaticPropertyFetch) {
+            if ($1 instanceof PHPParser_Node_Expr_StaticPropertyFetch) {
                 $$ = Expr_StaticCall[class: $1->class, func: $1->name, args: $3];
-            } elseif ($1 instanceof Node_Expr_ArrayDimFetch) {
+            } elseif ($1 instanceof PHPParser_Node_Expr_ArrayDimFetch) {
                 $2 = $1; // $2 is just a temporary variable. Nothing to do with the '('
-                while ($2->var instanceof Node_Expr_ArrayDimFetch) {
+                while ($2->var instanceof PHPParser_Node_Expr_ArrayDimFetch) {
                     $2 = $2->var;
                 }
 
diff --git a/lib/Node/Expr.php b/lib/Node/Expr.php
deleted file mode 100644
index 387b4c94..00000000
--- a/lib/Node/Expr.php
+++ /dev/null
@@ -1,5 +0,0 @@
-getType() . '(';
         } elseif (is_array($node)) {
             $r = 'array(';
diff --git a/lib/ParseErrorException.php b/lib/PHPParser/ParseErrorException.php
similarity index 96%
rename from lib/ParseErrorException.php
rename to lib/PHPParser/ParseErrorException.php
index f6ca88c2..e60f6364 100644
--- a/lib/ParseErrorException.php
+++ b/lib/PHPParser/ParseErrorException.php
@@ -1,6 +1,6 @@
 yyastk = array();
         $yysstk = array();
         $this->yysp = 0;
@@ -955,11 +955,11 @@ class Parser
                     /* reduce */
                     try {
                         if ('HALT_COMPILER' === $this->{'yyn' . $yyn}()) {
-                            $this->yyval = new Node_Stmt_HaltCompiler(
+                            $this->yyval = new PHPParser_Node_Stmt_HaltCompiler(
                                 array('remaining' => $lex->handleHaltCompiler())
                             );
                         }
-                    } catch (ParseErrorException $e) {
+                    } catch (PHPParser_ParseErrorException $e) {
                         $e->setRawLine($lex->getLine());
 
                         throw $e;
@@ -984,7 +984,7 @@ class Parser
                     /* error */
                     /*switch ($yyerrflag) {
                     case 0:*/
-                        throw new ParseErrorException(
+                        throw new PHPParser_ParseErrorException(
                             'Unexpected token ' . self::$yyterminals[$yychar],
                             $lex->getLine()
                         );
@@ -1042,7 +1042,7 @@ class Parser
     }
 
     private function yyn4() {
-         $this->yyval = new Node_Name(array('parts' => $this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = new PHPParser_Node_Name(array('parts' => $this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn5() {
@@ -1070,23 +1070,23 @@ class Parser
     }
 
     private function yyn11() {
-         $this->yyval = new Node_Stmt_Namespace(array('ns' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Namespace(array('ns' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn12() {
-         $this->yyval = array(new Node_Stmt_Namespace(array('ns' => $this->yyastk[$this->yysp-(5-2)])), $this->yyastk[$this->yysp-(5-4)]); 
+         $this->yyval = array(new PHPParser_Node_Stmt_Namespace(array('ns' => $this->yyastk[$this->yysp-(5-2)])), $this->yyastk[$this->yysp-(5-4)]); 
     }
 
     private function yyn13() {
-         $this->yyval = array(new Node_Stmt_Namespace(array('ns' => null)), $this->yyastk[$this->yysp-(4-3)]); 
+         $this->yyval = array(new PHPParser_Node_Stmt_Namespace(array('ns' => null)), $this->yyastk[$this->yysp-(4-3)]); 
     }
 
     private function yyn14() {
-         $this->yyval = new Node_Stmt_Use(array('uses' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Use(array('uses' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn15() {
-         $this->yyval = new Node_Stmt_Const(array('consts' => $this->yyastk[$this->yysp-(2-1)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Const(array('consts' => $this->yyastk[$this->yysp-(2-1)])); 
     }
 
     private function yyn16() {
@@ -1098,27 +1098,27 @@ class Parser
     }
 
     private function yyn18() {
-         $this->yyval = new Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(1-1)], 'alias' => null)); 
+         $this->yyval = new PHPParser_Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(1-1)], 'alias' => null)); 
     }
 
     private function yyn19() {
-         $this->yyval = new Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(3-1)], 'alias' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(3-1)], 'alias' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn20() {
-         $this->yyval = new Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(2-2)], 'alias' => null)); 
+         $this->yyval = new PHPParser_Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(2-2)], 'alias' => null)); 
     }
 
     private function yyn21() {
-         $this->yyval = new Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(4-2)], 'alias' => $this->yyastk[$this->yysp-(4-4)])); 
+         $this->yyval = new PHPParser_Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(4-2)], 'alias' => $this->yyastk[$this->yysp-(4-4)])); 
     }
 
     private function yyn22() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Stmt_ConstConst(array('name' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Stmt_ConstConst(array('name' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn23() {
-         $this->yyval = array(new Node_Stmt_ConstConst(array('name' => $this->yyastk[$this->yysp-(4-2)], 'value' => $this->yyastk[$this->yysp-(4-4)]))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_ConstConst(array('name' => $this->yyastk[$this->yysp-(4-2)], 'value' => $this->yyastk[$this->yysp-(4-4)]))); 
     }
 
     private function yyn24() {
@@ -1150,67 +1150,67 @@ class Parser
     }
 
     private function yyn31() {
-         $this->yyval = new Node_Stmt_If(array('cond' => $this->yyastk[$this->yysp-(7-3)], 'stmts' => is_array($this->yyastk[$this->yysp-(7-5)]) ? $this->yyastk[$this->yysp-(7-5)] : array($this->yyastk[$this->yysp-(7-5)]), 'elseifList' => $this->yyastk[$this->yysp-(7-6)], 'else' => $this->yyastk[$this->yysp-(7-7)])); 
+         $this->yyval = new PHPParser_Node_Stmt_If(array('cond' => $this->yyastk[$this->yysp-(7-3)], 'stmts' => is_array($this->yyastk[$this->yysp-(7-5)]) ? $this->yyastk[$this->yysp-(7-5)] : array($this->yyastk[$this->yysp-(7-5)]), 'elseifList' => $this->yyastk[$this->yysp-(7-6)], 'else' => $this->yyastk[$this->yysp-(7-7)])); 
     }
 
     private function yyn32() {
-         $this->yyval = new Node_Stmt_If(array('cond' => $this->yyastk[$this->yysp-(10-3)], 'stmts' => $this->yyastk[$this->yysp-(10-6)], 'elseifList' => $this->yyastk[$this->yysp-(10-7)], 'else' => $this->yyastk[$this->yysp-(10-8)])); 
+         $this->yyval = new PHPParser_Node_Stmt_If(array('cond' => $this->yyastk[$this->yysp-(10-3)], 'stmts' => $this->yyastk[$this->yysp-(10-6)], 'elseifList' => $this->yyastk[$this->yysp-(10-7)], 'else' => $this->yyastk[$this->yysp-(10-8)])); 
     }
 
     private function yyn33() {
-         $this->yyval = new Node_Stmt_While(array('cond' => $this->yyastk[$this->yysp-(5-3)], 'stmts' => is_array($this->yyastk[$this->yysp-(5-5)]) ? $this->yyastk[$this->yysp-(5-5)] : array($this->yyastk[$this->yysp-(5-5)]))); 
+         $this->yyval = new PHPParser_Node_Stmt_While(array('cond' => $this->yyastk[$this->yysp-(5-3)], 'stmts' => is_array($this->yyastk[$this->yysp-(5-5)]) ? $this->yyastk[$this->yysp-(5-5)] : array($this->yyastk[$this->yysp-(5-5)]))); 
     }
 
     private function yyn34() {
-         $this->yyval = new Node_Stmt_Do(array('stmts' => is_array($this->yyastk[$this->yysp-(7-2)]) ? $this->yyastk[$this->yysp-(7-2)] : array($this->yyastk[$this->yysp-(7-2)]), 'cond' => $this->yyastk[$this->yysp-(7-5)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Do(array('stmts' => is_array($this->yyastk[$this->yysp-(7-2)]) ? $this->yyastk[$this->yysp-(7-2)] : array($this->yyastk[$this->yysp-(7-2)]), 'cond' => $this->yyastk[$this->yysp-(7-5)])); 
     }
 
     private function yyn35() {
-         $this->yyval = new Node_Stmt_For(array('init' => $this->yyastk[$this->yysp-(9-3)], 'cond' => $this->yyastk[$this->yysp-(9-5)], 'loop' => $this->yyastk[$this->yysp-(9-7)], 'stmts' => is_array($this->yyastk[$this->yysp-(9-9)]) ? $this->yyastk[$this->yysp-(9-9)] : array($this->yyastk[$this->yysp-(9-9)]))); 
+         $this->yyval = new PHPParser_Node_Stmt_For(array('init' => $this->yyastk[$this->yysp-(9-3)], 'cond' => $this->yyastk[$this->yysp-(9-5)], 'loop' => $this->yyastk[$this->yysp-(9-7)], 'stmts' => is_array($this->yyastk[$this->yysp-(9-9)]) ? $this->yyastk[$this->yysp-(9-9)] : array($this->yyastk[$this->yysp-(9-9)]))); 
     }
 
     private function yyn36() {
-         $this->yyval = new Node_Stmt_Switch(array('cond' => $this->yyastk[$this->yysp-(5-3)], 'caseList' => $this->yyastk[$this->yysp-(5-5)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Switch(array('cond' => $this->yyastk[$this->yysp-(5-3)], 'caseList' => $this->yyastk[$this->yysp-(5-5)])); 
     }
 
     private function yyn37() {
-         $this->yyval = new Node_Stmt_Break(array('num' => null)); 
+         $this->yyval = new PHPParser_Node_Stmt_Break(array('num' => null)); 
     }
 
     private function yyn38() {
-         $this->yyval = new Node_Stmt_Break(array('num' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Break(array('num' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn39() {
-         $this->yyval = new Node_Stmt_Continue(array('num' => null)); 
+         $this->yyval = new PHPParser_Node_Stmt_Continue(array('num' => null)); 
     }
 
     private function yyn40() {
-         $this->yyval = new Node_Stmt_Continue(array('num' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Continue(array('num' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn41() {
-         $this->yyval = new Node_Stmt_Return(array('expr' => null)); 
+         $this->yyval = new PHPParser_Node_Stmt_Return(array('expr' => null)); 
     }
 
     private function yyn42() {
-         $this->yyval = new Node_Stmt_Return(array('expr' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Return(array('expr' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn43() {
-         $this->yyval = new Node_Stmt_Global(array('vars' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Global(array('vars' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn44() {
-         $this->yyval = new Node_Stmt_Static(array('vars' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Static(array('vars' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn45() {
-         $this->yyval = new Node_Stmt_Echo(array('exprs' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Echo(array('exprs' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn46() {
-         $this->yyval = new Node_Stmt_InlineHTML(array('value' => $this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = new PHPParser_Node_Stmt_InlineHTML(array('value' => $this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn47() {
@@ -1218,23 +1218,23 @@ class Parser
     }
 
     private function yyn48() {
-         $this->yyval = new Node_Stmt_Unset(array('vars' => $this->yyastk[$this->yysp-(5-3)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Unset(array('vars' => $this->yyastk[$this->yysp-(5-3)])); 
     }
 
     private function yyn49() {
-         $this->yyval = new Node_Stmt_Foreach(array('expr' => $this->yyastk[$this->yysp-(7-3)], 'keyVar' => null, 'byRef' => false, 'valueVar' => $this->yyastk[$this->yysp-(7-5)], 'stmts' => is_array($this->yyastk[$this->yysp-(7-7)]) ? $this->yyastk[$this->yysp-(7-7)] : array($this->yyastk[$this->yysp-(7-7)]))); 
+         $this->yyval = new PHPParser_Node_Stmt_Foreach(array('expr' => $this->yyastk[$this->yysp-(7-3)], 'keyVar' => null, 'byRef' => false, 'valueVar' => $this->yyastk[$this->yysp-(7-5)], 'stmts' => is_array($this->yyastk[$this->yysp-(7-7)]) ? $this->yyastk[$this->yysp-(7-7)] : array($this->yyastk[$this->yysp-(7-7)]))); 
     }
 
     private function yyn50() {
-         $this->yyval = new Node_Stmt_Foreach(array('expr' => $this->yyastk[$this->yysp-(8-3)], 'keyVar' => null, 'byRef' => true, 'valueVar' => $this->yyastk[$this->yysp-(8-6)], 'stmts' => is_array($this->yyastk[$this->yysp-(8-8)]) ? $this->yyastk[$this->yysp-(8-8)] : array($this->yyastk[$this->yysp-(8-8)]))); 
+         $this->yyval = new PHPParser_Node_Stmt_Foreach(array('expr' => $this->yyastk[$this->yysp-(8-3)], 'keyVar' => null, 'byRef' => true, 'valueVar' => $this->yyastk[$this->yysp-(8-6)], 'stmts' => is_array($this->yyastk[$this->yysp-(8-8)]) ? $this->yyastk[$this->yysp-(8-8)] : array($this->yyastk[$this->yysp-(8-8)]))); 
     }
 
     private function yyn51() {
-         $this->yyval = new Node_Stmt_Foreach(array('expr' => $this->yyastk[$this->yysp-(10-3)], 'keyVar' => $this->yyastk[$this->yysp-(10-5)], 'byRef' => $this->yyastk[$this->yysp-(10-7)], 'valueVar' => $this->yyastk[$this->yysp-(10-8)], 'stmts' => is_array($this->yyastk[$this->yysp-(10-10)]) ? $this->yyastk[$this->yysp-(10-10)] : array($this->yyastk[$this->yysp-(10-10)]))); 
+         $this->yyval = new PHPParser_Node_Stmt_Foreach(array('expr' => $this->yyastk[$this->yysp-(10-3)], 'keyVar' => $this->yyastk[$this->yysp-(10-5)], 'byRef' => $this->yyastk[$this->yysp-(10-7)], 'valueVar' => $this->yyastk[$this->yysp-(10-8)], 'stmts' => is_array($this->yyastk[$this->yysp-(10-10)]) ? $this->yyastk[$this->yysp-(10-10)] : array($this->yyastk[$this->yysp-(10-10)]))); 
     }
 
     private function yyn52() {
-         $this->yyval = new Node_Stmt_Declare(array('declares' => $this->yyastk[$this->yysp-(5-3)], 'stmts' => is_array($this->yyastk[$this->yysp-(5-5)]) ? $this->yyastk[$this->yysp-(5-5)] : array($this->yyastk[$this->yysp-(5-5)]))); 
+         $this->yyval = new PHPParser_Node_Stmt_Declare(array('declares' => $this->yyastk[$this->yysp-(5-3)], 'stmts' => is_array($this->yyastk[$this->yysp-(5-5)]) ? $this->yyastk[$this->yysp-(5-5)] : array($this->yyastk[$this->yysp-(5-5)]))); 
     }
 
     private function yyn53() {
@@ -1242,19 +1242,19 @@ class Parser
     }
 
     private function yyn54() {
-         $this->yyval = new Node_Stmt_TryCatch(array('stmts' => $this->yyastk[$this->yysp-(5-3)], 'catches' => $this->yyastk[$this->yysp-(5-5)])); 
+         $this->yyval = new PHPParser_Node_Stmt_TryCatch(array('stmts' => $this->yyastk[$this->yysp-(5-3)], 'catches' => $this->yyastk[$this->yysp-(5-5)])); 
     }
 
     private function yyn55() {
-         $this->yyval = new Node_Stmt_Throw(array('expr' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Throw(array('expr' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn56() {
-         $this->yyval = new Node_Stmt_Goto(array('name' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Goto(array('name' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn57() {
-         $this->yyval = new Node_Stmt_Label(array('name' => $this->yyastk[$this->yysp-(2-1)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Label(array('name' => $this->yyastk[$this->yysp-(2-1)])); 
     }
 
     private function yyn58() {
@@ -1266,7 +1266,7 @@ class Parser
     }
 
     private function yyn60() {
-         $this->yyval = new Node_Stmt_Catch(array('type' => $this->yyastk[$this->yysp-(8-3)], 'var' => substr($this->yyastk[$this->yysp-(8-4)], 1), 'stmts' => $this->yyastk[$this->yysp-(8-7)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Catch(array('type' => $this->yyastk[$this->yysp-(8-3)], 'var' => substr($this->yyastk[$this->yysp-(8-4)], 1), 'stmts' => $this->yyastk[$this->yysp-(8-7)])); 
     }
 
     private function yyn61() {
@@ -1286,15 +1286,15 @@ class Parser
     }
 
     private function yyn65() {
-         $this->yyval = new Node_Stmt_Func(array('byRef' => $this->yyastk[$this->yysp-(9-2)], 'name' => $this->yyastk[$this->yysp-(9-3)], 'params' => $this->yyastk[$this->yysp-(9-5)], 'stmts' => $this->yyastk[$this->yysp-(9-8)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Func(array('byRef' => $this->yyastk[$this->yysp-(9-2)], 'name' => $this->yyastk[$this->yysp-(9-3)], 'params' => $this->yyastk[$this->yysp-(9-5)], 'stmts' => $this->yyastk[$this->yysp-(9-8)])); 
     }
 
     private function yyn66() {
-         $this->yyval = new Node_Stmt_Class(array('type' => $this->yyastk[$this->yysp-(7-1)], 'name' => $this->yyastk[$this->yysp-(7-2)], 'extends' => $this->yyastk[$this->yysp-(7-3)], 'implements' => $this->yyastk[$this->yysp-(7-4)], 'stmts' => $this->yyastk[$this->yysp-(7-6)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Class(array('type' => $this->yyastk[$this->yysp-(7-1)], 'name' => $this->yyastk[$this->yysp-(7-2)], 'extends' => $this->yyastk[$this->yysp-(7-3)], 'implements' => $this->yyastk[$this->yysp-(7-4)], 'stmts' => $this->yyastk[$this->yysp-(7-6)])); 
     }
 
     private function yyn67() {
-         $this->yyval = new Node_Stmt_Interface(array('name' => $this->yyastk[$this->yysp-(6-2)], 'extends' => $this->yyastk[$this->yysp-(6-3)], 'stmts' => $this->yyastk[$this->yysp-(6-5)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Interface(array('name' => $this->yyastk[$this->yysp-(6-2)], 'extends' => $this->yyastk[$this->yysp-(6-3)], 'stmts' => $this->yyastk[$this->yysp-(6-5)])); 
     }
 
     private function yyn68() {
@@ -1302,11 +1302,11 @@ class Parser
     }
 
     private function yyn69() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_ABSTRACT; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_ABSTRACT; 
     }
 
     private function yyn70() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_FINAL; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_FINAL; 
     }
 
     private function yyn71() {
@@ -1366,11 +1366,11 @@ class Parser
     }
 
     private function yyn85() {
-         $this->yyval = array(new Node_Stmt_DeclareDeclare(array('key' => $this->yyastk[$this->yysp-(3-1)], 'value' => $this->yyastk[$this->yysp-(3-3)]))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_DeclareDeclare(array('key' => $this->yyastk[$this->yysp-(3-1)], 'value' => $this->yyastk[$this->yysp-(3-3)]))); 
     }
 
     private function yyn86() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Stmt_DeclareDeclare(array('key' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Stmt_DeclareDeclare(array('key' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn87() {
@@ -1394,11 +1394,11 @@ class Parser
     }
 
     private function yyn92() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Stmt_Case(array('cond' => $this->yyastk[$this->yysp-(5-3)], 'stmts' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Stmt_Case(array('cond' => $this->yyastk[$this->yysp-(5-3)], 'stmts' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn93() {
-         $this->yyastk[$this->yysp-(4-1)][] = new Node_Stmt_Case(array('cond' => null, 'stmts' => $this->yyastk[$this->yysp-(4-4)])); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
+         $this->yyastk[$this->yysp-(4-1)][] = new PHPParser_Node_Stmt_Case(array('cond' => null, 'stmts' => $this->yyastk[$this->yysp-(4-4)])); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
     }
 
     private function yyn94() {
@@ -1422,7 +1422,7 @@ class Parser
     }
 
     private function yyn99() {
-         $this->yyastk[$this->yysp-(6-1)][] = new Node_Stmt_ElseIf(array('cond' => $this->yyastk[$this->yysp-(6-4)], 'stmts' => is_array($this->yyastk[$this->yysp-(6-6)]) ? $this->yyastk[$this->yysp-(6-6)] : array($this->yyastk[$this->yysp-(6-6)]))); $this->yyval = $this->yyastk[$this->yysp-(6-1)]; 
+         $this->yyastk[$this->yysp-(6-1)][] = new PHPParser_Node_Stmt_ElseIf(array('cond' => $this->yyastk[$this->yysp-(6-4)], 'stmts' => is_array($this->yyastk[$this->yysp-(6-6)]) ? $this->yyastk[$this->yysp-(6-6)] : array($this->yyastk[$this->yysp-(6-6)]))); $this->yyval = $this->yyastk[$this->yysp-(6-1)]; 
     }
 
     private function yyn100() {
@@ -1430,7 +1430,7 @@ class Parser
     }
 
     private function yyn101() {
-         $this->yyastk[$this->yysp-(7-1)][] = new Node_Stmt_ElseIf(array('cond' => $this->yyastk[$this->yysp-(7-4)], 'stmts' => $this->yyastk[$this->yysp-(7-7)])); $this->yyval = $this->yyastk[$this->yysp-(7-1)]; 
+         $this->yyastk[$this->yysp-(7-1)][] = new PHPParser_Node_Stmt_ElseIf(array('cond' => $this->yyastk[$this->yysp-(7-4)], 'stmts' => $this->yyastk[$this->yysp-(7-7)])); $this->yyval = $this->yyastk[$this->yysp-(7-1)]; 
     }
 
     private function yyn102() {
@@ -1438,7 +1438,7 @@ class Parser
     }
 
     private function yyn103() {
-         $this->yyval = new Node_Stmt_Else(array('stmts' => is_array($this->yyastk[$this->yysp-(2-2)]) ? $this->yyastk[$this->yysp-(2-2)] : array($this->yyastk[$this->yysp-(2-2)]))); 
+         $this->yyval = new PHPParser_Node_Stmt_Else(array('stmts' => is_array($this->yyastk[$this->yysp-(2-2)]) ? $this->yyastk[$this->yysp-(2-2)] : array($this->yyastk[$this->yysp-(2-2)]))); 
     }
 
     private function yyn104() {
@@ -1446,7 +1446,7 @@ class Parser
     }
 
     private function yyn105() {
-         $this->yyval = new Node_Stmt_Else(array('stmts' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Else(array('stmts' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn106() {
@@ -1458,19 +1458,19 @@ class Parser
     }
 
     private function yyn108() {
-         $this->yyval = array(new Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(3-1)], 'name' => substr($this->yyastk[$this->yysp-(3-3)], 1), 'byRef' => $this->yyastk[$this->yysp-(3-2)], 'default' => null))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(3-1)], 'name' => substr($this->yyastk[$this->yysp-(3-3)], 1), 'byRef' => $this->yyastk[$this->yysp-(3-2)], 'default' => null))); 
     }
 
     private function yyn109() {
-         $this->yyval = array(new Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(5-1)], 'name' => substr($this->yyastk[$this->yysp-(5-3)], 1), 'byRef' => $this->yyastk[$this->yysp-(5-2)], 'default' => $this->yyastk[$this->yysp-(5-5)]))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(5-1)], 'name' => substr($this->yyastk[$this->yysp-(5-3)], 1), 'byRef' => $this->yyastk[$this->yysp-(5-2)], 'default' => $this->yyastk[$this->yysp-(5-5)]))); 
     }
 
     private function yyn110() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(5-3)], 'name' => substr($this->yyastk[$this->yysp-(5-5)], 1), 'byRef' => $this->yyastk[$this->yysp-(5-4)], 'default' => null)); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(5-3)], 'name' => substr($this->yyastk[$this->yysp-(5-5)], 1), 'byRef' => $this->yyastk[$this->yysp-(5-4)], 'default' => null)); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn111() {
-         $this->yyastk[$this->yysp-(7-1)][] = new Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(7-3)], 'name' => substr($this->yyastk[$this->yysp-(7-5)], 1), 'byRef' => $this->yyastk[$this->yysp-(7-4)], 'default' => $this->yyastk[$this->yysp-(7-7)])); $this->yyval = $this->yyastk[$this->yysp-(7-1)]; 
+         $this->yyastk[$this->yysp-(7-1)][] = new PHPParser_Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(7-3)], 'name' => substr($this->yyastk[$this->yysp-(7-5)], 1), 'byRef' => $this->yyastk[$this->yysp-(7-4)], 'default' => $this->yyastk[$this->yysp-(7-7)])); $this->yyval = $this->yyastk[$this->yysp-(7-1)]; 
     }
 
     private function yyn112() {
@@ -1494,19 +1494,19 @@ class Parser
     }
 
     private function yyn117() {
-         $this->yyval = array(new Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(1-1)], 'byRef' => false))); 
+         $this->yyval = array(new PHPParser_Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(1-1)], 'byRef' => false))); 
     }
 
     private function yyn118() {
-         $this->yyval = array(new Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(2-2)], 'byRef' => true))); 
+         $this->yyval = array(new PHPParser_Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(2-2)], 'byRef' => true))); 
     }
 
     private function yyn119() {
-         $this->yyastk[$this->yysp-(3-1)][] = new Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
+         $this->yyastk[$this->yysp-(3-1)][] = new PHPParser_Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
     }
 
     private function yyn120() {
-         $this->yyastk[$this->yysp-(4-1)][] = new Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(4-4)], 'byRef' => true)); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
+         $this->yyastk[$this->yysp-(4-1)][] = new PHPParser_Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(4-4)], 'byRef' => true)); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
     }
 
     private function yyn121() {
@@ -1518,31 +1518,31 @@ class Parser
     }
 
     private function yyn123() {
-         $this->yyval = new Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
     }
 
     private function yyn124() {
-         $this->yyval = new Node_Variable(array('name' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn125() {
-         $this->yyval = new Node_Variable(array('name' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn126() {
-         $this->yyastk[$this->yysp-(3-1)][] = new Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(3-3)], 1), 'default' => null)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
+         $this->yyastk[$this->yysp-(3-1)][] = new PHPParser_Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(3-3)], 1), 'default' => null)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
     }
 
     private function yyn127() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(5-3)], 1), 'default' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(5-3)], 1), 'default' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn128() {
-         $this->yyval = array(new Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1), 'default' => null))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1), 'default' => null))); 
     }
 
     private function yyn129() {
-         $this->yyval = array(new Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(3-1)], 1), 'default' => $this->yyastk[$this->yysp-(3-3)]))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(3-1)], 1), 'default' => $this->yyastk[$this->yysp-(3-3)]))); 
     }
 
     private function yyn130() {
@@ -1554,15 +1554,15 @@ class Parser
     }
 
     private function yyn132() {
-         $this->yyval = new Node_Stmt_Property(array('type' => $this->yyastk[$this->yysp-(3-1)], 'props' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Property(array('type' => $this->yyastk[$this->yysp-(3-1)], 'props' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn133() {
-         $this->yyval = new Node_Stmt_ClassConst(array('consts' => $this->yyastk[$this->yysp-(2-1)])); 
+         $this->yyval = new PHPParser_Node_Stmt_ClassConst(array('consts' => $this->yyastk[$this->yysp-(2-1)])); 
     }
 
     private function yyn134() {
-         $this->yyval = new Node_Stmt_ClassMethod(array('type' => $this->yyastk[$this->yysp-(8-1)], 'byRef' => $this->yyastk[$this->yysp-(8-3)], 'name' => $this->yyastk[$this->yysp-(8-4)], 'params' => $this->yyastk[$this->yysp-(8-6)], 'stmts' => $this->yyastk[$this->yysp-(8-8)])); 
+         $this->yyval = new PHPParser_Node_Stmt_ClassMethod(array('type' => $this->yyastk[$this->yysp-(8-1)], 'byRef' => $this->yyastk[$this->yysp-(8-3)], 'name' => $this->yyastk[$this->yysp-(8-4)], 'params' => $this->yyastk[$this->yysp-(8-6)], 'stmts' => $this->yyastk[$this->yysp-(8-8)])); 
     }
 
     private function yyn135() {
@@ -1578,11 +1578,11 @@ class Parser
     }
 
     private function yyn138() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_PUBLIC; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_PUBLIC; 
     }
 
     private function yyn139() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_PUBLIC; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_PUBLIC; 
     }
 
     private function yyn140() {
@@ -1594,55 +1594,55 @@ class Parser
     }
 
     private function yyn142() {
-         Node_Stmt_Class::verifyModifier($this->yyastk[$this->yysp-(2-1)], $this->yyastk[$this->yysp-(2-2)]); $this->yyval = $this->yyastk[$this->yysp-(2-1)] | $this->yyastk[$this->yysp-(2-2)]; 
+         PHPParser_Node_Stmt_Class::verifyModifier($this->yyastk[$this->yysp-(2-1)], $this->yyastk[$this->yysp-(2-2)]); $this->yyval = $this->yyastk[$this->yysp-(2-1)] | $this->yyastk[$this->yysp-(2-2)]; 
     }
 
     private function yyn143() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_PUBLIC; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_PUBLIC; 
     }
 
     private function yyn144() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_PROTECTED; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_PROTECTED; 
     }
 
     private function yyn145() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_PRIVATE; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_PRIVATE; 
     }
 
     private function yyn146() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_STATIC; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_STATIC; 
     }
 
     private function yyn147() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_ABSTRACT; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_ABSTRACT; 
     }
 
     private function yyn148() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_FINAL; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_FINAL; 
     }
 
     private function yyn149() {
-         $this->yyastk[$this->yysp-(3-1)][] = new Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(3-3)], 1), 'default' => null)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
+         $this->yyastk[$this->yysp-(3-1)][] = new PHPParser_Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(3-3)], 1), 'default' => null)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
     }
 
     private function yyn150() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(5-3)], 1), 'default' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(5-3)], 1), 'default' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn151() {
-         $this->yyval = array(new Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1), 'default' => null))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1), 'default' => null))); 
     }
 
     private function yyn152() {
-         $this->yyval = array(new Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(3-1)], 1), 'default' => $this->yyastk[$this->yysp-(3-3)]))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(3-1)], 1), 'default' => $this->yyastk[$this->yysp-(3-3)]))); 
     }
 
     private function yyn153() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Stmt_ClassConstConst(array('name' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Stmt_ClassConstConst(array('name' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn154() {
-         $this->yyval = array(new Node_Stmt_ClassConstConst(array('name' => $this->yyastk[$this->yysp-(4-2)], 'value' => $this->yyastk[$this->yysp-(4-4)]))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_ClassConstConst(array('name' => $this->yyastk[$this->yysp-(4-2)], 'value' => $this->yyastk[$this->yysp-(4-4)]))); 
     }
 
     private function yyn155() {
@@ -1666,203 +1666,203 @@ class Parser
     }
 
     private function yyn160() {
-         $this->yyval = new Node_Expr_List(array('assignList' => $this->yyastk[$this->yysp-(6-3)], 'expr' => $this->yyastk[$this->yysp-(6-6)])); 
+         $this->yyval = new PHPParser_Node_Expr_List(array('assignList' => $this->yyastk[$this->yysp-(6-3)], 'expr' => $this->yyastk[$this->yysp-(6-6)])); 
     }
 
     private function yyn161() {
-         $this->yyval = new Node_Expr_Assign(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Assign(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn162() {
-         $this->yyval = new Node_Expr_AssignRef(array('var' => $this->yyastk[$this->yysp-(4-1)], 'refVar' => $this->yyastk[$this->yysp-(4-4)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignRef(array('var' => $this->yyastk[$this->yysp-(4-1)], 'refVar' => $this->yyastk[$this->yysp-(4-4)])); 
     }
 
     private function yyn163() {
-         $this->yyval = new Node_Expr_Assign(array('var' => $this->yyastk[$this->yysp-(6-1)], 'expr' => new Node_Expr_New(array('class' => $this->yyastk[$this->yysp-(6-5)], 'args' => $this->yyastk[$this->yysp-(6-6)])))); 
+         $this->yyval = new PHPParser_Node_Expr_Assign(array('var' => $this->yyastk[$this->yysp-(6-1)], 'expr' => new PHPParser_Node_Expr_New(array('class' => $this->yyastk[$this->yysp-(6-5)], 'args' => $this->yyastk[$this->yysp-(6-6)])))); 
     }
 
     private function yyn164() {
-         $this->yyval = new Node_Expr_New(array('class' => $this->yyastk[$this->yysp-(3-2)], 'args' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_New(array('class' => $this->yyastk[$this->yysp-(3-2)], 'args' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn165() {
-         $this->yyval = new Node_Expr_Clone(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_Clone(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn166() {
-         $this->yyval = new Node_Expr_AssignPlus(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignPlus(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn167() {
-         $this->yyval = new Node_Expr_AssignMinus(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignMinus(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn168() {
-         $this->yyval = new Node_Expr_AssignMul(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignMul(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn169() {
-         $this->yyval = new Node_Expr_AssignDiv(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignDiv(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn170() {
-         $this->yyval = new Node_Expr_AssignConcat(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignConcat(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn171() {
-         $this->yyval = new Node_Expr_AssignMod(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignMod(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn172() {
-         $this->yyval = new Node_Expr_AssignBinAnd(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignBinAnd(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn173() {
-         $this->yyval = new Node_Expr_AssignBinOr(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignBinOr(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn174() {
-         $this->yyval = new Node_Expr_AssignBinXor(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignBinXor(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn175() {
-         $this->yyval = new Node_Expr_AssignShiftLeft(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignShiftLeft(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn176() {
-         $this->yyval = new Node_Expr_AssignShiftRight(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignShiftRight(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn177() {
-         $this->yyval = new Node_Expr_PostInc(array('var' => $this->yyastk[$this->yysp-(2-1)])); 
+         $this->yyval = new PHPParser_Node_Expr_PostInc(array('var' => $this->yyastk[$this->yysp-(2-1)])); 
     }
 
     private function yyn178() {
-         $this->yyval = new Node_Expr_PreInc(array('var' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_PreInc(array('var' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn179() {
-         $this->yyval = new Node_Expr_PostDec(array('var' => $this->yyastk[$this->yysp-(2-1)])); 
+         $this->yyval = new PHPParser_Node_Expr_PostDec(array('var' => $this->yyastk[$this->yysp-(2-1)])); 
     }
 
     private function yyn180() {
-         $this->yyval = new Node_Expr_PreDec(array('var' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_PreDec(array('var' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn181() {
-         $this->yyval = new Node_Expr_BooleanOr(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_BooleanOr(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn182() {
-         $this->yyval = new Node_Expr_BooleanAnd(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_BooleanAnd(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn183() {
-         $this->yyval = new Node_Expr_LogicalOr(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_LogicalOr(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn184() {
-         $this->yyval = new Node_Expr_LogicalAnd(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_LogicalAnd(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn185() {
-         $this->yyval = new Node_Expr_LogicalXor(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_LogicalXor(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn186() {
-         $this->yyval = new Node_Expr_BinaryOr(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_BinaryOr(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn187() {
-         $this->yyval = new Node_Expr_BinaryAnd(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_BinaryAnd(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn188() {
-         $this->yyval = new Node_Expr_BinaryXor(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_BinaryXor(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn189() {
-         $this->yyval = new Node_Expr_Concat(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Concat(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn190() {
-         $this->yyval = new Node_Expr_Plus(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Plus(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn191() {
-         $this->yyval = new Node_Expr_Minus(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Minus(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn192() {
-         $this->yyval = new Node_Expr_Mul(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Mul(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn193() {
-         $this->yyval = new Node_Expr_Div(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Div(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn194() {
-         $this->yyval = new Node_Expr_Mod(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Mod(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn195() {
-         $this->yyval = new Node_Expr_ShiftLeft(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ShiftLeft(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn196() {
-         $this->yyval = new Node_Expr_ShiftRight(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ShiftRight(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn197() {
-         $this->yyval = new Node_Expr_UnaryPlus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_UnaryPlus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn198() {
-         $this->yyval = new Node_Expr_UnaryMinus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_UnaryMinus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn199() {
-         $this->yyval = new Node_Expr_BooleanNot(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_BooleanNot(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn200() {
-         $this->yyval = new Node_Expr_BinaryNot(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_BinaryNot(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn201() {
-         $this->yyval = new Node_Expr_Identical(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Identical(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn202() {
-         $this->yyval = new Node_Expr_NotIdentical(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_NotIdentical(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn203() {
-         $this->yyval = new Node_Expr_Equal(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Equal(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn204() {
-         $this->yyval = new Node_Expr_NotEqual(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_NotEqual(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn205() {
-         $this->yyval = new Node_Expr_Smaller(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Smaller(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn206() {
-         $this->yyval = new Node_Expr_SmallerOrEqual(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_SmallerOrEqual(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn207() {
-         $this->yyval = new Node_Expr_Greater(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Greater(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn208() {
-         $this->yyval = new Node_Expr_GreaterOrEqual(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_GreaterOrEqual(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn209() {
-         $this->yyval = new Node_Expr_Instanceof(array('expr' => $this->yyastk[$this->yysp-(3-1)], 'class' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Instanceof(array('expr' => $this->yyastk[$this->yysp-(3-1)], 'class' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn210() {
@@ -1870,75 +1870,75 @@ class Parser
     }
 
     private function yyn211() {
-         $this->yyval = new Node_Expr_Ternary(array('cond' => $this->yyastk[$this->yysp-(5-1)], 'if' => $this->yyastk[$this->yysp-(5-3)], 'else' => $this->yyastk[$this->yysp-(5-5)])); 
+         $this->yyval = new PHPParser_Node_Expr_Ternary(array('cond' => $this->yyastk[$this->yysp-(5-1)], 'if' => $this->yyastk[$this->yysp-(5-3)], 'else' => $this->yyastk[$this->yysp-(5-5)])); 
     }
 
     private function yyn212() {
-         $this->yyval = new Node_Expr_Ternary(array('cond' => $this->yyastk[$this->yysp-(4-1)], 'if' => null, 'else' => $this->yyastk[$this->yysp-(4-4)])); 
+         $this->yyval = new PHPParser_Node_Expr_Ternary(array('cond' => $this->yyastk[$this->yysp-(4-1)], 'if' => null, 'else' => $this->yyastk[$this->yysp-(4-4)])); 
     }
 
     private function yyn213() {
-         $this->yyval = new Node_Expr_Isset(array('vars' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Isset(array('vars' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn214() {
-         $this->yyval = new Node_Expr_Empty(array('var' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Empty(array('var' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn215() {
-         $this->yyval = new Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => Node_Expr_Include::TYPE_INCLUDE)); 
+         $this->yyval = new PHPParser_Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => PHPParser_Node_Expr_Include::TYPE_INCLUDE)); 
     }
 
     private function yyn216() {
-         $this->yyval = new Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => Node_Expr_Include::TYPE_INCLUDE_ONCE)); 
+         $this->yyval = new PHPParser_Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => PHPParser_Node_Expr_Include::TYPE_INCLUDE_ONCE)); 
     }
 
     private function yyn217() {
-         $this->yyval = new Node_Expr_Eval(array('expr' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Eval(array('expr' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn218() {
-         $this->yyval = new Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => Node_Expr_Include::TYPE_REQUIRE)); 
+         $this->yyval = new PHPParser_Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => PHPParser_Node_Expr_Include::TYPE_REQUIRE)); 
     }
 
     private function yyn219() {
-         $this->yyval = new Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => Node_Expr_Include::TYPE_REQUIRE_ONCE)); 
+         $this->yyval = new PHPParser_Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => PHPParser_Node_Expr_Include::TYPE_REQUIRE_ONCE)); 
     }
 
     private function yyn220() {
-         $this->yyval = new Node_Expr_IntCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_IntCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn221() {
-         $this->yyval = new Node_Expr_DoubleCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_DoubleCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn222() {
-         $this->yyval = new Node_Expr_StringCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_StringCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn223() {
-         $this->yyval = new Node_Expr_ArrayCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn224() {
-         $this->yyval = new Node_Expr_ObjectCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_ObjectCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn225() {
-         $this->yyval = new Node_Expr_BoolCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_BoolCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn226() {
-         $this->yyval = new Node_Expr_UnsetCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_UnsetCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn227() {
-         $this->yyval = new Node_Expr_Exit(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_Exit(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn228() {
-         $this->yyval = new Node_Expr_ErrorSuppress(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_ErrorSuppress(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn229() {
@@ -1946,19 +1946,19 @@ class Parser
     }
 
     private function yyn230() {
-         $this->yyval = new Node_Expr_Array(array('items' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Array(array('items' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn231() {
-         $this->yyval = new Node_Expr_ShellExec(array('parts' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_ShellExec(array('parts' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn232() {
-         $this->yyval = new Node_Expr_Print(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_Print(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn233() {
-         $this->yyval = new Node_Expr_LambdaFunc(array('byRef' => $this->yyastk[$this->yysp-(9-2)], 'params' => $this->yyastk[$this->yysp-(9-4)], 'useVars' => $this->yyastk[$this->yysp-(9-6)], 'stmts' => $this->yyastk[$this->yysp-(9-8)])); 
+         $this->yyval = new PHPParser_Node_Expr_LambdaFunc(array('byRef' => $this->yyastk[$this->yysp-(9-2)], 'params' => $this->yyastk[$this->yysp-(9-4)], 'useVars' => $this->yyastk[$this->yysp-(9-6)], 'stmts' => $this->yyastk[$this->yysp-(9-8)])); 
     }
 
     private function yyn234() {
@@ -1970,37 +1970,37 @@ class Parser
     }
 
     private function yyn236() {
-         $this->yyastk[$this->yysp-(4-1)][] = new Node_Expr_LambdaFuncUse(array('var' => substr($this->yyastk[$this->yysp-(4-4)], 1), 'byRef' => $this->yyastk[$this->yysp-(4-3)])); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
+         $this->yyastk[$this->yysp-(4-1)][] = new PHPParser_Node_Expr_LambdaFuncUse(array('var' => substr($this->yyastk[$this->yysp-(4-4)], 1), 'byRef' => $this->yyastk[$this->yysp-(4-3)])); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
     }
 
     private function yyn237() {
-         $this->yyval = array(new Node_Expr_LambdaFuncUse(array('var' => substr($this->yyastk[$this->yysp-(2-2)], 1), 'byRef' => $this->yyastk[$this->yysp-(2-1)]))); 
+         $this->yyval = array(new PHPParser_Node_Expr_LambdaFuncUse(array('var' => substr($this->yyastk[$this->yysp-(2-2)], 1), 'byRef' => $this->yyastk[$this->yysp-(2-1)]))); 
     }
 
     private function yyn238() {
-         $this->yyval = new Node_Expr_FuncCall(array('func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_FuncCall(array('func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn239() {
-         $this->yyval = new Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(6-1)], 'func' => $this->yyastk[$this->yysp-(6-3)], 'args' => $this->yyastk[$this->yysp-(6-5)])); 
+         $this->yyval = new PHPParser_Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(6-1)], 'func' => $this->yyastk[$this->yysp-(6-3)], 'args' => $this->yyastk[$this->yysp-(6-5)])); 
     }
 
     private function yyn240() {
-         $this->yyval = new Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(6-1)], 'func' => $this->yyastk[$this->yysp-(6-3)], 'args' => $this->yyastk[$this->yysp-(6-5)])); 
+         $this->yyval = new PHPParser_Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(6-1)], 'func' => $this->yyastk[$this->yysp-(6-3)], 'args' => $this->yyastk[$this->yysp-(6-5)])); 
     }
 
     private function yyn241() {
         
-            if ($this->yyastk[$this->yysp-(4-1)] instanceof Node_Expr_StaticPropertyFetch) {
-                $this->yyval = new Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(4-1)]->class, 'func' => $this->yyastk[$this->yysp-(4-1)]->name, 'args' => $this->yyastk[$this->yysp-(4-3)]));
-            } elseif ($this->yyastk[$this->yysp-(4-1)] instanceof Node_Expr_ArrayDimFetch) {
+            if ($this->yyastk[$this->yysp-(4-1)] instanceof PHPParser_Node_Expr_StaticPropertyFetch) {
+                $this->yyval = new PHPParser_Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(4-1)]->class, 'func' => $this->yyastk[$this->yysp-(4-1)]->name, 'args' => $this->yyastk[$this->yysp-(4-3)]));
+            } elseif ($this->yyastk[$this->yysp-(4-1)] instanceof PHPParser_Node_Expr_ArrayDimFetch) {
                 $this->yyastk[$this->yysp-(4-2)] = $this->yyastk[$this->yysp-(4-1)]; // $2 is just a temporary variable. Nothing to do with the '('
-                while ($this->yyastk[$this->yysp-(4-2)]->var instanceof Node_Expr_ArrayDimFetch) {
+                while ($this->yyastk[$this->yysp-(4-2)]->var instanceof PHPParser_Node_Expr_ArrayDimFetch) {
                     $this->yyastk[$this->yysp-(4-2)] = $this->yyastk[$this->yysp-(4-2)]->var;
                 }
 
-                $this->yyval = new Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(4-2)]->var->class, 'func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)]));
-                $this->yyastk[$this->yysp-(4-2)]->var = new Node_Variable(array('name' => $this->yyastk[$this->yysp-(4-2)]->var->name));
+                $this->yyval = new PHPParser_Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(4-2)]->var->class, 'func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)]));
+                $this->yyastk[$this->yysp-(4-2)]->var = new PHPParser_Node_Variable(array('name' => $this->yyastk[$this->yysp-(4-2)]->var->name));
             } else {
                 throw new Exception;
             }
@@ -2008,7 +2008,7 @@ class Parser
     }
 
     private function yyn242() {
-         $this->yyval = new Node_Expr_FuncCall(array('func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_FuncCall(array('func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn243() {
@@ -2024,11 +2024,11 @@ class Parser
     }
 
     private function yyn246() {
-         $this->yyastk[$this->yysp-(3-3)]->resolveType(Node_Name::RELATIVE); $this->yyval = $this->yyastk[$this->yysp-(3-3)]; 
+         $this->yyastk[$this->yysp-(3-3)]->resolveType(PHPParser_Node_Name::RELATIVE); $this->yyval = $this->yyastk[$this->yysp-(3-3)]; 
     }
 
     private function yyn247() {
-         $this->yyastk[$this->yysp-(2-2)]->resolveType(Node_Name::ABSOLUTE); $this->yyval = $this->yyastk[$this->yysp-(2-2)]; 
+         $this->yyastk[$this->yysp-(2-2)]->resolveType(PHPParser_Node_Name::ABSOLUTE); $this->yyval = $this->yyastk[$this->yysp-(2-2)]; 
     }
 
     private function yyn248() {
@@ -2052,19 +2052,19 @@ class Parser
     }
 
     private function yyn253() {
-         $this->yyval = new Node_Expr_PropertyFetch(array('var' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_PropertyFetch(array('var' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn254() {
-         $this->yyval = new Node_Expr_PropertyFetch(array('var' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_PropertyFetch(array('var' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn255() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn256() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn257() {
@@ -2084,7 +2084,7 @@ class Parser
     }
 
     private function yyn261() {
-         $this->yyval = array(Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = array(PHPParser_Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn262() {
@@ -2100,51 +2100,51 @@ class Parser
     }
 
     private function yyn265() {
-         $this->yyval = new Node_Scalar_LNumber(array('value' => (int) $this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = new PHPParser_Node_Scalar_LNumber(array('value' => (int) $this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn266() {
-         $this->yyval = new Node_Scalar_DNumber(array('value' => (double) $this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = new PHPParser_Node_Scalar_DNumber(array('value' => (double) $this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn267() {
-         $this->yyval = Node_Scalar_String::create($this->yyastk[$this->yysp-(1-1)]); 
+         $this->yyval = PHPParser_Node_Scalar_String::create($this->yyastk[$this->yysp-(1-1)]); 
     }
 
     private function yyn268() {
-         $this->yyval = new Node_Scalar_LineConst(array()); 
+         $this->yyval = new PHPParser_Node_Scalar_LineConst(array()); 
     }
 
     private function yyn269() {
-         $this->yyval = new Node_Scalar_FileConst(array()); 
+         $this->yyval = new PHPParser_Node_Scalar_FileConst(array()); 
     }
 
     private function yyn270() {
-         $this->yyval = new Node_Scalar_DirConst(array()); 
+         $this->yyval = new PHPParser_Node_Scalar_DirConst(array()); 
     }
 
     private function yyn271() {
-         $this->yyval = new Node_Scalar_ClassConst(array()); 
+         $this->yyval = new PHPParser_Node_Scalar_ClassConst(array()); 
     }
 
     private function yyn272() {
-         $this->yyval = new Node_Scalar_MethodConst(array()); 
+         $this->yyval = new PHPParser_Node_Scalar_MethodConst(array()); 
     }
 
     private function yyn273() {
-         $this->yyval = new Node_Scalar_FuncConst(array()); 
+         $this->yyval = new PHPParser_Node_Scalar_FuncConst(array()); 
     }
 
     private function yyn274() {
-         $this->yyval = new Node_Scalar_NSConst(array()); 
+         $this->yyval = new PHPParser_Node_Scalar_NSConst(array()); 
     }
 
     private function yyn275() {
-         $this->yyval = new Node_Scalar_String(array('value' => Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(3-2)]), 'isBinary' => false, 'type' => '\'' === $this->yyastk[$this->yysp-(3-1)][3] ? Node_Scalar_String::SINGLE_QUOTED : Node_Scalar_String::DOUBLE_QUOTED)); 
+         $this->yyval = new PHPParser_Node_Scalar_String(array('value' => PHPParser_Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(3-2)]), 'isBinary' => false, 'type' => '\'' === $this->yyastk[$this->yysp-(3-1)][3] ? PHPParser_Node_Scalar_String::SINGLE_QUOTED : PHPParser_Node_Scalar_String::DOUBLE_QUOTED)); 
     }
 
     private function yyn276() {
-         $this->yyval = new Node_Scalar_String(array('value' => '', 'isBinary' => false, 'type' => Node_Scalar_String::SINGLE_QUOTED)); 
+         $this->yyval = new PHPParser_Node_Scalar_String(array('value' => '', 'isBinary' => false, 'type' => PHPParser_Node_Scalar_String::SINGLE_QUOTED)); 
     }
 
     private function yyn277() {
@@ -2152,27 +2152,27 @@ class Parser
     }
 
     private function yyn278() {
-         $this->yyval = new Node_Expr_ConstFetch(array('name' => $this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = new PHPParser_Node_Expr_ConstFetch(array('name' => $this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn279() {
-         $this->yyval = new Node_Expr_UnaryPlus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_UnaryPlus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn280() {
-         $this->yyval = new Node_Expr_UnaryMinus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_UnaryMinus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn281() {
-         $this->yyval = new Node_Expr_Array(array('items' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Array(array('items' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn282() {
-         $this->yyval = new Node_Expr_ClassConstFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ClassConstFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn283() {
-         $this->yyval = new Node_Scalar_String(array('value' => $this->yyastk[$this->yysp-(1-1)], 'isBinary' => false, 'type' => Node_Scalar_String::SINGLE_QUOTED)); 
+         $this->yyval = new PHPParser_Node_Scalar_String(array('value' => $this->yyastk[$this->yysp-(1-1)], 'isBinary' => false, 'type' => PHPParser_Node_Scalar_String::SINGLE_QUOTED)); 
     }
 
     private function yyn284() {
@@ -2180,7 +2180,7 @@ class Parser
     }
 
     private function yyn285() {
-         $this->yyval = new Node_Expr_ConstFetch(array('name' => $this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = new PHPParser_Node_Expr_ConstFetch(array('name' => $this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn286() {
@@ -2188,11 +2188,11 @@ class Parser
     }
 
     private function yyn287() {
-         $this->yyval = new Node_Scalar_Encapsed(array('parts' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Scalar_Encapsed(array('parts' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn288() {
-         $this->yyval = new Node_Scalar_Encapsed(array('parts' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Scalar_Encapsed(array('parts' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn289() {
@@ -2212,19 +2212,19 @@ class Parser
     }
 
     private function yyn293() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn294() {
-         $this->yyastk[$this->yysp-(3-1)][] = new Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
+         $this->yyastk[$this->yysp-(3-1)][] = new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
     }
 
     private function yyn295() {
-         $this->yyval = array(new Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(3-1)], 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false))); 
+         $this->yyval = array(new PHPParser_Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(3-1)], 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false))); 
     }
 
     private function yyn296() {
-         $this->yyval = array(new Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(1-1)], 'byRef' => false))); 
+         $this->yyval = array(new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(1-1)], 'byRef' => false))); 
     }
 
     private function yyn297() {
@@ -2244,23 +2244,23 @@ class Parser
     }
 
     private function yyn301() {
-         $this->yyval = new Node_Expr_FuncCall(array('func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_FuncCall(array('func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn302() {
-         $this->yyval = new Node_Expr_MethodCall(array('var' => $this->yyastk[$this->yysp-(6-1)], 'name' => $this->yyastk[$this->yysp-(6-3)], 'args' => $this->yyastk[$this->yysp-(6-5)])); 
+         $this->yyval = new PHPParser_Node_Expr_MethodCall(array('var' => $this->yyastk[$this->yysp-(6-1)], 'name' => $this->yyastk[$this->yysp-(6-3)], 'args' => $this->yyastk[$this->yysp-(6-5)])); 
     }
 
     private function yyn303() {
-         $this->yyval = new Node_Expr_PropertyFetch(array('var' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_PropertyFetch(array('var' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn304() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn305() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn306() {
@@ -2268,7 +2268,7 @@ class Parser
     }
 
     private function yyn307() {
-         $this->yyval = new Node_Variable(array('name' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn308() {
@@ -2276,11 +2276,11 @@ class Parser
     }
 
     private function yyn309() {
-         $this->yyval = new Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(4-1)], 'name' => $this->yyastk[$this->yysp-(4-4)])); 
+         $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(4-1)], 'name' => $this->yyastk[$this->yysp-(4-4)])); 
     }
 
     private function yyn310() {
-         $this->yyval = new Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(4-1)], 'name' => $this->yyastk[$this->yysp-(4-4)])); 
+         $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(4-1)], 'name' => $this->yyastk[$this->yysp-(4-4)])); 
     }
 
     private function yyn311() {
@@ -2288,43 +2288,43 @@ class Parser
     }
 
     private function yyn312() {
-         $this->yyval = new Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => substr($this->yyastk[$this->yysp-(3-3)], 1))); 
+         $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => substr($this->yyastk[$this->yysp-(3-3)], 1))); 
     }
 
     private function yyn313() {
-         $this->yyval = new Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => substr($this->yyastk[$this->yysp-(3-3)], 1))); 
+         $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => substr($this->yyastk[$this->yysp-(3-3)], 1))); 
     }
 
     private function yyn314() {
-         $this->yyval = new Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(6-1)], 'name' => $this->yyastk[$this->yysp-(6-5)])); 
+         $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(6-1)], 'name' => $this->yyastk[$this->yysp-(6-5)])); 
     }
 
     private function yyn315() {
-         $this->yyval = new Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(6-1)], 'name' => $this->yyastk[$this->yysp-(6-5)])); 
+         $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(6-1)], 'name' => $this->yyastk[$this->yysp-(6-5)])); 
     }
 
     private function yyn316() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn317() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn318() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn319() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn320() {
-         $this->yyval = new Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
     }
 
     private function yyn321() {
-         $this->yyval = new Node_Variable(array('name' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn322() {
@@ -2376,35 +2376,35 @@ class Parser
     }
 
     private function yyn334() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn335() {
-         $this->yyastk[$this->yysp-(3-1)][] = new Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
+         $this->yyastk[$this->yysp-(3-1)][] = new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
     }
 
     private function yyn336() {
-         $this->yyval = array(new Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(3-1)], 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false))); 
+         $this->yyval = array(new PHPParser_Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(3-1)], 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false))); 
     }
 
     private function yyn337() {
-         $this->yyval = array(new Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(1-1)], 'byRef' => false))); 
+         $this->yyval = array(new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(1-1)], 'byRef' => false))); 
     }
 
     private function yyn338() {
-         $this->yyastk[$this->yysp-(6-1)][] = new Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(6-3)], 'value' => $this->yyastk[$this->yysp-(6-6)], 'byRef' => true)); $this->yyval = $this->yyastk[$this->yysp-(6-1)]; 
+         $this->yyastk[$this->yysp-(6-1)][] = new PHPParser_Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(6-3)], 'value' => $this->yyastk[$this->yysp-(6-6)], 'byRef' => true)); $this->yyval = $this->yyastk[$this->yysp-(6-1)]; 
     }
 
     private function yyn339() {
-         $this->yyastk[$this->yysp-(4-1)][] = new Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(4-4)], 'byRef' => true)); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
+         $this->yyastk[$this->yysp-(4-1)][] = new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(4-4)], 'byRef' => true)); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
     }
 
     private function yyn340() {
-         $this->yyval = array(new Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(4-1)], 'value' => $this->yyastk[$this->yysp-(4-4)], 'byRef' => true))); 
+         $this->yyval = array(new PHPParser_Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(4-1)], 'value' => $this->yyastk[$this->yysp-(4-4)], 'byRef' => true))); 
     }
 
     private function yyn341() {
-         $this->yyval = array(new Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(2-2)], 'byRef' => true))); 
+         $this->yyval = array(new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(2-2)], 'byRef' => true))); 
     }
 
     private function yyn342() {
@@ -2412,7 +2412,7 @@ class Parser
     }
 
     private function yyn343() {
-         $this->yyastk[$this->yysp-(2-1)][] = Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(2-2)]); $this->yyval = $this->yyastk[$this->yysp-(2-1)]; 
+         $this->yyastk[$this->yysp-(2-1)][] = PHPParser_Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(2-2)]); $this->yyval = $this->yyastk[$this->yysp-(2-1)]; 
     }
 
     private function yyn344() {
@@ -2420,27 +2420,27 @@ class Parser
     }
 
     private function yyn345() {
-         $this->yyval = array(Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(2-1)]), $this->yyastk[$this->yysp-(2-2)]); 
+         $this->yyval = array(PHPParser_Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(2-1)]), $this->yyastk[$this->yysp-(2-2)]); 
     }
 
     private function yyn346() {
-         $this->yyval = new Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
     }
 
     private function yyn347() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => new Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(4-1)], 1))), 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => new PHPParser_Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(4-1)], 1))), 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn348() {
-         $this->yyval = new Node_Expr_PropertyFetch(array('var' => new Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(3-1)], 1))), 'name' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_PropertyFetch(array('var' => new PHPParser_Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(3-1)], 1))), 'name' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn349() {
-         $this->yyval = new Node_Variable(array('name' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn350() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => new Node_Variable(array('name' => $this->yyastk[$this->yysp-(6-2)])), 'dim' => $this->yyastk[$this->yysp-(6-4)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => new PHPParser_Node_Variable(array('name' => $this->yyastk[$this->yysp-(6-2)])), 'dim' => $this->yyastk[$this->yysp-(6-4)])); 
     }
 
     private function yyn351() {
@@ -2448,22 +2448,22 @@ class Parser
     }
 
     private function yyn352() {
-         $this->yyval = new Node_Scalar_String(array('value' => $this->yyastk[$this->yysp-(1-1)], 'isBinary' => false, 'type' => Node_Scalar_String::SINGLE_QUOTED)); 
+         $this->yyval = new PHPParser_Node_Scalar_String(array('value' => $this->yyastk[$this->yysp-(1-1)], 'isBinary' => false, 'type' => PHPParser_Node_Scalar_String::SINGLE_QUOTED)); 
     }
 
     private function yyn353() {
-         $this->yyval = new Node_Scalar_LNumber(array('value' => (int) $this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = new PHPParser_Node_Scalar_LNumber(array('value' => (int) $this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn354() {
-         $this->yyval = new Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
     }
 
     private function yyn355() {
-         $this->yyval = new Node_Expr_ClassConstFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ClassConstFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn356() {
-         $this->yyval = new Node_Expr_ClassConstFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ClassConstFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 }
diff --git a/lib/ParserDebug.php b/lib/PHPParser/ParserDebug.php
similarity index 71%
rename from lib/ParserDebug.php
rename to lib/PHPParser/ParserDebug.php
index b50ca6d1..603a108a 100644
--- a/lib/ParserDebug.php
+++ b/lib/PHPParser/ParserDebug.php
@@ -4,7 +4,7 @@
  * Written by Moriyoshi Koizumi, based on the work by Masato Bito.
  * This file is PUBLIC DOMAIN.
  */
-class ParserDebug
+class PHPParser_ParserDebug
 {
     const YYBADCH      = 145;
     const YYMAXLEX     = 380;
@@ -1276,11 +1276,11 @@ class ParserDebug
     /**
      * Parses PHP code into a node tree and prints out debugging information.
      *
-     * @param Lexer $lex A lexer
+     * @param PHPParser_Lexer $lex A lexer
      *
      * @return array Array of statements
      */
-    public function parse(Lexer $lex) {
+    public function parse(PHPParser_Lexer $lex) {
         $this->yyastk = array();
         $yysstk = array();
         $this->yysp = 0;
@@ -1354,11 +1354,11 @@ class ParserDebug
                     $this->YYTRACE_REDUCE($yyn);
                     try {
                         if ('HALT_COMPILER' === $this->{'yyn' . $yyn}()) {
-                            $this->yyval = new Node_Stmt_HaltCompiler(
+                            $this->yyval = new PHPParser_Node_Stmt_HaltCompiler(
                                 array('remaining' => $lex->handleHaltCompiler())
                             );
                         }
-                    } catch (ParseErrorException $e) {
+                    } catch (PHPParser_ParseErrorException $e) {
                         $e->setRawLine($lex->getLine());
 
                         throw $e;
@@ -1383,7 +1383,7 @@ class ParserDebug
                     /* error */
                     /*switch ($yyerrflag) {
                     case 0:*/
-                        throw new ParseErrorException(
+                        throw new PHPParser_ParseErrorException(
                             'Unexpected token ' . self::$yyterminals[$yychar],
                             $lex->getLine()
                         );
@@ -1444,7 +1444,7 @@ class ParserDebug
     }
 
     private function yyn4() {
-         $this->yyval = new Node_Name(array('parts' => $this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = new PHPParser_Node_Name(array('parts' => $this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn5() {
@@ -1472,23 +1472,23 @@ class ParserDebug
     }
 
     private function yyn11() {
-         $this->yyval = new Node_Stmt_Namespace(array('ns' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Namespace(array('ns' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn12() {
-         $this->yyval = array(new Node_Stmt_Namespace(array('ns' => $this->yyastk[$this->yysp-(5-2)])), $this->yyastk[$this->yysp-(5-4)]); 
+         $this->yyval = array(new PHPParser_Node_Stmt_Namespace(array('ns' => $this->yyastk[$this->yysp-(5-2)])), $this->yyastk[$this->yysp-(5-4)]); 
     }
 
     private function yyn13() {
-         $this->yyval = array(new Node_Stmt_Namespace(array('ns' => null)), $this->yyastk[$this->yysp-(4-3)]); 
+         $this->yyval = array(new PHPParser_Node_Stmt_Namespace(array('ns' => null)), $this->yyastk[$this->yysp-(4-3)]); 
     }
 
     private function yyn14() {
-         $this->yyval = new Node_Stmt_Use(array('uses' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Use(array('uses' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn15() {
-         $this->yyval = new Node_Stmt_Const(array('consts' => $this->yyastk[$this->yysp-(2-1)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Const(array('consts' => $this->yyastk[$this->yysp-(2-1)])); 
     }
 
     private function yyn16() {
@@ -1500,27 +1500,27 @@ class ParserDebug
     }
 
     private function yyn18() {
-         $this->yyval = new Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(1-1)], 'alias' => null)); 
+         $this->yyval = new PHPParser_Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(1-1)], 'alias' => null)); 
     }
 
     private function yyn19() {
-         $this->yyval = new Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(3-1)], 'alias' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(3-1)], 'alias' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn20() {
-         $this->yyval = new Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(2-2)], 'alias' => null)); 
+         $this->yyval = new PHPParser_Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(2-2)], 'alias' => null)); 
     }
 
     private function yyn21() {
-         $this->yyval = new Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(4-2)], 'alias' => $this->yyastk[$this->yysp-(4-4)])); 
+         $this->yyval = new PHPParser_Node_Stmt_UseUse(array('ns' => $this->yyastk[$this->yysp-(4-2)], 'alias' => $this->yyastk[$this->yysp-(4-4)])); 
     }
 
     private function yyn22() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Stmt_ConstConst(array('name' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Stmt_ConstConst(array('name' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn23() {
-         $this->yyval = array(new Node_Stmt_ConstConst(array('name' => $this->yyastk[$this->yysp-(4-2)], 'value' => $this->yyastk[$this->yysp-(4-4)]))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_ConstConst(array('name' => $this->yyastk[$this->yysp-(4-2)], 'value' => $this->yyastk[$this->yysp-(4-4)]))); 
     }
 
     private function yyn24() {
@@ -1552,67 +1552,67 @@ class ParserDebug
     }
 
     private function yyn31() {
-         $this->yyval = new Node_Stmt_If(array('cond' => $this->yyastk[$this->yysp-(7-3)], 'stmts' => is_array($this->yyastk[$this->yysp-(7-5)]) ? $this->yyastk[$this->yysp-(7-5)] : array($this->yyastk[$this->yysp-(7-5)]), 'elseifList' => $this->yyastk[$this->yysp-(7-6)], 'else' => $this->yyastk[$this->yysp-(7-7)])); 
+         $this->yyval = new PHPParser_Node_Stmt_If(array('cond' => $this->yyastk[$this->yysp-(7-3)], 'stmts' => is_array($this->yyastk[$this->yysp-(7-5)]) ? $this->yyastk[$this->yysp-(7-5)] : array($this->yyastk[$this->yysp-(7-5)]), 'elseifList' => $this->yyastk[$this->yysp-(7-6)], 'else' => $this->yyastk[$this->yysp-(7-7)])); 
     }
 
     private function yyn32() {
-         $this->yyval = new Node_Stmt_If(array('cond' => $this->yyastk[$this->yysp-(10-3)], 'stmts' => $this->yyastk[$this->yysp-(10-6)], 'elseifList' => $this->yyastk[$this->yysp-(10-7)], 'else' => $this->yyastk[$this->yysp-(10-8)])); 
+         $this->yyval = new PHPParser_Node_Stmt_If(array('cond' => $this->yyastk[$this->yysp-(10-3)], 'stmts' => $this->yyastk[$this->yysp-(10-6)], 'elseifList' => $this->yyastk[$this->yysp-(10-7)], 'else' => $this->yyastk[$this->yysp-(10-8)])); 
     }
 
     private function yyn33() {
-         $this->yyval = new Node_Stmt_While(array('cond' => $this->yyastk[$this->yysp-(5-3)], 'stmts' => is_array($this->yyastk[$this->yysp-(5-5)]) ? $this->yyastk[$this->yysp-(5-5)] : array($this->yyastk[$this->yysp-(5-5)]))); 
+         $this->yyval = new PHPParser_Node_Stmt_While(array('cond' => $this->yyastk[$this->yysp-(5-3)], 'stmts' => is_array($this->yyastk[$this->yysp-(5-5)]) ? $this->yyastk[$this->yysp-(5-5)] : array($this->yyastk[$this->yysp-(5-5)]))); 
     }
 
     private function yyn34() {
-         $this->yyval = new Node_Stmt_Do(array('stmts' => is_array($this->yyastk[$this->yysp-(7-2)]) ? $this->yyastk[$this->yysp-(7-2)] : array($this->yyastk[$this->yysp-(7-2)]), 'cond' => $this->yyastk[$this->yysp-(7-5)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Do(array('stmts' => is_array($this->yyastk[$this->yysp-(7-2)]) ? $this->yyastk[$this->yysp-(7-2)] : array($this->yyastk[$this->yysp-(7-2)]), 'cond' => $this->yyastk[$this->yysp-(7-5)])); 
     }
 
     private function yyn35() {
-         $this->yyval = new Node_Stmt_For(array('init' => $this->yyastk[$this->yysp-(9-3)], 'cond' => $this->yyastk[$this->yysp-(9-5)], 'loop' => $this->yyastk[$this->yysp-(9-7)], 'stmts' => is_array($this->yyastk[$this->yysp-(9-9)]) ? $this->yyastk[$this->yysp-(9-9)] : array($this->yyastk[$this->yysp-(9-9)]))); 
+         $this->yyval = new PHPParser_Node_Stmt_For(array('init' => $this->yyastk[$this->yysp-(9-3)], 'cond' => $this->yyastk[$this->yysp-(9-5)], 'loop' => $this->yyastk[$this->yysp-(9-7)], 'stmts' => is_array($this->yyastk[$this->yysp-(9-9)]) ? $this->yyastk[$this->yysp-(9-9)] : array($this->yyastk[$this->yysp-(9-9)]))); 
     }
 
     private function yyn36() {
-         $this->yyval = new Node_Stmt_Switch(array('cond' => $this->yyastk[$this->yysp-(5-3)], 'caseList' => $this->yyastk[$this->yysp-(5-5)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Switch(array('cond' => $this->yyastk[$this->yysp-(5-3)], 'caseList' => $this->yyastk[$this->yysp-(5-5)])); 
     }
 
     private function yyn37() {
-         $this->yyval = new Node_Stmt_Break(array('num' => null)); 
+         $this->yyval = new PHPParser_Node_Stmt_Break(array('num' => null)); 
     }
 
     private function yyn38() {
-         $this->yyval = new Node_Stmt_Break(array('num' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Break(array('num' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn39() {
-         $this->yyval = new Node_Stmt_Continue(array('num' => null)); 
+         $this->yyval = new PHPParser_Node_Stmt_Continue(array('num' => null)); 
     }
 
     private function yyn40() {
-         $this->yyval = new Node_Stmt_Continue(array('num' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Continue(array('num' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn41() {
-         $this->yyval = new Node_Stmt_Return(array('expr' => null)); 
+         $this->yyval = new PHPParser_Node_Stmt_Return(array('expr' => null)); 
     }
 
     private function yyn42() {
-         $this->yyval = new Node_Stmt_Return(array('expr' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Return(array('expr' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn43() {
-         $this->yyval = new Node_Stmt_Global(array('vars' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Global(array('vars' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn44() {
-         $this->yyval = new Node_Stmt_Static(array('vars' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Static(array('vars' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn45() {
-         $this->yyval = new Node_Stmt_Echo(array('exprs' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Echo(array('exprs' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn46() {
-         $this->yyval = new Node_Stmt_InlineHTML(array('value' => $this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = new PHPParser_Node_Stmt_InlineHTML(array('value' => $this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn47() {
@@ -1620,23 +1620,23 @@ class ParserDebug
     }
 
     private function yyn48() {
-         $this->yyval = new Node_Stmt_Unset(array('vars' => $this->yyastk[$this->yysp-(5-3)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Unset(array('vars' => $this->yyastk[$this->yysp-(5-3)])); 
     }
 
     private function yyn49() {
-         $this->yyval = new Node_Stmt_Foreach(array('expr' => $this->yyastk[$this->yysp-(7-3)], 'keyVar' => null, 'byRef' => false, 'valueVar' => $this->yyastk[$this->yysp-(7-5)], 'stmts' => is_array($this->yyastk[$this->yysp-(7-7)]) ? $this->yyastk[$this->yysp-(7-7)] : array($this->yyastk[$this->yysp-(7-7)]))); 
+         $this->yyval = new PHPParser_Node_Stmt_Foreach(array('expr' => $this->yyastk[$this->yysp-(7-3)], 'keyVar' => null, 'byRef' => false, 'valueVar' => $this->yyastk[$this->yysp-(7-5)], 'stmts' => is_array($this->yyastk[$this->yysp-(7-7)]) ? $this->yyastk[$this->yysp-(7-7)] : array($this->yyastk[$this->yysp-(7-7)]))); 
     }
 
     private function yyn50() {
-         $this->yyval = new Node_Stmt_Foreach(array('expr' => $this->yyastk[$this->yysp-(8-3)], 'keyVar' => null, 'byRef' => true, 'valueVar' => $this->yyastk[$this->yysp-(8-6)], 'stmts' => is_array($this->yyastk[$this->yysp-(8-8)]) ? $this->yyastk[$this->yysp-(8-8)] : array($this->yyastk[$this->yysp-(8-8)]))); 
+         $this->yyval = new PHPParser_Node_Stmt_Foreach(array('expr' => $this->yyastk[$this->yysp-(8-3)], 'keyVar' => null, 'byRef' => true, 'valueVar' => $this->yyastk[$this->yysp-(8-6)], 'stmts' => is_array($this->yyastk[$this->yysp-(8-8)]) ? $this->yyastk[$this->yysp-(8-8)] : array($this->yyastk[$this->yysp-(8-8)]))); 
     }
 
     private function yyn51() {
-         $this->yyval = new Node_Stmt_Foreach(array('expr' => $this->yyastk[$this->yysp-(10-3)], 'keyVar' => $this->yyastk[$this->yysp-(10-5)], 'byRef' => $this->yyastk[$this->yysp-(10-7)], 'valueVar' => $this->yyastk[$this->yysp-(10-8)], 'stmts' => is_array($this->yyastk[$this->yysp-(10-10)]) ? $this->yyastk[$this->yysp-(10-10)] : array($this->yyastk[$this->yysp-(10-10)]))); 
+         $this->yyval = new PHPParser_Node_Stmt_Foreach(array('expr' => $this->yyastk[$this->yysp-(10-3)], 'keyVar' => $this->yyastk[$this->yysp-(10-5)], 'byRef' => $this->yyastk[$this->yysp-(10-7)], 'valueVar' => $this->yyastk[$this->yysp-(10-8)], 'stmts' => is_array($this->yyastk[$this->yysp-(10-10)]) ? $this->yyastk[$this->yysp-(10-10)] : array($this->yyastk[$this->yysp-(10-10)]))); 
     }
 
     private function yyn52() {
-         $this->yyval = new Node_Stmt_Declare(array('declares' => $this->yyastk[$this->yysp-(5-3)], 'stmts' => is_array($this->yyastk[$this->yysp-(5-5)]) ? $this->yyastk[$this->yysp-(5-5)] : array($this->yyastk[$this->yysp-(5-5)]))); 
+         $this->yyval = new PHPParser_Node_Stmt_Declare(array('declares' => $this->yyastk[$this->yysp-(5-3)], 'stmts' => is_array($this->yyastk[$this->yysp-(5-5)]) ? $this->yyastk[$this->yysp-(5-5)] : array($this->yyastk[$this->yysp-(5-5)]))); 
     }
 
     private function yyn53() {
@@ -1644,19 +1644,19 @@ class ParserDebug
     }
 
     private function yyn54() {
-         $this->yyval = new Node_Stmt_TryCatch(array('stmts' => $this->yyastk[$this->yysp-(5-3)], 'catches' => $this->yyastk[$this->yysp-(5-5)])); 
+         $this->yyval = new PHPParser_Node_Stmt_TryCatch(array('stmts' => $this->yyastk[$this->yysp-(5-3)], 'catches' => $this->yyastk[$this->yysp-(5-5)])); 
     }
 
     private function yyn55() {
-         $this->yyval = new Node_Stmt_Throw(array('expr' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Throw(array('expr' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn56() {
-         $this->yyval = new Node_Stmt_Goto(array('name' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Goto(array('name' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn57() {
-         $this->yyval = new Node_Stmt_Label(array('name' => $this->yyastk[$this->yysp-(2-1)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Label(array('name' => $this->yyastk[$this->yysp-(2-1)])); 
     }
 
     private function yyn58() {
@@ -1668,7 +1668,7 @@ class ParserDebug
     }
 
     private function yyn60() {
-         $this->yyval = new Node_Stmt_Catch(array('type' => $this->yyastk[$this->yysp-(8-3)], 'var' => substr($this->yyastk[$this->yysp-(8-4)], 1), 'stmts' => $this->yyastk[$this->yysp-(8-7)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Catch(array('type' => $this->yyastk[$this->yysp-(8-3)], 'var' => substr($this->yyastk[$this->yysp-(8-4)], 1), 'stmts' => $this->yyastk[$this->yysp-(8-7)])); 
     }
 
     private function yyn61() {
@@ -1688,15 +1688,15 @@ class ParserDebug
     }
 
     private function yyn65() {
-         $this->yyval = new Node_Stmt_Func(array('byRef' => $this->yyastk[$this->yysp-(9-2)], 'name' => $this->yyastk[$this->yysp-(9-3)], 'params' => $this->yyastk[$this->yysp-(9-5)], 'stmts' => $this->yyastk[$this->yysp-(9-8)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Func(array('byRef' => $this->yyastk[$this->yysp-(9-2)], 'name' => $this->yyastk[$this->yysp-(9-3)], 'params' => $this->yyastk[$this->yysp-(9-5)], 'stmts' => $this->yyastk[$this->yysp-(9-8)])); 
     }
 
     private function yyn66() {
-         $this->yyval = new Node_Stmt_Class(array('type' => $this->yyastk[$this->yysp-(7-1)], 'name' => $this->yyastk[$this->yysp-(7-2)], 'extends' => $this->yyastk[$this->yysp-(7-3)], 'implements' => $this->yyastk[$this->yysp-(7-4)], 'stmts' => $this->yyastk[$this->yysp-(7-6)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Class(array('type' => $this->yyastk[$this->yysp-(7-1)], 'name' => $this->yyastk[$this->yysp-(7-2)], 'extends' => $this->yyastk[$this->yysp-(7-3)], 'implements' => $this->yyastk[$this->yysp-(7-4)], 'stmts' => $this->yyastk[$this->yysp-(7-6)])); 
     }
 
     private function yyn67() {
-         $this->yyval = new Node_Stmt_Interface(array('name' => $this->yyastk[$this->yysp-(6-2)], 'extends' => $this->yyastk[$this->yysp-(6-3)], 'stmts' => $this->yyastk[$this->yysp-(6-5)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Interface(array('name' => $this->yyastk[$this->yysp-(6-2)], 'extends' => $this->yyastk[$this->yysp-(6-3)], 'stmts' => $this->yyastk[$this->yysp-(6-5)])); 
     }
 
     private function yyn68() {
@@ -1704,11 +1704,11 @@ class ParserDebug
     }
 
     private function yyn69() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_ABSTRACT; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_ABSTRACT; 
     }
 
     private function yyn70() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_FINAL; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_FINAL; 
     }
 
     private function yyn71() {
@@ -1768,11 +1768,11 @@ class ParserDebug
     }
 
     private function yyn85() {
-         $this->yyval = array(new Node_Stmt_DeclareDeclare(array('key' => $this->yyastk[$this->yysp-(3-1)], 'value' => $this->yyastk[$this->yysp-(3-3)]))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_DeclareDeclare(array('key' => $this->yyastk[$this->yysp-(3-1)], 'value' => $this->yyastk[$this->yysp-(3-3)]))); 
     }
 
     private function yyn86() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Stmt_DeclareDeclare(array('key' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Stmt_DeclareDeclare(array('key' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn87() {
@@ -1796,11 +1796,11 @@ class ParserDebug
     }
 
     private function yyn92() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Stmt_Case(array('cond' => $this->yyastk[$this->yysp-(5-3)], 'stmts' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Stmt_Case(array('cond' => $this->yyastk[$this->yysp-(5-3)], 'stmts' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn93() {
-         $this->yyastk[$this->yysp-(4-1)][] = new Node_Stmt_Case(array('cond' => null, 'stmts' => $this->yyastk[$this->yysp-(4-4)])); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
+         $this->yyastk[$this->yysp-(4-1)][] = new PHPParser_Node_Stmt_Case(array('cond' => null, 'stmts' => $this->yyastk[$this->yysp-(4-4)])); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
     }
 
     private function yyn94() {
@@ -1824,7 +1824,7 @@ class ParserDebug
     }
 
     private function yyn99() {
-         $this->yyastk[$this->yysp-(6-1)][] = new Node_Stmt_ElseIf(array('cond' => $this->yyastk[$this->yysp-(6-4)], 'stmts' => is_array($this->yyastk[$this->yysp-(6-6)]) ? $this->yyastk[$this->yysp-(6-6)] : array($this->yyastk[$this->yysp-(6-6)]))); $this->yyval = $this->yyastk[$this->yysp-(6-1)]; 
+         $this->yyastk[$this->yysp-(6-1)][] = new PHPParser_Node_Stmt_ElseIf(array('cond' => $this->yyastk[$this->yysp-(6-4)], 'stmts' => is_array($this->yyastk[$this->yysp-(6-6)]) ? $this->yyastk[$this->yysp-(6-6)] : array($this->yyastk[$this->yysp-(6-6)]))); $this->yyval = $this->yyastk[$this->yysp-(6-1)]; 
     }
 
     private function yyn100() {
@@ -1832,7 +1832,7 @@ class ParserDebug
     }
 
     private function yyn101() {
-         $this->yyastk[$this->yysp-(7-1)][] = new Node_Stmt_ElseIf(array('cond' => $this->yyastk[$this->yysp-(7-4)], 'stmts' => $this->yyastk[$this->yysp-(7-7)])); $this->yyval = $this->yyastk[$this->yysp-(7-1)]; 
+         $this->yyastk[$this->yysp-(7-1)][] = new PHPParser_Node_Stmt_ElseIf(array('cond' => $this->yyastk[$this->yysp-(7-4)], 'stmts' => $this->yyastk[$this->yysp-(7-7)])); $this->yyval = $this->yyastk[$this->yysp-(7-1)]; 
     }
 
     private function yyn102() {
@@ -1840,7 +1840,7 @@ class ParserDebug
     }
 
     private function yyn103() {
-         $this->yyval = new Node_Stmt_Else(array('stmts' => is_array($this->yyastk[$this->yysp-(2-2)]) ? $this->yyastk[$this->yysp-(2-2)] : array($this->yyastk[$this->yysp-(2-2)]))); 
+         $this->yyval = new PHPParser_Node_Stmt_Else(array('stmts' => is_array($this->yyastk[$this->yysp-(2-2)]) ? $this->yyastk[$this->yysp-(2-2)] : array($this->yyastk[$this->yysp-(2-2)]))); 
     }
 
     private function yyn104() {
@@ -1848,7 +1848,7 @@ class ParserDebug
     }
 
     private function yyn105() {
-         $this->yyval = new Node_Stmt_Else(array('stmts' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Else(array('stmts' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn106() {
@@ -1860,19 +1860,19 @@ class ParserDebug
     }
 
     private function yyn108() {
-         $this->yyval = array(new Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(3-1)], 'name' => substr($this->yyastk[$this->yysp-(3-3)], 1), 'byRef' => $this->yyastk[$this->yysp-(3-2)], 'default' => null))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(3-1)], 'name' => substr($this->yyastk[$this->yysp-(3-3)], 1), 'byRef' => $this->yyastk[$this->yysp-(3-2)], 'default' => null))); 
     }
 
     private function yyn109() {
-         $this->yyval = array(new Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(5-1)], 'name' => substr($this->yyastk[$this->yysp-(5-3)], 1), 'byRef' => $this->yyastk[$this->yysp-(5-2)], 'default' => $this->yyastk[$this->yysp-(5-5)]))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(5-1)], 'name' => substr($this->yyastk[$this->yysp-(5-3)], 1), 'byRef' => $this->yyastk[$this->yysp-(5-2)], 'default' => $this->yyastk[$this->yysp-(5-5)]))); 
     }
 
     private function yyn110() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(5-3)], 'name' => substr($this->yyastk[$this->yysp-(5-5)], 1), 'byRef' => $this->yyastk[$this->yysp-(5-4)], 'default' => null)); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(5-3)], 'name' => substr($this->yyastk[$this->yysp-(5-5)], 1), 'byRef' => $this->yyastk[$this->yysp-(5-4)], 'default' => null)); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn111() {
-         $this->yyastk[$this->yysp-(7-1)][] = new Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(7-3)], 'name' => substr($this->yyastk[$this->yysp-(7-5)], 1), 'byRef' => $this->yyastk[$this->yysp-(7-4)], 'default' => $this->yyastk[$this->yysp-(7-7)])); $this->yyval = $this->yyastk[$this->yysp-(7-1)]; 
+         $this->yyastk[$this->yysp-(7-1)][] = new PHPParser_Node_Stmt_FuncParam(array('type' => $this->yyastk[$this->yysp-(7-3)], 'name' => substr($this->yyastk[$this->yysp-(7-5)], 1), 'byRef' => $this->yyastk[$this->yysp-(7-4)], 'default' => $this->yyastk[$this->yysp-(7-7)])); $this->yyval = $this->yyastk[$this->yysp-(7-1)]; 
     }
 
     private function yyn112() {
@@ -1896,19 +1896,19 @@ class ParserDebug
     }
 
     private function yyn117() {
-         $this->yyval = array(new Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(1-1)], 'byRef' => false))); 
+         $this->yyval = array(new PHPParser_Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(1-1)], 'byRef' => false))); 
     }
 
     private function yyn118() {
-         $this->yyval = array(new Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(2-2)], 'byRef' => true))); 
+         $this->yyval = array(new PHPParser_Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(2-2)], 'byRef' => true))); 
     }
 
     private function yyn119() {
-         $this->yyastk[$this->yysp-(3-1)][] = new Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
+         $this->yyastk[$this->yysp-(3-1)][] = new PHPParser_Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
     }
 
     private function yyn120() {
-         $this->yyastk[$this->yysp-(4-1)][] = new Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(4-4)], 'byRef' => true)); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
+         $this->yyastk[$this->yysp-(4-1)][] = new PHPParser_Node_Expr_FuncCallArg(array('value' => $this->yyastk[$this->yysp-(4-4)], 'byRef' => true)); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
     }
 
     private function yyn121() {
@@ -1920,31 +1920,31 @@ class ParserDebug
     }
 
     private function yyn123() {
-         $this->yyval = new Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
     }
 
     private function yyn124() {
-         $this->yyval = new Node_Variable(array('name' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn125() {
-         $this->yyval = new Node_Variable(array('name' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn126() {
-         $this->yyastk[$this->yysp-(3-1)][] = new Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(3-3)], 1), 'default' => null)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
+         $this->yyastk[$this->yysp-(3-1)][] = new PHPParser_Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(3-3)], 1), 'default' => null)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
     }
 
     private function yyn127() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(5-3)], 1), 'default' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(5-3)], 1), 'default' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn128() {
-         $this->yyval = array(new Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1), 'default' => null))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1), 'default' => null))); 
     }
 
     private function yyn129() {
-         $this->yyval = array(new Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(3-1)], 1), 'default' => $this->yyastk[$this->yysp-(3-3)]))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_StaticVar(array('name' => substr($this->yyastk[$this->yysp-(3-1)], 1), 'default' => $this->yyastk[$this->yysp-(3-3)]))); 
     }
 
     private function yyn130() {
@@ -1956,15 +1956,15 @@ class ParserDebug
     }
 
     private function yyn132() {
-         $this->yyval = new Node_Stmt_Property(array('type' => $this->yyastk[$this->yysp-(3-1)], 'props' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Stmt_Property(array('type' => $this->yyastk[$this->yysp-(3-1)], 'props' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn133() {
-         $this->yyval = new Node_Stmt_ClassConst(array('consts' => $this->yyastk[$this->yysp-(2-1)])); 
+         $this->yyval = new PHPParser_Node_Stmt_ClassConst(array('consts' => $this->yyastk[$this->yysp-(2-1)])); 
     }
 
     private function yyn134() {
-         $this->yyval = new Node_Stmt_ClassMethod(array('type' => $this->yyastk[$this->yysp-(8-1)], 'byRef' => $this->yyastk[$this->yysp-(8-3)], 'name' => $this->yyastk[$this->yysp-(8-4)], 'params' => $this->yyastk[$this->yysp-(8-6)], 'stmts' => $this->yyastk[$this->yysp-(8-8)])); 
+         $this->yyval = new PHPParser_Node_Stmt_ClassMethod(array('type' => $this->yyastk[$this->yysp-(8-1)], 'byRef' => $this->yyastk[$this->yysp-(8-3)], 'name' => $this->yyastk[$this->yysp-(8-4)], 'params' => $this->yyastk[$this->yysp-(8-6)], 'stmts' => $this->yyastk[$this->yysp-(8-8)])); 
     }
 
     private function yyn135() {
@@ -1980,11 +1980,11 @@ class ParserDebug
     }
 
     private function yyn138() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_PUBLIC; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_PUBLIC; 
     }
 
     private function yyn139() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_PUBLIC; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_PUBLIC; 
     }
 
     private function yyn140() {
@@ -1996,55 +1996,55 @@ class ParserDebug
     }
 
     private function yyn142() {
-         Node_Stmt_Class::verifyModifier($this->yyastk[$this->yysp-(2-1)], $this->yyastk[$this->yysp-(2-2)]); $this->yyval = $this->yyastk[$this->yysp-(2-1)] | $this->yyastk[$this->yysp-(2-2)]; 
+         PHPParser_Node_Stmt_Class::verifyModifier($this->yyastk[$this->yysp-(2-1)], $this->yyastk[$this->yysp-(2-2)]); $this->yyval = $this->yyastk[$this->yysp-(2-1)] | $this->yyastk[$this->yysp-(2-2)]; 
     }
 
     private function yyn143() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_PUBLIC; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_PUBLIC; 
     }
 
     private function yyn144() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_PROTECTED; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_PROTECTED; 
     }
 
     private function yyn145() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_PRIVATE; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_PRIVATE; 
     }
 
     private function yyn146() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_STATIC; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_STATIC; 
     }
 
     private function yyn147() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_ABSTRACT; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_ABSTRACT; 
     }
 
     private function yyn148() {
-         $this->yyval = Node_Stmt_Class::MODIFIER_FINAL; 
+         $this->yyval = PHPParser_Node_Stmt_Class::MODIFIER_FINAL; 
     }
 
     private function yyn149() {
-         $this->yyastk[$this->yysp-(3-1)][] = new Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(3-3)], 1), 'default' => null)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
+         $this->yyastk[$this->yysp-(3-1)][] = new PHPParser_Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(3-3)], 1), 'default' => null)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
     }
 
     private function yyn150() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(5-3)], 1), 'default' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(5-3)], 1), 'default' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn151() {
-         $this->yyval = array(new Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1), 'default' => null))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1), 'default' => null))); 
     }
 
     private function yyn152() {
-         $this->yyval = array(new Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(3-1)], 1), 'default' => $this->yyastk[$this->yysp-(3-3)]))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_PropertyProperty(array('name' => substr($this->yyastk[$this->yysp-(3-1)], 1), 'default' => $this->yyastk[$this->yysp-(3-3)]))); 
     }
 
     private function yyn153() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Stmt_ClassConstConst(array('name' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Stmt_ClassConstConst(array('name' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)])); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn154() {
-         $this->yyval = array(new Node_Stmt_ClassConstConst(array('name' => $this->yyastk[$this->yysp-(4-2)], 'value' => $this->yyastk[$this->yysp-(4-4)]))); 
+         $this->yyval = array(new PHPParser_Node_Stmt_ClassConstConst(array('name' => $this->yyastk[$this->yysp-(4-2)], 'value' => $this->yyastk[$this->yysp-(4-4)]))); 
     }
 
     private function yyn155() {
@@ -2068,203 +2068,203 @@ class ParserDebug
     }
 
     private function yyn160() {
-         $this->yyval = new Node_Expr_List(array('assignList' => $this->yyastk[$this->yysp-(6-3)], 'expr' => $this->yyastk[$this->yysp-(6-6)])); 
+         $this->yyval = new PHPParser_Node_Expr_List(array('assignList' => $this->yyastk[$this->yysp-(6-3)], 'expr' => $this->yyastk[$this->yysp-(6-6)])); 
     }
 
     private function yyn161() {
-         $this->yyval = new Node_Expr_Assign(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Assign(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn162() {
-         $this->yyval = new Node_Expr_AssignRef(array('var' => $this->yyastk[$this->yysp-(4-1)], 'refVar' => $this->yyastk[$this->yysp-(4-4)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignRef(array('var' => $this->yyastk[$this->yysp-(4-1)], 'refVar' => $this->yyastk[$this->yysp-(4-4)])); 
     }
 
     private function yyn163() {
-         $this->yyval = new Node_Expr_Assign(array('var' => $this->yyastk[$this->yysp-(6-1)], 'expr' => new Node_Expr_New(array('class' => $this->yyastk[$this->yysp-(6-5)], 'args' => $this->yyastk[$this->yysp-(6-6)])))); 
+         $this->yyval = new PHPParser_Node_Expr_Assign(array('var' => $this->yyastk[$this->yysp-(6-1)], 'expr' => new PHPParser_Node_Expr_New(array('class' => $this->yyastk[$this->yysp-(6-5)], 'args' => $this->yyastk[$this->yysp-(6-6)])))); 
     }
 
     private function yyn164() {
-         $this->yyval = new Node_Expr_New(array('class' => $this->yyastk[$this->yysp-(3-2)], 'args' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_New(array('class' => $this->yyastk[$this->yysp-(3-2)], 'args' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn165() {
-         $this->yyval = new Node_Expr_Clone(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_Clone(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn166() {
-         $this->yyval = new Node_Expr_AssignPlus(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignPlus(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn167() {
-         $this->yyval = new Node_Expr_AssignMinus(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignMinus(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn168() {
-         $this->yyval = new Node_Expr_AssignMul(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignMul(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn169() {
-         $this->yyval = new Node_Expr_AssignDiv(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignDiv(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn170() {
-         $this->yyval = new Node_Expr_AssignConcat(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignConcat(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn171() {
-         $this->yyval = new Node_Expr_AssignMod(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignMod(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn172() {
-         $this->yyval = new Node_Expr_AssignBinAnd(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignBinAnd(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn173() {
-         $this->yyval = new Node_Expr_AssignBinOr(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignBinOr(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn174() {
-         $this->yyval = new Node_Expr_AssignBinXor(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignBinXor(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn175() {
-         $this->yyval = new Node_Expr_AssignShiftLeft(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignShiftLeft(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn176() {
-         $this->yyval = new Node_Expr_AssignShiftRight(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_AssignShiftRight(array('var' => $this->yyastk[$this->yysp-(3-1)], 'expr' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn177() {
-         $this->yyval = new Node_Expr_PostInc(array('var' => $this->yyastk[$this->yysp-(2-1)])); 
+         $this->yyval = new PHPParser_Node_Expr_PostInc(array('var' => $this->yyastk[$this->yysp-(2-1)])); 
     }
 
     private function yyn178() {
-         $this->yyval = new Node_Expr_PreInc(array('var' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_PreInc(array('var' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn179() {
-         $this->yyval = new Node_Expr_PostDec(array('var' => $this->yyastk[$this->yysp-(2-1)])); 
+         $this->yyval = new PHPParser_Node_Expr_PostDec(array('var' => $this->yyastk[$this->yysp-(2-1)])); 
     }
 
     private function yyn180() {
-         $this->yyval = new Node_Expr_PreDec(array('var' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_PreDec(array('var' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn181() {
-         $this->yyval = new Node_Expr_BooleanOr(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_BooleanOr(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn182() {
-         $this->yyval = new Node_Expr_BooleanAnd(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_BooleanAnd(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn183() {
-         $this->yyval = new Node_Expr_LogicalOr(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_LogicalOr(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn184() {
-         $this->yyval = new Node_Expr_LogicalAnd(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_LogicalAnd(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn185() {
-         $this->yyval = new Node_Expr_LogicalXor(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_LogicalXor(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn186() {
-         $this->yyval = new Node_Expr_BinaryOr(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_BinaryOr(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn187() {
-         $this->yyval = new Node_Expr_BinaryAnd(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_BinaryAnd(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn188() {
-         $this->yyval = new Node_Expr_BinaryXor(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_BinaryXor(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn189() {
-         $this->yyval = new Node_Expr_Concat(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Concat(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn190() {
-         $this->yyval = new Node_Expr_Plus(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Plus(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn191() {
-         $this->yyval = new Node_Expr_Minus(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Minus(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn192() {
-         $this->yyval = new Node_Expr_Mul(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Mul(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn193() {
-         $this->yyval = new Node_Expr_Div(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Div(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn194() {
-         $this->yyval = new Node_Expr_Mod(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Mod(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn195() {
-         $this->yyval = new Node_Expr_ShiftLeft(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ShiftLeft(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn196() {
-         $this->yyval = new Node_Expr_ShiftRight(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ShiftRight(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn197() {
-         $this->yyval = new Node_Expr_UnaryPlus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_UnaryPlus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn198() {
-         $this->yyval = new Node_Expr_UnaryMinus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_UnaryMinus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn199() {
-         $this->yyval = new Node_Expr_BooleanNot(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_BooleanNot(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn200() {
-         $this->yyval = new Node_Expr_BinaryNot(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_BinaryNot(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn201() {
-         $this->yyval = new Node_Expr_Identical(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Identical(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn202() {
-         $this->yyval = new Node_Expr_NotIdentical(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_NotIdentical(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn203() {
-         $this->yyval = new Node_Expr_Equal(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Equal(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn204() {
-         $this->yyval = new Node_Expr_NotEqual(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_NotEqual(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn205() {
-         $this->yyval = new Node_Expr_Smaller(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Smaller(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn206() {
-         $this->yyval = new Node_Expr_SmallerOrEqual(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_SmallerOrEqual(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn207() {
-         $this->yyval = new Node_Expr_Greater(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Greater(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn208() {
-         $this->yyval = new Node_Expr_GreaterOrEqual(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_GreaterOrEqual(array('left' => $this->yyastk[$this->yysp-(3-1)], 'right' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn209() {
-         $this->yyval = new Node_Expr_Instanceof(array('expr' => $this->yyastk[$this->yysp-(3-1)], 'class' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Instanceof(array('expr' => $this->yyastk[$this->yysp-(3-1)], 'class' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn210() {
@@ -2272,75 +2272,75 @@ class ParserDebug
     }
 
     private function yyn211() {
-         $this->yyval = new Node_Expr_Ternary(array('cond' => $this->yyastk[$this->yysp-(5-1)], 'if' => $this->yyastk[$this->yysp-(5-3)], 'else' => $this->yyastk[$this->yysp-(5-5)])); 
+         $this->yyval = new PHPParser_Node_Expr_Ternary(array('cond' => $this->yyastk[$this->yysp-(5-1)], 'if' => $this->yyastk[$this->yysp-(5-3)], 'else' => $this->yyastk[$this->yysp-(5-5)])); 
     }
 
     private function yyn212() {
-         $this->yyval = new Node_Expr_Ternary(array('cond' => $this->yyastk[$this->yysp-(4-1)], 'if' => null, 'else' => $this->yyastk[$this->yysp-(4-4)])); 
+         $this->yyval = new PHPParser_Node_Expr_Ternary(array('cond' => $this->yyastk[$this->yysp-(4-1)], 'if' => null, 'else' => $this->yyastk[$this->yysp-(4-4)])); 
     }
 
     private function yyn213() {
-         $this->yyval = new Node_Expr_Isset(array('vars' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Isset(array('vars' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn214() {
-         $this->yyval = new Node_Expr_Empty(array('var' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Empty(array('var' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn215() {
-         $this->yyval = new Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => Node_Expr_Include::TYPE_INCLUDE)); 
+         $this->yyval = new PHPParser_Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => PHPParser_Node_Expr_Include::TYPE_INCLUDE)); 
     }
 
     private function yyn216() {
-         $this->yyval = new Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => Node_Expr_Include::TYPE_INCLUDE_ONCE)); 
+         $this->yyval = new PHPParser_Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => PHPParser_Node_Expr_Include::TYPE_INCLUDE_ONCE)); 
     }
 
     private function yyn217() {
-         $this->yyval = new Node_Expr_Eval(array('expr' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Eval(array('expr' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn218() {
-         $this->yyval = new Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => Node_Expr_Include::TYPE_REQUIRE)); 
+         $this->yyval = new PHPParser_Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => PHPParser_Node_Expr_Include::TYPE_REQUIRE)); 
     }
 
     private function yyn219() {
-         $this->yyval = new Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => Node_Expr_Include::TYPE_REQUIRE_ONCE)); 
+         $this->yyval = new PHPParser_Node_Expr_Include(array('expr' => $this->yyastk[$this->yysp-(2-2)], 'type' => PHPParser_Node_Expr_Include::TYPE_REQUIRE_ONCE)); 
     }
 
     private function yyn220() {
-         $this->yyval = new Node_Expr_IntCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_IntCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn221() {
-         $this->yyval = new Node_Expr_DoubleCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_DoubleCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn222() {
-         $this->yyval = new Node_Expr_StringCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_StringCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn223() {
-         $this->yyval = new Node_Expr_ArrayCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn224() {
-         $this->yyval = new Node_Expr_ObjectCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_ObjectCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn225() {
-         $this->yyval = new Node_Expr_BoolCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_BoolCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn226() {
-         $this->yyval = new Node_Expr_UnsetCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_UnsetCast(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn227() {
-         $this->yyval = new Node_Expr_Exit(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_Exit(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn228() {
-         $this->yyval = new Node_Expr_ErrorSuppress(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_ErrorSuppress(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn229() {
@@ -2348,19 +2348,19 @@ class ParserDebug
     }
 
     private function yyn230() {
-         $this->yyval = new Node_Expr_Array(array('items' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Array(array('items' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn231() {
-         $this->yyval = new Node_Expr_ShellExec(array('parts' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_ShellExec(array('parts' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn232() {
-         $this->yyval = new Node_Expr_Print(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_Print(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn233() {
-         $this->yyval = new Node_Expr_LambdaFunc(array('byRef' => $this->yyastk[$this->yysp-(9-2)], 'params' => $this->yyastk[$this->yysp-(9-4)], 'useVars' => $this->yyastk[$this->yysp-(9-6)], 'stmts' => $this->yyastk[$this->yysp-(9-8)])); 
+         $this->yyval = new PHPParser_Node_Expr_LambdaFunc(array('byRef' => $this->yyastk[$this->yysp-(9-2)], 'params' => $this->yyastk[$this->yysp-(9-4)], 'useVars' => $this->yyastk[$this->yysp-(9-6)], 'stmts' => $this->yyastk[$this->yysp-(9-8)])); 
     }
 
     private function yyn234() {
@@ -2372,37 +2372,37 @@ class ParserDebug
     }
 
     private function yyn236() {
-         $this->yyastk[$this->yysp-(4-1)][] = new Node_Expr_LambdaFuncUse(array('var' => substr($this->yyastk[$this->yysp-(4-4)], 1), 'byRef' => $this->yyastk[$this->yysp-(4-3)])); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
+         $this->yyastk[$this->yysp-(4-1)][] = new PHPParser_Node_Expr_LambdaFuncUse(array('var' => substr($this->yyastk[$this->yysp-(4-4)], 1), 'byRef' => $this->yyastk[$this->yysp-(4-3)])); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
     }
 
     private function yyn237() {
-         $this->yyval = array(new Node_Expr_LambdaFuncUse(array('var' => substr($this->yyastk[$this->yysp-(2-2)], 1), 'byRef' => $this->yyastk[$this->yysp-(2-1)]))); 
+         $this->yyval = array(new PHPParser_Node_Expr_LambdaFuncUse(array('var' => substr($this->yyastk[$this->yysp-(2-2)], 1), 'byRef' => $this->yyastk[$this->yysp-(2-1)]))); 
     }
 
     private function yyn238() {
-         $this->yyval = new Node_Expr_FuncCall(array('func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_FuncCall(array('func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn239() {
-         $this->yyval = new Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(6-1)], 'func' => $this->yyastk[$this->yysp-(6-3)], 'args' => $this->yyastk[$this->yysp-(6-5)])); 
+         $this->yyval = new PHPParser_Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(6-1)], 'func' => $this->yyastk[$this->yysp-(6-3)], 'args' => $this->yyastk[$this->yysp-(6-5)])); 
     }
 
     private function yyn240() {
-         $this->yyval = new Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(6-1)], 'func' => $this->yyastk[$this->yysp-(6-3)], 'args' => $this->yyastk[$this->yysp-(6-5)])); 
+         $this->yyval = new PHPParser_Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(6-1)], 'func' => $this->yyastk[$this->yysp-(6-3)], 'args' => $this->yyastk[$this->yysp-(6-5)])); 
     }
 
     private function yyn241() {
         
-            if ($this->yyastk[$this->yysp-(4-1)] instanceof Node_Expr_StaticPropertyFetch) {
-                $this->yyval = new Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(4-1)]->class, 'func' => $this->yyastk[$this->yysp-(4-1)]->name, 'args' => $this->yyastk[$this->yysp-(4-3)]));
-            } elseif ($this->yyastk[$this->yysp-(4-1)] instanceof Node_Expr_ArrayDimFetch) {
+            if ($this->yyastk[$this->yysp-(4-1)] instanceof PHPParser_Node_Expr_StaticPropertyFetch) {
+                $this->yyval = new PHPParser_Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(4-1)]->class, 'func' => $this->yyastk[$this->yysp-(4-1)]->name, 'args' => $this->yyastk[$this->yysp-(4-3)]));
+            } elseif ($this->yyastk[$this->yysp-(4-1)] instanceof PHPParser_Node_Expr_ArrayDimFetch) {
                 $this->yyastk[$this->yysp-(4-2)] = $this->yyastk[$this->yysp-(4-1)]; // $2 is just a temporary variable. Nothing to do with the '('
-                while ($this->yyastk[$this->yysp-(4-2)]->var instanceof Node_Expr_ArrayDimFetch) {
+                while ($this->yyastk[$this->yysp-(4-2)]->var instanceof PHPParser_Node_Expr_ArrayDimFetch) {
                     $this->yyastk[$this->yysp-(4-2)] = $this->yyastk[$this->yysp-(4-2)]->var;
                 }
 
-                $this->yyval = new Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(4-2)]->var->class, 'func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)]));
-                $this->yyastk[$this->yysp-(4-2)]->var = new Node_Variable(array('name' => $this->yyastk[$this->yysp-(4-2)]->var->name));
+                $this->yyval = new PHPParser_Node_Expr_StaticCall(array('class' => $this->yyastk[$this->yysp-(4-2)]->var->class, 'func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)]));
+                $this->yyastk[$this->yysp-(4-2)]->var = new PHPParser_Node_Variable(array('name' => $this->yyastk[$this->yysp-(4-2)]->var->name));
             } else {
                 throw new Exception;
             }
@@ -2410,7 +2410,7 @@ class ParserDebug
     }
 
     private function yyn242() {
-         $this->yyval = new Node_Expr_FuncCall(array('func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_FuncCall(array('func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn243() {
@@ -2426,11 +2426,11 @@ class ParserDebug
     }
 
     private function yyn246() {
-         $this->yyastk[$this->yysp-(3-3)]->resolveType(Node_Name::RELATIVE); $this->yyval = $this->yyastk[$this->yysp-(3-3)]; 
+         $this->yyastk[$this->yysp-(3-3)]->resolveType(PHPParser_Node_Name::RELATIVE); $this->yyval = $this->yyastk[$this->yysp-(3-3)]; 
     }
 
     private function yyn247() {
-         $this->yyastk[$this->yysp-(2-2)]->resolveType(Node_Name::ABSOLUTE); $this->yyval = $this->yyastk[$this->yysp-(2-2)]; 
+         $this->yyastk[$this->yysp-(2-2)]->resolveType(PHPParser_Node_Name::ABSOLUTE); $this->yyval = $this->yyastk[$this->yysp-(2-2)]; 
     }
 
     private function yyn248() {
@@ -2454,19 +2454,19 @@ class ParserDebug
     }
 
     private function yyn253() {
-         $this->yyval = new Node_Expr_PropertyFetch(array('var' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_PropertyFetch(array('var' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn254() {
-         $this->yyval = new Node_Expr_PropertyFetch(array('var' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_PropertyFetch(array('var' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn255() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn256() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn257() {
@@ -2486,7 +2486,7 @@ class ParserDebug
     }
 
     private function yyn261() {
-         $this->yyval = array(Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = array(PHPParser_Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn262() {
@@ -2502,51 +2502,51 @@ class ParserDebug
     }
 
     private function yyn265() {
-         $this->yyval = new Node_Scalar_LNumber(array('value' => (int) $this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = new PHPParser_Node_Scalar_LNumber(array('value' => (int) $this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn266() {
-         $this->yyval = new Node_Scalar_DNumber(array('value' => (double) $this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = new PHPParser_Node_Scalar_DNumber(array('value' => (double) $this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn267() {
-         $this->yyval = Node_Scalar_String::create($this->yyastk[$this->yysp-(1-1)]); 
+         $this->yyval = PHPParser_Node_Scalar_String::create($this->yyastk[$this->yysp-(1-1)]); 
     }
 
     private function yyn268() {
-         $this->yyval = new Node_Scalar_LineConst(array()); 
+         $this->yyval = new PHPParser_Node_Scalar_LineConst(array()); 
     }
 
     private function yyn269() {
-         $this->yyval = new Node_Scalar_FileConst(array()); 
+         $this->yyval = new PHPParser_Node_Scalar_FileConst(array()); 
     }
 
     private function yyn270() {
-         $this->yyval = new Node_Scalar_DirConst(array()); 
+         $this->yyval = new PHPParser_Node_Scalar_DirConst(array()); 
     }
 
     private function yyn271() {
-         $this->yyval = new Node_Scalar_ClassConst(array()); 
+         $this->yyval = new PHPParser_Node_Scalar_ClassConst(array()); 
     }
 
     private function yyn272() {
-         $this->yyval = new Node_Scalar_MethodConst(array()); 
+         $this->yyval = new PHPParser_Node_Scalar_MethodConst(array()); 
     }
 
     private function yyn273() {
-         $this->yyval = new Node_Scalar_FuncConst(array()); 
+         $this->yyval = new PHPParser_Node_Scalar_FuncConst(array()); 
     }
 
     private function yyn274() {
-         $this->yyval = new Node_Scalar_NSConst(array()); 
+         $this->yyval = new PHPParser_Node_Scalar_NSConst(array()); 
     }
 
     private function yyn275() {
-         $this->yyval = new Node_Scalar_String(array('value' => Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(3-2)]), 'isBinary' => false, 'type' => '\'' === $this->yyastk[$this->yysp-(3-1)][3] ? Node_Scalar_String::SINGLE_QUOTED : Node_Scalar_String::DOUBLE_QUOTED)); 
+         $this->yyval = new PHPParser_Node_Scalar_String(array('value' => PHPParser_Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(3-2)]), 'isBinary' => false, 'type' => '\'' === $this->yyastk[$this->yysp-(3-1)][3] ? PHPParser_Node_Scalar_String::SINGLE_QUOTED : PHPParser_Node_Scalar_String::DOUBLE_QUOTED)); 
     }
 
     private function yyn276() {
-         $this->yyval = new Node_Scalar_String(array('value' => '', 'isBinary' => false, 'type' => Node_Scalar_String::SINGLE_QUOTED)); 
+         $this->yyval = new PHPParser_Node_Scalar_String(array('value' => '', 'isBinary' => false, 'type' => PHPParser_Node_Scalar_String::SINGLE_QUOTED)); 
     }
 
     private function yyn277() {
@@ -2554,27 +2554,27 @@ class ParserDebug
     }
 
     private function yyn278() {
-         $this->yyval = new Node_Expr_ConstFetch(array('name' => $this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = new PHPParser_Node_Expr_ConstFetch(array('name' => $this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn279() {
-         $this->yyval = new Node_Expr_UnaryPlus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_UnaryPlus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn280() {
-         $this->yyval = new Node_Expr_UnaryMinus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Expr_UnaryMinus(array('expr' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn281() {
-         $this->yyval = new Node_Expr_Array(array('items' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_Array(array('items' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn282() {
-         $this->yyval = new Node_Expr_ClassConstFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ClassConstFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn283() {
-         $this->yyval = new Node_Scalar_String(array('value' => $this->yyastk[$this->yysp-(1-1)], 'isBinary' => false, 'type' => Node_Scalar_String::SINGLE_QUOTED)); 
+         $this->yyval = new PHPParser_Node_Scalar_String(array('value' => $this->yyastk[$this->yysp-(1-1)], 'isBinary' => false, 'type' => PHPParser_Node_Scalar_String::SINGLE_QUOTED)); 
     }
 
     private function yyn284() {
@@ -2582,7 +2582,7 @@ class ParserDebug
     }
 
     private function yyn285() {
-         $this->yyval = new Node_Expr_ConstFetch(array('name' => $this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = new PHPParser_Node_Expr_ConstFetch(array('name' => $this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn286() {
@@ -2590,11 +2590,11 @@ class ParserDebug
     }
 
     private function yyn287() {
-         $this->yyval = new Node_Scalar_Encapsed(array('parts' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Scalar_Encapsed(array('parts' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn288() {
-         $this->yyval = new Node_Scalar_Encapsed(array('parts' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Scalar_Encapsed(array('parts' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn289() {
@@ -2614,19 +2614,19 @@ class ParserDebug
     }
 
     private function yyn293() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn294() {
-         $this->yyastk[$this->yysp-(3-1)][] = new Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
+         $this->yyastk[$this->yysp-(3-1)][] = new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
     }
 
     private function yyn295() {
-         $this->yyval = array(new Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(3-1)], 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false))); 
+         $this->yyval = array(new PHPParser_Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(3-1)], 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false))); 
     }
 
     private function yyn296() {
-         $this->yyval = array(new Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(1-1)], 'byRef' => false))); 
+         $this->yyval = array(new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(1-1)], 'byRef' => false))); 
     }
 
     private function yyn297() {
@@ -2646,23 +2646,23 @@ class ParserDebug
     }
 
     private function yyn301() {
-         $this->yyval = new Node_Expr_FuncCall(array('func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_FuncCall(array('func' => $this->yyastk[$this->yysp-(4-1)], 'args' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn302() {
-         $this->yyval = new Node_Expr_MethodCall(array('var' => $this->yyastk[$this->yysp-(6-1)], 'name' => $this->yyastk[$this->yysp-(6-3)], 'args' => $this->yyastk[$this->yysp-(6-5)])); 
+         $this->yyval = new PHPParser_Node_Expr_MethodCall(array('var' => $this->yyastk[$this->yysp-(6-1)], 'name' => $this->yyastk[$this->yysp-(6-3)], 'args' => $this->yyastk[$this->yysp-(6-5)])); 
     }
 
     private function yyn303() {
-         $this->yyval = new Node_Expr_PropertyFetch(array('var' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_PropertyFetch(array('var' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn304() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn305() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn306() {
@@ -2670,7 +2670,7 @@ class ParserDebug
     }
 
     private function yyn307() {
-         $this->yyval = new Node_Variable(array('name' => $this->yyastk[$this->yysp-(2-2)])); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => $this->yyastk[$this->yysp-(2-2)])); 
     }
 
     private function yyn308() {
@@ -2678,11 +2678,11 @@ class ParserDebug
     }
 
     private function yyn309() {
-         $this->yyval = new Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(4-1)], 'name' => $this->yyastk[$this->yysp-(4-4)])); 
+         $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(4-1)], 'name' => $this->yyastk[$this->yysp-(4-4)])); 
     }
 
     private function yyn310() {
-         $this->yyval = new Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(4-1)], 'name' => $this->yyastk[$this->yysp-(4-4)])); 
+         $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(4-1)], 'name' => $this->yyastk[$this->yysp-(4-4)])); 
     }
 
     private function yyn311() {
@@ -2690,43 +2690,43 @@ class ParserDebug
     }
 
     private function yyn312() {
-         $this->yyval = new Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => substr($this->yyastk[$this->yysp-(3-3)], 1))); 
+         $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => substr($this->yyastk[$this->yysp-(3-3)], 1))); 
     }
 
     private function yyn313() {
-         $this->yyval = new Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => substr($this->yyastk[$this->yysp-(3-3)], 1))); 
+         $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => substr($this->yyastk[$this->yysp-(3-3)], 1))); 
     }
 
     private function yyn314() {
-         $this->yyval = new Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(6-1)], 'name' => $this->yyastk[$this->yysp-(6-5)])); 
+         $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(6-1)], 'name' => $this->yyastk[$this->yysp-(6-5)])); 
     }
 
     private function yyn315() {
-         $this->yyval = new Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(6-1)], 'name' => $this->yyastk[$this->yysp-(6-5)])); 
+         $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch(array('class' => $this->yyastk[$this->yysp-(6-1)], 'name' => $this->yyastk[$this->yysp-(6-5)])); 
     }
 
     private function yyn316() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn317() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn318() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn319() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => $this->yyastk[$this->yysp-(4-1)], 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn320() {
-         $this->yyval = new Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
     }
 
     private function yyn321() {
-         $this->yyval = new Node_Variable(array('name' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn322() {
@@ -2778,35 +2778,35 @@ class ParserDebug
     }
 
     private function yyn334() {
-         $this->yyastk[$this->yysp-(5-1)][] = new Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
+         $this->yyastk[$this->yysp-(5-1)][] = new PHPParser_Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(5-3)], 'value' => $this->yyastk[$this->yysp-(5-5)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(5-1)]; 
     }
 
     private function yyn335() {
-         $this->yyastk[$this->yysp-(3-1)][] = new Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
+         $this->yyastk[$this->yysp-(3-1)][] = new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false)); $this->yyval = $this->yyastk[$this->yysp-(3-1)]; 
     }
 
     private function yyn336() {
-         $this->yyval = array(new Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(3-1)], 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false))); 
+         $this->yyval = array(new PHPParser_Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(3-1)], 'value' => $this->yyastk[$this->yysp-(3-3)], 'byRef' => false))); 
     }
 
     private function yyn337() {
-         $this->yyval = array(new Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(1-1)], 'byRef' => false))); 
+         $this->yyval = array(new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(1-1)], 'byRef' => false))); 
     }
 
     private function yyn338() {
-         $this->yyastk[$this->yysp-(6-1)][] = new Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(6-3)], 'value' => $this->yyastk[$this->yysp-(6-6)], 'byRef' => true)); $this->yyval = $this->yyastk[$this->yysp-(6-1)]; 
+         $this->yyastk[$this->yysp-(6-1)][] = new PHPParser_Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(6-3)], 'value' => $this->yyastk[$this->yysp-(6-6)], 'byRef' => true)); $this->yyval = $this->yyastk[$this->yysp-(6-1)]; 
     }
 
     private function yyn339() {
-         $this->yyastk[$this->yysp-(4-1)][] = new Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(4-4)], 'byRef' => true)); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
+         $this->yyastk[$this->yysp-(4-1)][] = new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(4-4)], 'byRef' => true)); $this->yyval = $this->yyastk[$this->yysp-(4-1)]; 
     }
 
     private function yyn340() {
-         $this->yyval = array(new Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(4-1)], 'value' => $this->yyastk[$this->yysp-(4-4)], 'byRef' => true))); 
+         $this->yyval = array(new PHPParser_Node_Expr_ArrayItem(array('key' => $this->yyastk[$this->yysp-(4-1)], 'value' => $this->yyastk[$this->yysp-(4-4)], 'byRef' => true))); 
     }
 
     private function yyn341() {
-         $this->yyval = array(new Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(2-2)], 'byRef' => true))); 
+         $this->yyval = array(new PHPParser_Node_Expr_ArrayItem(array('key' => null, 'value' => $this->yyastk[$this->yysp-(2-2)], 'byRef' => true))); 
     }
 
     private function yyn342() {
@@ -2814,7 +2814,7 @@ class ParserDebug
     }
 
     private function yyn343() {
-         $this->yyastk[$this->yysp-(2-1)][] = Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(2-2)]); $this->yyval = $this->yyastk[$this->yysp-(2-1)]; 
+         $this->yyastk[$this->yysp-(2-1)][] = PHPParser_Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(2-2)]); $this->yyval = $this->yyastk[$this->yysp-(2-1)]; 
     }
 
     private function yyn344() {
@@ -2822,27 +2822,27 @@ class ParserDebug
     }
 
     private function yyn345() {
-         $this->yyval = array(Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(2-1)]), $this->yyastk[$this->yysp-(2-2)]); 
+         $this->yyval = array(PHPParser_Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(2-1)]), $this->yyastk[$this->yysp-(2-2)]); 
     }
 
     private function yyn346() {
-         $this->yyval = new Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
     }
 
     private function yyn347() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => new Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(4-1)], 1))), 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => new PHPParser_Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(4-1)], 1))), 'dim' => $this->yyastk[$this->yysp-(4-3)])); 
     }
 
     private function yyn348() {
-         $this->yyval = new Node_Expr_PropertyFetch(array('var' => new Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(3-1)], 1))), 'name' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_PropertyFetch(array('var' => new PHPParser_Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(3-1)], 1))), 'name' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn349() {
-         $this->yyval = new Node_Variable(array('name' => $this->yyastk[$this->yysp-(3-2)])); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => $this->yyastk[$this->yysp-(3-2)])); 
     }
 
     private function yyn350() {
-         $this->yyval = new Node_Expr_ArrayDimFetch(array('var' => new Node_Variable(array('name' => $this->yyastk[$this->yysp-(6-2)])), 'dim' => $this->yyastk[$this->yysp-(6-4)])); 
+         $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(array('var' => new PHPParser_Node_Variable(array('name' => $this->yyastk[$this->yysp-(6-2)])), 'dim' => $this->yyastk[$this->yysp-(6-4)])); 
     }
 
     private function yyn351() {
@@ -2850,22 +2850,22 @@ class ParserDebug
     }
 
     private function yyn352() {
-         $this->yyval = new Node_Scalar_String(array('value' => $this->yyastk[$this->yysp-(1-1)], 'isBinary' => false, 'type' => Node_Scalar_String::SINGLE_QUOTED)); 
+         $this->yyval = new PHPParser_Node_Scalar_String(array('value' => $this->yyastk[$this->yysp-(1-1)], 'isBinary' => false, 'type' => PHPParser_Node_Scalar_String::SINGLE_QUOTED)); 
     }
 
     private function yyn353() {
-         $this->yyval = new Node_Scalar_LNumber(array('value' => (int) $this->yyastk[$this->yysp-(1-1)])); 
+         $this->yyval = new PHPParser_Node_Scalar_LNumber(array('value' => (int) $this->yyastk[$this->yysp-(1-1)])); 
     }
 
     private function yyn354() {
-         $this->yyval = new Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
+         $this->yyval = new PHPParser_Node_Variable(array('name' => substr($this->yyastk[$this->yysp-(1-1)], 1))); 
     }
 
     private function yyn355() {
-         $this->yyval = new Node_Expr_ClassConstFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ClassConstFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 
     private function yyn356() {
-         $this->yyval = new Node_Expr_ClassConstFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
+         $this->yyval = new PHPParser_Node_Expr_ClassConstFetch(array('class' => $this->yyastk[$this->yysp-(3-1)], 'name' => $this->yyastk[$this->yysp-(3-3)])); 
     }
 }
diff --git a/lib/PrettyPrinter/Zend.php b/lib/PHPParser/PrettyPrinter/Zend.php
similarity index 56%
rename from lib/PrettyPrinter/Zend.php
rename to lib/PHPParser/PrettyPrinter/Zend.php
index f64a1728..dac4641a 100644
--- a/lib/PrettyPrinter/Zend.php
+++ b/lib/PHPParser/PrettyPrinter/Zend.php
@@ -1,17 +1,17 @@
 parts);
     }
 
-    public function pVariable(Node_Variable $node) {
-        if ($node->name instanceof Node_Expr) {
+    public function pVariable(PHPParser_Node_Variable $node) {
+        if ($node->name instanceof PHPParser_Node_Expr) {
             return '${' . $this->p($node->name) . '}';
-        } elseif ($node->name instanceof Node_Variable) {
+        } elseif ($node->name instanceof PHPParser_Node_Variable) {
             return '$' . $this->p($node->name);
         } else {
             return '$' . $node->name;
@@ -20,53 +20,53 @@ class PrettyPrinter_Zend extends PrettyPrinterAbstract
 
     // Magic Constants
 
-    public function pScalar_ClassConst(Node_Scalar_ClassConst $node) {
+    public function pScalar_ClassConst(PHPParser_Node_Scalar_ClassConst $node) {
         return '__CLASS__';
     }
 
-    public function pScalar_DirConst(Node_Scalar_DirConst $node) {
+    public function pScalar_DirConst(PHPParser_Node_Scalar_DirConst $node) {
         return '__DIR__';
     }
 
-    public function pScalar_FileConst(Node_Scalar_FileConst $node) {
+    public function pScalar_FileConst(PHPParser_Node_Scalar_FileConst $node) {
         return '__FILE__';
     }
 
-    public function pScalar_FuncConst(Node_Scalar_FuncConst $node) {
+    public function pScalar_FuncConst(PHPParser_Node_Scalar_FuncConst $node) {
         return '__FUNCTION__';
     }
 
-    public function pScalar_LineConst(Node_Scalar_LineConst $node) {
+    public function pScalar_LineConst(PHPParser_Node_Scalar_LineConst $node) {
         return '__LINE__';
     }
 
-    public function pScalar_MethodConst(Node_Scalar_MethodConst $node) {
+    public function pScalar_MethodConst(PHPParser_Node_Scalar_MethodConst $node) {
         return '__METHOD__';
     }
 
-    public function pScalar_NSConst(Node_Scalar_NSConst $node) {
+    public function pScalar_NSConst(PHPParser_Node_Scalar_NSConst $node) {
         return '__NAMESPACE__';
     }
 
     // Scalars
 
-    public function pScalar_String(Node_Scalar_String $node) {
+    public function pScalar_String(PHPParser_Node_Scalar_String $node) {
         return ($node->isBinary ? 'b' : '')
-             . (Node_Scalar_String::SINGLE_QUOTED === $node->type
+             . (PHPParser_Node_Scalar_String::SINGLE_QUOTED === $node->type
                 ? '\'' . $this->pSafe(addcslashes($node->value, '\'\\')) . '\''
                 : '"' . addcslashes($node->value, "\n\r\t\f\v$\"\\") . '"'
         );
     }
 
-    public function pScalar_Encapsed(Node_Scalar_Encapsed $node) {
+    public function pScalar_Encapsed(PHPParser_Node_Scalar_Encapsed $node) {
         return '"' . $this->pEncapsList($node->parts) . '"';
     }
 
-    public function pScalar_LNumber(Node_Scalar_LNumber $node) {
+    public function pScalar_LNumber(PHPParser_Node_Scalar_LNumber $node) {
         return (string) $node->value;
     }
 
-    public function pScalar_DNumber(Node_Scalar_DNumber $node) {
+    public function pScalar_DNumber(PHPParser_Node_Scalar_DNumber $node) {
         return (int) $node->value == $node->value
                ? (string) $node->value . '.0' // ensure that number is really printed as float
                : (string) $node->value;
@@ -74,59 +74,59 @@ class PrettyPrinter_Zend extends PrettyPrinterAbstract
 
     // Assignments
 
-    public function pExpr_Assign(Node_Expr_Assign $node) {
+    public function pExpr_Assign(PHPParser_Node_Expr_Assign $node) {
         return $this->p($node->var) . ' = ' . $this->p($node->expr);
     }
 
-    public function pExpr_AssignRef(Node_Expr_AssignRef $node) {
+    public function pExpr_AssignRef(PHPParser_Node_Expr_AssignRef $node) {
         return $this->p($node->var) . ' =& ' . $this->p($node->refVar);
     }
 
-    public function pExpr_AssignPlus(Node_Expr_AssignPlus $node) {
+    public function pExpr_AssignPlus(PHPParser_Node_Expr_AssignPlus $node) {
         return $this->p($node->var) . ' += ' . $this->p($node->expr);
     }
 
-    public function pExpr_AssignMinus(Node_Expr_AssignMinus $node) {
+    public function pExpr_AssignMinus(PHPParser_Node_Expr_AssignMinus $node) {
         return $this->p($node->var) . ' -= ' . $this->p($node->expr);
     }
 
-    public function pExpr_AssignMul(Node_Expr_AssignMul $node) {
+    public function pExpr_AssignMul(PHPParser_Node_Expr_AssignMul $node) {
         return $this->p($node->var) . ' *= ' . $this->p($node->expr);
     }
 
-    public function pExpr_AssignDiv(Node_Expr_AssignDiv $node) {
+    public function pExpr_AssignDiv(PHPParser_Node_Expr_AssignDiv $node) {
         return $this->p($node->var) . ' /= ' . $this->p($node->expr);
     }
 
-    public function pExpr_AssignConcat(Node_Expr_AssignConcat $node) {
+    public function pExpr_AssignConcat(PHPParser_Node_Expr_AssignConcat $node) {
         return $this->p($node->var) . ' .= ' . $this->p($node->expr);
     }
 
-    public function pExpr_AssignMod(Node_Expr_AssignMod $node) {
+    public function pExpr_AssignMod(PHPParser_Node_Expr_AssignMod $node) {
         return $this->p($node->var) . ' %= ' . $this->p($node->expr);
     }
 
-    public function pExpr_AssignBinAnd(Node_Expr_AssignBinAnd $node) {
+    public function pExpr_AssignBinAnd(PHPParser_Node_Expr_AssignBinAnd $node) {
         return $this->p($node->var) . ' &= ' . $this->p($node->expr);
     }
 
-    public function pExpr_AssignBinOr(Node_Expr_AssignBinOr $node) {
+    public function pExpr_AssignBinOr(PHPParser_Node_Expr_AssignBinOr $node) {
         return $this->p($node->var) . ' |= ' . $this->p($node->expr);
     }
 
-    public function pExpr_AssignBinXor(Node_Expr_AssignBinXor $node) {
+    public function pExpr_AssignBinXor(PHPParser_Node_Expr_AssignBinXor $node) {
         return $this->p($node->var) . ' ^= ' . $this->p($node->expr);
     }
 
-    public function pExpr_AssignShiftLeft(Node_Expr_AssignShiftLeft $node) {
+    public function pExpr_AssignShiftLeft(PHPParser_Node_Expr_AssignShiftLeft $node) {
         return $this->p($node->var) . ' <<= ' . $this->p($node->expr);
     }
 
-    public function pExpr_AssignShiftRight(Node_Expr_AssignShiftRight $node) {
+    public function pExpr_AssignShiftRight(PHPParser_Node_Expr_AssignShiftRight $node) {
         return $this->p($node->var) . ' >>= ' . $this->p($node->expr);
     }
 
-    public function pExpr_List(Node_Expr_List $node) {
+    public function pExpr_List(PHPParser_Node_Expr_List $node) {
         $pAssignList = array();
         foreach ($node->assignList as $element) {
             if (null === $element) {
@@ -141,217 +141,217 @@ class PrettyPrinter_Zend extends PrettyPrinterAbstract
 
     // Binary expressions
 
-    public function pExpr_Plus(Node_Expr_Plus $node) {
+    public function pExpr_Plus(PHPParser_Node_Expr_Plus $node) {
         return $this->p($node->left) . ' + ' . $this->p($node->right);
     }
 
-    public function pExpr_Minus(Node_Expr_Minus $node) {
+    public function pExpr_Minus(PHPParser_Node_Expr_Minus $node) {
         return $this->p($node->left) . ' - ' . $this->p($node->right);
     }
 
-    public function pExpr_Mul(Node_Expr_Mul $node) {
+    public function pExpr_Mul(PHPParser_Node_Expr_Mul $node) {
         return $this->p($node->left) . ' * ' . $this->p($node->right);
     }
 
-    public function pExpr_Div(Node_Expr_Div $node) {
+    public function pExpr_Div(PHPParser_Node_Expr_Div $node) {
         return $this->p($node->left) . ' / ' . $this->p($node->right);
     }
 
-    public function pExpr_Concat(Node_Expr_Concat $node) {
+    public function pExpr_Concat(PHPParser_Node_Expr_Concat $node) {
         return $this->p($node->left) . ' . ' . $this->p($node->right);
     }
 
-    public function pExpr_Mod(Node_Expr_Mod $node) {
+    public function pExpr_Mod(PHPParser_Node_Expr_Mod $node) {
         return $this->p($node->left) . ' % ' . $this->p($node->right);
     }
 
-    public function pExpr_BooleanAnd(Node_Expr_BooleanAnd $node) {
+    public function pExpr_BooleanAnd(PHPParser_Node_Expr_BooleanAnd $node) {
         return $this->p($node->left) . ' && ' . $this->p($node->right);
     }
 
-    public function pExpr_BooleanOr(Node_Expr_BooleanOr $node) {
+    public function pExpr_BooleanOr(PHPParser_Node_Expr_BooleanOr $node) {
         return $this->p($node->left) . ' || ' . $this->p($node->right);
     }
 
-    public function pExpr_BinaryAnd(Node_Expr_BinaryAnd $node) {
+    public function pExpr_BinaryAnd(PHPParser_Node_Expr_BinaryAnd $node) {
         return $this->p($node->left) . ' & ' . $this->p($node->right);
     }
 
-    public function pExpr_BinaryOr(Node_Expr_BinaryOr $node) {
+    public function pExpr_BinaryOr(PHPParser_Node_Expr_BinaryOr $node) {
         return $this->p($node->left) . ' | ' . $this->p($node->right);
     }
 
-    public function pExpr_BinaryXor(Node_Expr_BinaryXor $node) {
+    public function pExpr_BinaryXor(PHPParser_Node_Expr_BinaryXor $node) {
         return $this->p($node->left) . ' ^ ' . $this->p($node->right);
     }
 
-    public function pExpr_ShiftLeft(Node_Expr_ShiftLeft $node) {
+    public function pExpr_ShiftLeft(PHPParser_Node_Expr_ShiftLeft $node) {
         return $this->p($node->left) . ' << ' . $this->p($node->right);
     }
 
-    public function pExpr_ShiftRight(Node_Expr_ShiftRight $node) {
+    public function pExpr_ShiftRight(PHPParser_Node_Expr_ShiftRight $node) {
         return $this->p($node->left) . ' >> ' . $this->p($node->right);
     }
 
-    public function pExpr_LogicalAnd(Node_Expr_LogicalAnd $node) {
+    public function pExpr_LogicalAnd(PHPParser_Node_Expr_LogicalAnd $node) {
         return $this->p($node->left) . ' and ' . $this->p($node->right);
     }
 
-    public function pExpr_LogicalOr(Node_Expr_LogicalOr $node) {
+    public function pExpr_LogicalOr(PHPParser_Node_Expr_LogicalOr $node) {
         return $this->p($node->left) . ' or ' . $this->p($node->right);
     }
 
-    public function pExpr_LogicalXor(Node_Expr_LogicalXor $node) {
+    public function pExpr_LogicalXor(PHPParser_Node_Expr_LogicalXor $node) {
         return $this->p($node->left) . ' xor ' . $this->p($node->right);
     }
 
-    public function pExpr_Equal(Node_Expr_Equal $node) {
+    public function pExpr_Equal(PHPParser_Node_Expr_Equal $node) {
         return $this->p($node->left) . ' == ' . $this->p($node->right);
     }
 
-    public function pExpr_NotEqual(Node_Expr_NotEqual $node) {
+    public function pExpr_NotEqual(PHPParser_Node_Expr_NotEqual $node) {
         return $this->p($node->left) . ' != ' . $this->p($node->right);
     }
 
-    public function pExpr_Identical(Node_Expr_Identical $node) {
+    public function pExpr_Identical(PHPParser_Node_Expr_Identical $node) {
         return $this->p($node->left) . ' === ' . $this->p($node->right);
     }
 
-    public function pExpr_NotIdentical(Node_Expr_NotIdentical $node) {
+    public function pExpr_NotIdentical(PHPParser_Node_Expr_NotIdentical $node) {
         return $this->p($node->left) . ' !== ' . $this->p($node->right);
     }
 
-    public function pExpr_Greater(Node_Expr_Greater $node) {
+    public function pExpr_Greater(PHPParser_Node_Expr_Greater $node) {
         return $this->p($node->left) . ' > ' . $this->p($node->right);
     }
 
-    public function pExpr_GreaterOrEqual(Node_Expr_GreaterOrEqual $node) {
+    public function pExpr_GreaterOrEqual(PHPParser_Node_Expr_GreaterOrEqual $node) {
         return $this->p($node->left) . ' >= ' . $this->p($node->right);
     }
 
-    public function pExpr_Smaller(Node_Expr_Smaller $node) {
+    public function pExpr_Smaller(PHPParser_Node_Expr_Smaller $node) {
         return $this->p($node->left) . ' < ' . $this->p($node->right);
     }
 
-    public function pExpr_SmallerOrEqual(Node_Expr_SmallerOrEqual $node) {
+    public function pExpr_SmallerOrEqual(PHPParser_Node_Expr_SmallerOrEqual $node) {
         return $this->p($node->left) . ' <= ' . $this->p($node->right);
     }
 
-    public function pExpr_Instanceof(Node_Expr_Instanceof $node) {
+    public function pExpr_Instanceof(PHPParser_Node_Expr_Instanceof $node) {
         return $this->p($node->expr) . ' instanceof ' . $this->p($node->class);
     }
 
     // Unary expressions
 
-    public function pExpr_BooleanNot(Node_Expr_BooleanNot $node) {
+    public function pExpr_BooleanNot(PHPParser_Node_Expr_BooleanNot $node) {
         return '!' . $this->p($node->expr);
     }
 
-    public function pExpr_BinaryNot(Node_Expr_BinaryNot $node) {
+    public function pExpr_BinaryNot(PHPParser_Node_Expr_BinaryNot $node) {
         return '~' . $this->p($node->expr);
     }
 
-    public function pExpr_UnaryMinus(Node_Expr_UnaryMinus $node) {
+    public function pExpr_UnaryMinus(PHPParser_Node_Expr_UnaryMinus $node) {
         return '-' . $this->p($node->expr);
     }
 
-    public function pExpr_UnaryPlus(Node_Expr_UnaryPlus $node) {
+    public function pExpr_UnaryPlus(PHPParser_Node_Expr_UnaryPlus $node) {
         return '+' . $this->p($node->expr);
     }
 
-    public function pExpr_PreInc(Node_Expr_PreInc $node) {
+    public function pExpr_PreInc(PHPParser_Node_Expr_PreInc $node) {
         return '++' . $this->p($node->var);
     }
 
-    public function pExpr_PreDec(Node_Expr_PreDec $node) {
+    public function pExpr_PreDec(PHPParser_Node_Expr_PreDec $node) {
         return '--' . $this->p($node->var);
     }
 
-    public function pExpr_PostInc(Node_Expr_PostInc $node) {
+    public function pExpr_PostInc(PHPParser_Node_Expr_PostInc $node) {
         return $this->p($node->var) . '++';
     }
 
-    public function pExpr_PostDec(Node_Expr_PostDec $node) {
+    public function pExpr_PostDec(PHPParser_Node_Expr_PostDec $node) {
         return $this->p($node->var) . '--';
     }
 
-    public function pExpr_ErrorSuppress(Node_Expr_ErrorSuppress $node) {
+    public function pExpr_ErrorSuppress(PHPParser_Node_Expr_ErrorSuppress $node) {
         return '@' . $this->p($node->expr);
     }
 
     // Casts
 
-    public function pExpr_IntCast(Node_Expr_IntCast $node) {
+    public function pExpr_IntCast(PHPParser_Node_Expr_IntCast $node) {
         return '(int) ' . $this->p($node->expr);
     }
 
-    public function pExpr_DoubleCast(Node_Expr_DoubleCast $node) {
+    public function pExpr_DoubleCast(PHPParser_Node_Expr_DoubleCast $node) {
         return '(double) ' . $this->p($node->expr);
     }
 
-    public function pExpr_StringCast(Node_Expr_StringCast $node) {
+    public function pExpr_StringCast(PHPParser_Node_Expr_StringCast $node) {
         return '(string) ' . $this->p($node->expr);
     }
 
-    public function pExpr_ArrayCast(Node_Expr_ArrayCast $node) {
+    public function pExpr_ArrayCast(PHPParser_Node_Expr_ArrayCast $node) {
         return '(array) ' . $this->p($node->expr);
     }
 
-    public function pExpr_ObjectCast(Node_Expr_ObjectCast $node) {
+    public function pExpr_ObjectCast(PHPParser_Node_Expr_ObjectCast $node) {
         return '(object) ' . $this->p($node->expr);
     }
 
-    public function pExpr_BoolCast(Node_Expr_BoolCast $node) {
+    public function pExpr_BoolCast(PHPParser_Node_Expr_BoolCast $node) {
         return '(bool) ' . $this->p($node->expr);
     }
 
-    public function pExpr_UnsetCast(Node_Expr_UnsetCast $node) {
+    public function pExpr_UnsetCast(PHPParser_Node_Expr_UnsetCast $node) {
         return '(unset) ' . $this->p($node->expr);
     }
 
     // Function calls and similar constructs
 
-    public function pExpr_FuncCall(Node_Expr_FuncCall $node) {
+    public function pExpr_FuncCall(PHPParser_Node_Expr_FuncCall $node) {
         return $this->p($node->func) . '(' . $this->pCommaSeparated($node->args) . ')';
     }
 
-    public function pExpr_FuncCallArg(Node_Expr_FuncCallArg $node) {
+    public function pExpr_FuncCallArg(PHPParser_Node_Expr_FuncCallArg $node) {
         return ($node->byRef ? '&' : '') . $this->p($node->value);
     }
 
-    public function pExpr_MethodCall(Node_Expr_MethodCall $node) {
+    public function pExpr_MethodCall(PHPParser_Node_Expr_MethodCall $node) {
         return $this->p($node->var) . '->' . $this->pObjectProperty($node->name)
              . '(' . $this->pCommaSeparated($node->args) . ')';
     }
 
-    public function pExpr_StaticCall(Node_Expr_StaticCall $node) {
+    public function pExpr_StaticCall(PHPParser_Node_Expr_StaticCall $node) {
         return $this->pClassName($node->class) . '::'
-             . ($node->func instanceof Node_Expr ? $this->p($node->func) : $node->func)
+             . ($node->func instanceof PHPParser_Node_Expr ? $this->p($node->func) : $node->func)
              . '(' . $this->pCommaSeparated($node->args) . ')';
     }
 
-    public function pExpr_Empty(Node_Expr_Empty $node) {
+    public function pExpr_Empty(PHPParser_Node_Expr_Empty $node) {
         return 'empty(' . $this->p($node->var) . ')';
     }
 
-    public function pExpr_Isset(Node_Expr_Isset $node) {
+    public function pExpr_Isset(PHPParser_Node_Expr_Isset $node) {
         return 'isset(' . $this->pCommaSeparated($node->vars) . ')';
     }
 
-    public function pExpr_Print(Node_Expr_Print $node) {
+    public function pExpr_Print(PHPParser_Node_Expr_Print $node) {
         return 'print ' . $this->p($node->expr);
     }
 
-    public function pExpr_Eval(Node_Expr_Eval $node) {
+    public function pExpr_Eval(PHPParser_Node_Expr_Eval $node) {
         return 'eval(' . $this->p($node->expr) . ')';
     }
 
-    public function pExpr_Include(Node_Expr_Include $node) {
+    public function pExpr_Include(PHPParser_Node_Expr_Include $node) {
         static $map = array(
-            Node_Expr_Include::TYPE_INCLUDE      => 'include',
-            Node_Expr_Include::TYPE_INCLUDE_ONCE => 'include_once',
-            Node_Expr_Include::TYPE_REQUIRE      => 'require',
-            Node_Expr_Include::TYPE_REQUIRE_ONCE => 'require_once',
+            PHPParser_Node_Expr_Include::TYPE_INCLUDE      => 'include',
+            PHPParser_Node_Expr_Include::TYPE_INCLUDE_ONCE => 'include_once',
+            PHPParser_Node_Expr_Include::TYPE_REQUIRE      => 'require',
+            PHPParser_Node_Expr_Include::TYPE_REQUIRE_ONCE => 'require_once',
         );
 
         return $map[$node->type] . ' ' . $this->p($node->expr);
@@ -359,89 +359,89 @@ class PrettyPrinter_Zend extends PrettyPrinterAbstract
 
     // Other
 
-    public function pExpr_Array(Node_Expr_Array $node) {
+    public function pExpr_Array(PHPParser_Node_Expr_Array $node) {
         return 'array(' . $this->pCommaSeparated($node->items) . ')';
     }
 
-    public function pExpr_ArrayItem(Node_Expr_ArrayItem $node) {
+    public function pExpr_ArrayItem(PHPParser_Node_Expr_ArrayItem $node) {
         return (null !== $node->key ? $this->p($node->key) . ' => ' : '')
              . ($node->byRef ? '&' : '') . $this->p($node->value);
     }
 
-    public function pExpr_ArrayDimFetch(Node_Expr_ArrayDimFetch $node) {
+    public function pExpr_ArrayDimFetch(PHPParser_Node_Expr_ArrayDimFetch $node) {
         return $this->p($node->var) . '[' . (null !== $node->dim ? $this->p($node->dim) : '') . ']';
     }
 
-    public function pExpr_ConstFetch(Node_Expr_ConstFetch $node) {
+    public function pExpr_ConstFetch(PHPParser_Node_Expr_ConstFetch $node) {
         return $this->p($node->name);
     }
 
-    public function pExpr_ClassConstFetch(Node_Expr_ClassConstFetch $node) {
+    public function pExpr_ClassConstFetch(PHPParser_Node_Expr_ClassConstFetch $node) {
         return $this->pClassName($node->class) . '::' . $node->name;
     }
 
-    public function pExpr_PropertyFetch(Node_Expr_PropertyFetch $node) {
+    public function pExpr_PropertyFetch(PHPParser_Node_Expr_PropertyFetch $node) {
         return $this->p($node->var) . '->' . $this->pObjectProperty($node->name);
     }
 
-    public function pExpr_StaticPropertyFetch(Node_Expr_StaticPropertyFetch $node) {
+    public function pExpr_StaticPropertyFetch(PHPParser_Node_Expr_StaticPropertyFetch $node) {
         return $this->pClassName($node->class) . '::$' . $this->pObjectProperty($node->name);
     }
 
-    public function pExpr_ShellExec(Node_Expr_ShellExec $node) {
+    public function pExpr_ShellExec(PHPParser_Node_Expr_ShellExec $node) {
         return '`' . $this->pEncapsList($node->parts) . '`';
     }
 
-    public function pExpr_LambdaFunc(Node_Expr_LambdaFunc $node) {
+    public function pExpr_LambdaFunc(PHPParser_Node_Expr_LambdaFunc $node) {
         return 'function ' . ($node->byRef ? '&' : '')
              . '(' . $this->pCommaSeparated($node->params) . ')'
              . (!empty($node->useVars) ? ' use(' . $this->pCommaSeparated($node->useVars) . ')': '')
              . ' {' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
-    public function pExpr_LambdaFuncUse(Node_Expr_LambdaFuncUse $node) {
+    public function pExpr_LambdaFuncUse(PHPParser_Node_Expr_LambdaFuncUse $node) {
         return ($node->byRef ? '&' : '') . '$' . $node->var;
     }
 
-    public function pExpr_New(Node_Expr_New $node) {
+    public function pExpr_New(PHPParser_Node_Expr_New $node) {
         return 'new ' . $this->pClassName($node->class) . '(' . $this->pCommaSeparated($node->args) . ')';
     }
 
-    public function pExpr_Clone(Node_Expr_Clone $node) {
+    public function pExpr_Clone(PHPParser_Node_Expr_Clone $node) {
         return 'clone ' . $this->p($node->expr);
     }
 
-    public function pExpr_Ternary(Node_Expr_Ternary $node) {
+    public function pExpr_Ternary(PHPParser_Node_Expr_Ternary $node) {
         return $this->p($node->cond) . ' ?'
              . (null !== $node->if ? ' ' . $this->p($node->if) . ' ' : '')
              . ': ' . $this->p($node->else);
     }
 
-    public function pExpr_Exit(Node_Expr_Exit $node) {
+    public function pExpr_Exit(PHPParser_Node_Expr_Exit $node) {
         return 'die' . (null !== $node->expr ? '(' . $this->p($node->expr) . ')' : '');
     }
 
     // Declarations
 
-    public function pStmt_Namespace(Node_Stmt_Namespace $node) {
+    public function pStmt_Namespace(PHPParser_Node_Stmt_Namespace $node) {
         return 'namespace ' . $this->p($node->ns);
     }
 
-    public function pStmt_Use(Node_Stmt_Use $node) {
+    public function pStmt_Use(PHPParser_Node_Stmt_Use $node) {
         return 'use ' . $this->pCommaSeparated($node->uses);
     }
 
-    public function pStmt_UseUse(Node_Stmt_UseUse $node) {
+    public function pStmt_UseUse(PHPParser_Node_Stmt_UseUse $node) {
         return $this->p($node->ns) . (null !== $node->alias ? ' as ' . $node->alias : '');
     }
 
-    public function pStmt_Interface(Node_Stmt_Interface $node) {
+    public function pStmt_Interface(PHPParser_Node_Stmt_Interface $node) {
         return 'interface ' . $node->name
              . (!empty($node->extends) ? ' extends ' . $this->pCommaSeparated($node->extends) : '')
              . "\n" . '{' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
-    public function pStmt_Class(Node_Stmt_Class $node) {
+    public function pStmt_Class(PHPParser_Node_Stmt_Class $node) {
         return $this->pModifiers($node->type)
              . 'class ' . $node->name
              . (null !== $node->extends ? ' extends ' . $this->p($node->extends) : '')
@@ -449,16 +449,16 @@ class PrettyPrinter_Zend extends PrettyPrinterAbstract
              . "\n" . '{' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
-    public function pStmt_Property(Node_Stmt_Property $node) {
+    public function pStmt_Property(PHPParser_Node_Stmt_Property $node) {
         return $this->pModifiers($node->type) . $this->pCommaSeparated($node->props);
     }
 
-    public function pStmt_PropertyProperty(Node_Stmt_PropertyProperty $node) {
+    public function pStmt_PropertyProperty(PHPParser_Node_Stmt_PropertyProperty $node) {
         return '$' . $node->name
              . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
     }
 
-    public function pStmt_ClassMethod(Node_Stmt_ClassMethod $node) {
+    public function pStmt_ClassMethod(PHPParser_Node_Stmt_ClassMethod $node) {
         return $this->pModifiers($node->type)
              . 'function ' . ($node->byRef ? '&' : '') . $node->name
              . '(' . $this->pCommaSeparated($node->params) . ')'
@@ -467,54 +467,54 @@ class PrettyPrinter_Zend extends PrettyPrinterAbstract
                 : ';');
     }
 
-    public function pStmt_ClassConst(Node_Stmt_ClassConst $node) {
+    public function pStmt_ClassConst(PHPParser_Node_Stmt_ClassConst $node) {
         return 'const ' . $this->pCommaSeparated($node->consts);
     }
 
-    public function pStmt_ClassConstConst(Node_Stmt_ClassConstConst $node) {
+    public function pStmt_ClassConstConst(PHPParser_Node_Stmt_ClassConstConst $node) {
         return $node->name . ' = ' . $this->p($node->value);
     }
 
-    public function pStmt_Func(Node_Stmt_Func $node) {
+    public function pStmt_Func(PHPParser_Node_Stmt_Func $node) {
         return 'function ' . ($node->byRef ? '&' : '') . $node->name
              . '(' . $this->pCommaSeparated($node->params) . ')'
              . "\n" . '{' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
-    public function pStmt_FuncParam(Node_Stmt_FuncParam $node) {
+    public function pStmt_FuncParam(PHPParser_Node_Stmt_FuncParam $node) {
         return ($node->type ? ('array' == $node->type ? 'array' : $this->p($node->type)) . ' ' : '')
              . ($node->byRef ? '&' : '')
              . '$' . $node->name
              . ($node->default ? ' = ' . $this->p($node->default) : '');
     }
 
-    public function pStmt_Const(Node_Stmt_Const $node) {
+    public function pStmt_Const(PHPParser_Node_Stmt_Const $node) {
         return 'const ' . $this->pCommaSeparated($node->consts);
     }
 
-    public function pStmt_ConstConst(Node_Stmt_ConstConst $node) {
+    public function pStmt_ConstConst(PHPParser_Node_Stmt_ConstConst $node) {
         return $node->name . ' = ' . $this->p($node->value);
     }
 
     // Control flow
 
-    public function pStmt_If(Node_Stmt_If $node) {
+    public function pStmt_If(PHPParser_Node_Stmt_If $node) {
         return 'if (' . $this->p($node->cond) . ') {'
              . "\n" . $this->pStmts($node->stmts) . "\n" . '}'
              . $this->pImplode($node->elseifList)
              . (null !== $node->else ? $this->p($node->else) : '');
     }
 
-    public function pStmt_Elseif(Node_Stmt_Elseif $node) {
+    public function pStmt_Elseif(PHPParser_Node_Stmt_Elseif $node) {
         return ' elseif (' . $this->p($node->cond) . ') {'
              . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
-    public function pStmt_Else(Node_Stmt_Else $node) {
+    public function pStmt_Else(PHPParser_Node_Stmt_Else $node) {
         return ' else {' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
-    public function pStmt_For(Node_Stmt_For $node) {
+    public function pStmt_For(PHPParser_Node_Stmt_For $node) {
         return 'for ('
              . $this->pCommaSeparated($node->init) . ';'
              . $this->pCommaSeparated($node->cond) . ';'
@@ -522,105 +522,105 @@ class PrettyPrinter_Zend extends PrettyPrinterAbstract
              . ') {' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
-    public function pStmt_Foreach(Node_Stmt_Foreach $node) {
+    public function pStmt_Foreach(PHPParser_Node_Stmt_Foreach $node) {
         return 'foreach (' . $this->p($node->expr) . ' as '
              . (null !== $node->keyVar ? $this->p($node->keyVar) . ' => ' : '')
              . ($node->byRef ? '&' : '') . $this->p($node->valueVar) . ') {'
              . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
-    public function pStmt_While(Node_Stmt_While $node) {
+    public function pStmt_While(PHPParser_Node_Stmt_While $node) {
         return 'while (' . $this->p($node->cond) . ') {'
              . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
-    public function pStmt_Do(Node_Stmt_Do $node) {
+    public function pStmt_Do(PHPParser_Node_Stmt_Do $node) {
         return 'do {' . "\n" . $this->pStmts($node->stmts)
              . '} while (' . $this->p($node->cond) . "\n" . ')';
     }
 
-    public function pStmt_Switch(Node_Stmt_Switch $node) {
+    public function pStmt_Switch(PHPParser_Node_Stmt_Switch $node) {
         return 'switch (' . $this->p($node->cond) . ') {'
              . "\n" . $this->pImplode($node->caseList) . '}';
     }
 
-    public function pStmt_TryCatch(Node_Stmt_TryCatch $node) {
+    public function pStmt_TryCatch(PHPParser_Node_Stmt_TryCatch $node) {
         return 'try {' . "\n" . $this->pStmts($node->stmts) . "\n" . '}'
              . $this->pImplode($node->catches);
     }
 
-    public function pStmt_Catch(Node_Stmt_Catch $node) {
+    public function pStmt_Catch(PHPParser_Node_Stmt_Catch $node) {
         return ' catch (' . $this->p($node->type) . ' $' . $node->var . ') {'
              . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
-    public function pStmt_Case(Node_Stmt_Case $node) {
+    public function pStmt_Case(PHPParser_Node_Stmt_Case $node) {
         return (null !== $node->cond ? 'case ' . $this->p($node->cond) : 'default') . ':'
              . "\n" . $this->pStmts($node->stmts) . "\n";
     }
 
-    public function pStmt_Break(Node_Stmt_Break $node) {
+    public function pStmt_Break(PHPParser_Node_Stmt_Break $node) {
         return 'break' . ($node->num !== null ? ' ' . $this->p($node->num) : '');
     }
 
-    public function pStmt_Continue(Node_Stmt_Continue $node) {
+    public function pStmt_Continue(PHPParser_Node_Stmt_Continue $node) {
         return 'continue' . ($node->num !== null ? ' ' . $this->p($node->num) : '');
     }
 
-    public function pStmt_Return(Node_Stmt_Return $node) {
+    public function pStmt_Return(PHPParser_Node_Stmt_Return $node) {
         return 'return' . (null !== $node->expr ? ' ' . $this->p($node->expr) : '');
     }
 
-    public function pStmt_Throw(Node_Stmt_Throw $node) {
+    public function pStmt_Throw(PHPParser_Node_Stmt_Throw $node) {
         return 'throw' . (null !== $node->expr ? ' ' . $this->p($node->expr) : '');
     }
 
-    public function pStmt_Label(Node_Stmt_Label $node) {
+    public function pStmt_Label(PHPParser_Node_Stmt_Label $node) {
         return $node->name . ':';
     }
 
-    public function pStmt_Goto(Node_Stmt_Goto $node) {
+    public function pStmt_Goto(PHPParser_Node_Stmt_Goto $node) {
         return 'goto ' . $node->name;
     }
 
     // Other
 
-    public function pStmt_Echo(Node_Stmt_Echo $node) {
+    public function pStmt_Echo(PHPParser_Node_Stmt_Echo $node) {
         return 'echo ' . $this->pCommaSeparated($node->exprs);
     }
 
-    public function pStmt_Static(Node_Stmt_Static $node) {
+    public function pStmt_Static(PHPParser_Node_Stmt_Static $node) {
         return 'static ' . $this->pCommaSeparated($node->vars);
     }
 
-    public function pStmt_Global(Node_Stmt_Global $node) {
+    public function pStmt_Global(PHPParser_Node_Stmt_Global $node) {
         return 'global ' . $this->pCommaSeparated($node->vars);
     }
 
-    public function pStmt_StaticVar(Node_Stmt_StaticVar $node) {
+    public function pStmt_StaticVar(PHPParser_Node_Stmt_StaticVar $node) {
         return '$' . $node->name
              . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
     }
 
-    public function pStmt_Unset(Node_Stmt_Unset $node) {
+    public function pStmt_Unset(PHPParser_Node_Stmt_Unset $node) {
         return 'unset(' . $this->pCommaSeparated($node->vars) . ')';
     }
 
-    public function pStmt_InlineHTML(Node_Stmt_InlineHTML $node) {
+    public function pStmt_InlineHTML(PHPParser_Node_Stmt_InlineHTML $node) {
         return '?>' . $this->pSafe(
             ("\n" === $node->value[0] || "\r" === $node->value[0] ? "\n" : '')
             . $node->value
         ) . 'remaining;
     }
 
     // Helpers
 
     public function pObjectProperty($node) {
-        if ($node instanceof Node_Variable || $node instanceof Node_Expr) {
+        if ($node instanceof PHPParser_Node_Variable || $node instanceof PHPParser_Node_Expr) {
             return '{' . $this->p($node) . '}';
         } else {
             return $node;
@@ -636,12 +636,12 @@ class PrettyPrinter_Zend extends PrettyPrinterAbstract
     }
 
     public function pModifiers($modifiers) {
-        return ($modifiers & Node_Stmt_Class::MODIFIER_PUBLIC    ? 'public '    : '')
-             . ($modifiers & Node_Stmt_Class::MODIFIER_PROTECTED ? 'protected ' : '')
-             . ($modifiers & Node_Stmt_Class::MODIFIER_PRIVATE   ? 'private '   : '')
-             . ($modifiers & Node_Stmt_Class::MODIFIER_STATIC    ? 'static '    : '')
-             . ($modifiers & Node_Stmt_Class::MODIFIER_ABSTRACT  ? 'abstract '  : '')
-             . ($modifiers & Node_Stmt_Class::MODIFIER_FINAL     ? 'final '     : '');
+        return ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_PUBLIC    ? 'public '    : '')
+             . ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_PROTECTED ? 'protected ' : '')
+             . ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_PRIVATE   ? 'private '   : '')
+             . ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_STATIC    ? 'static '    : '')
+             . ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_ABSTRACT  ? 'abstract '  : '')
+             . ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_FINAL     ? 'final '     : '');
     }
 
     public function pEncapsList(array $encapsList) {
diff --git a/lib/PrettyPrinterAbstract.php b/lib/PHPParser/PrettyPrinterAbstract.php
similarity index 97%
rename from lib/PrettyPrinterAbstract.php
rename to lib/PHPParser/PrettyPrinterAbstract.php
index 50bff02a..a0710854 100644
--- a/lib/PrettyPrinterAbstract.php
+++ b/lib/PHPParser/PrettyPrinterAbstract.php
@@ -1,6 +1,6 @@
   1,
@@ -120,11 +120,11 @@ abstract class PrettyPrinterAbstract
     /**
      * Pretty prints a node.
      *
-     * @param NodeAbstract $node Node to be pretty printed
+     * @param PHPParser_NodeAbstract $node Node to be pretty printed
      *
      * @return string Pretty printed node
      */
-    protected function p(NodeAbstract $node) {
+    protected function p(PHPParser_NodeAbstract $node) {
         $type = $node->getType();
 
         if (isset($this->precedanceMap[$type])) {
diff --git a/test/testAgainstDirectory.php b/test/testAgainstDirectory.php
index 0fba13a6..b5e1247c 100644
--- a/test/testAgainstDirectory.php
+++ b/test/testAgainstDirectory.php
@@ -1,14 +1,14 @@
 parse(new Lexer(file_get_contents($file)));
+        $stmts = $parser->parse(new PHPParser_Lexer(file_get_contents($file)));
         $parseTime += microtime(true) - $startTime;
 
         ++$ppCount;
@@ -53,7 +53,7 @@ foreach (new RecursiveIteratorIterator(
         $ppTime += microtime(true) - $startTime;
 
         try {
-            $ppStmts = $parser->parse(new Lexer($code));
+            $ppStmts = $parser->parse(new PHPParser_Lexer($code));
 
             ++$compareCount;
             $startTime = microtime(true);
@@ -75,7 +75,7 @@ foreach (new RecursiveIteratorIterator(
 
                 ++$compareFail;
             }
-        } catch (ParseErrorException $e) {
+        } catch (PHPParser_ParseErrorException $e) {
             echo '
         PASS
         FAIL
@@ -85,7 +85,7 @@ foreach (new RecursiveIteratorIterator(
 
             ++$ppFail;
         }
-    } catch (ParseErrorException $e) {
+    } catch (PHPParser_ParseErrorException $e) {
         echo '
         FAIL
         
diff --git a/test/testExpressions.php b/test/testExpressions.php
index 9c4239bd..c84a5f59 100644
--- a/test/testExpressions.php
+++ b/test/testExpressions.php
@@ -16,7 +16,7 @@ function __autoload($class) {
     is_file($file = '../lib/' . strtr($class, '_', '/') . '.php') && require_once $file;
 }
 
-$parser = new Parser;
+$parser = new PHPParser_Parser;
 
 include './testFormatting.html';
 
@@ -32,10 +32,10 @@ foreach (explode("\n", $exprs) as $expr) {
     }
 
     try {
-        $parser->parse(new Lexer('parse(new PHPParser_Lexer('' . $expr . 'PASS';
-    } catch (ParseErrorException $e) {
+    } catch (PHPParser_ParseErrorException $e) {
         echo '' . $expr . 'FAIL';
         echo '' .  $e->getMessage() . '';
     }