Refactoring more STMT and batch away

Author: ircmaxell

lib/PHPCfg/Parser.php

@@ -32,6 +32,11 @@ public function handleStmt(Node\Stmt $stmt): void
         throw new LogicException("Stmt " . $stmt->getType() . " not Implemented Yet");
     }
 
+    public function isBatch(): bool
+    {
+        return false;
+    }
+
     public function getName(): string
     {
         $name = str_replace([__CLASS__ . '\\', '_'], '', get_class($this));

lib/PHPCfg/ParserHandler.php

@@ -34,6 +34,11 @@ class AssignOp extends ParserHandler
         'Expr_AssignOp_ShiftRight' => Op\Expr\BinaryOp\ShiftRight::class,
     ];
 
+    public function isBatch(): bool
+    {
+        return true;
+    }
+
     public function supports(Node $expr): bool
     {
         return isset(self::MAP[$expr->getType()]);

lib/PHPCfg/ParserHandler/Batch/AssignOp.php

@@ -49,6 +49,11 @@ class BinaryOp extends ParserHandler
         'Expr_BinaryOp_Spaceship' => Op\Expr\BinaryOp\Spaceship::class,
     ];
 
+    public function isBatch(): bool
+    {
+        return true;
+    }
+
     public function supports(Node $expr): bool
     {
         return isset(self::MAP[$expr->getType()]);

lib/PHPCfg/ParserHandler/Batch/BinaryOp.php

@@ -25,6 +25,11 @@ class IncDec extends ParserHandler
         'Expr_PreInc' => Op\Expr\BinaryOp\Plus::class,
     ];
 
+    public function isBatch(): bool
+    {
+        return true;
+    }
+
     public function supports(Node $expr): bool
     {
         return isset(self::MAP[$expr->getType()]);

lib/PHPCfg/ParserHandler/Batch/IncDec.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * This file is part of PHP-CFG, a Control flow graph implementation for PHP
+ *
+ * @copyright 2015 Anthony Ferrara. All rights reserved
+ * @license MIT See LICENSE at the root of the project for more info
+ */
+
+namespace PHPCfg\ParserHandler\Batch;
+
+use PHPCfg\ParserHandler;
+use PhpParser\Node;
+
+class Nop extends ParserHandler
+{
+    private const MAP = [
+        // ignore use statements, since names are already resolved
+        'Stmt_GroupUse' => true,
+        'Stmt_Nop' => true,
+        'Stmt_Use' => true,
+    ];
+
+    public function isBatch(): bool
+    {
+        return true;
+    }
+
+    public function supports(Node $expr): bool
+    {
+        return isset(self::MAP[$expr->getType()]);
+    }
+
+    public function handleStmt(Node\Stmt $node): void {}
+}

lib/PHPCfg/ParserHandler/Batch/Nop.php

@@ -35,6 +35,11 @@ class Unary extends ParserHandler
         'Expr_UnaryPlus' => Op\Expr\UnaryPlus::class,
     ];
 
+    public function isBatch(): bool
+    {
+        return true;
+    }
+
     public function supports(Node $expr): bool
     {
         return isset(self::MAP[$expr->getType()]);

lib/PHPCfg/ParserHandler/Batch/Unary.php

@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * This file is part of PHP-CFG, a Control flow graph implementation for PHP
+ *
+ * @copyright 2015 Anthony Ferrara. All rights reserved
+ * @license MIT See LICENSE at the root of the project for more info
+ */
+
+namespace PHPCfg\ParserHandler\Stmt;
+
+use PHPCfg\Op;
+use PHPCfg\ParserHandler;
+use PhpParser\Node\Stmt;
+use RuntimeException;
+
+class ClassConst extends ParserHandler
+{
+    public function handleStmt(Stmt $node): void
+    {
+        if (! $this->parser->currentClass instanceof Op\Type\Literal) {
+            throw new RuntimeException('Unknown current class');
+        }
+        foreach ($node->consts as $const) {
+            $tmp = $this->block();
+            $valueBlock = $this->block($this->createBlock());
+            $value = $this->parser->parseExprNode($const->value);
+            $this->block($tmp);
+
+            $this->addOp(new Op\Terminal\Const_(
+                $this->parser->parseExprNode($const->name),
+                $value,
+                $valueBlock,
+                $this->mapAttributes($node),
+            ));
+        }
+    }
+}

lib/PHPCfg/ParserHandler/Stmt/ClassConst.php

@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * This file is part of PHP-CFG, a Control flow graph implementation for PHP
+ *
+ * @copyright 2015 Anthony Ferrara. All rights reserved
+ * @license MIT See LICENSE at the root of the project for more info
+ */
+
+namespace PHPCfg\ParserHandler\Stmt;
+
+use PHPCfg\Func;
+use PHPCfg\Op;
+use PHPCfg\ParserHandler;
+use PhpParser\Modifiers;
+use PhpParser\Node\Stmt;
+use RuntimeException;
+
+class ClassMethod extends ParserHandler
+{
+    public function handleStmt(Stmt $node): void
+    {
+        if (! $this->parser->currentClass instanceof Op\Type\Literal) {
+            throw new RuntimeException('Unknown current class');
+        }
+
+        $this->parser->script->functions[] = $func = new Func(
+            $node->name->toString(),
+            $node->flags | ($node->byRef ? Func::FLAG_RETURNS_REF : 0),
+            $this->parser->parseTypeNode($node->returnType),
+            $this->parser->currentClass,
+        );
+
+        if ($node->stmts !== null) {
+            $this->parser->parseFunc($func, $node->params, $node->stmts, null);
+        } else {
+            $func->params = $this->parser->parseParameterList($func, $node->params);
+            $func->cfg = null;
+        }
+
+        $visibility = $node->flags & Modifiers::VISIBILITY_MASK;
+        $static = $node->flags & Modifiers::STATIC;
+        $final = $node->flags & Modifiers::FINAL;
+        $abstract = $node->flags & Modifiers::ABSTRACT;
+
+        $this->addOp($class_method = new Op\Stmt\ClassMethod(
+            $func,
+            $visibility,
+            (bool) $static,
+            (bool) $final,
+            (bool) $abstract,
+            $this->parser->parseAttributeGroups($node->attrGroups),
+            $this->mapAttributes($node),
+        ));
+        $func->callableOp = $class_method;
+    }
+}

lib/PHPCfg/ParserHandler/Stmt/ClassMethod.php

@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * This file is part of PHP-CFG, a Control flow graph implementation for PHP
+ *
+ * @copyright 2015 Anthony Ferrara. All rights reserved
+ * @license MIT See LICENSE at the root of the project for more info
+ */
+
+namespace PHPCfg\ParserHandler\Stmt;
+
+use PHPCfg\ParserHandler;
+
+class Declare_ extends ParserHandler {}