Allows to use use statement

m3m0r7 · m3m0r7 · commit 8d7254be4f48 · 2019-12-29T16:59:23.000+09:00
diff --git a/src/Compiler/Lang/Assembler/AbstractAssembler.php b/src/Compiler/Lang/Assembler/AbstractAssembler.php
@@ -7,6 +7,7 @@
 use PHPJava\Compiler\Lang\Assembler\Traits\ConstantPoolManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\Enhancer\Operation\NamespaceManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\EntryPointClassAssemblerManageable;
+use PHPJava\Compiler\Lang\Assembler\Traits\ImportManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\MethodAssemblerManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\StoreManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\StreamManageable;
@@ -24,6 +25,7 @@ abstract class AbstractAssembler implements AssemblerInterface, ParameterService
     use ClassAssemblerManageable;
     use EntryPointClassAssemblerManageable;
     use StructureAccessorsLocatorManageable;
+    use ImportManageable;
 
     /**
      * @var Node
diff --git a/src/Compiler/Lang/Assembler/ClassAssembler.php b/src/Compiler/Lang/Assembler/ClassAssembler.php
@@ -15,6 +15,7 @@
 use PHPJava\Compiler\Lang\Assembler\Store\Store;
 use PHPJava\Compiler\Lang\Assembler\Traits\Bindable;
 use PHPJava\Compiler\Lang\Assembler\Traits\Enhancer\ConstantPoolEnhanceable;
+use PHPJava\Compiler\Lang\Assembler\Traits\ImportManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\OperationManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\ParameterParseable;
 use PHPJava\Compiler\Lang\Assembler\Traits\StaticInitializerAssignable;
diff --git a/src/Compiler/Lang/Assembler/EntryPointClassAssembler.php b/src/Compiler/Lang/Assembler/EntryPointClassAssembler.php
@@ -23,6 +23,7 @@
 use PHPJava\Compiler\Lang\Assembler\Traits\ConstantPoolManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\Enhancer\ConstantPoolEnhanceable;
 use PHPJava\Compiler\Lang\Assembler\Traits\Enhancer\Operation\NamespaceManageable;
+use PHPJava\Compiler\Lang\Assembler\Traits\ImportManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\MethodAssemblerManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\OperationManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\StaticInitializerAssignable;
@@ -50,6 +51,7 @@ class EntryPointClassAssembler implements AssemblerInterface, ParameterServiceIn
     use Bindable;
     use StaticInitializerAssignable;
     use StructureAccessorsLocatorManageable;
+    use ImportManageable;
 
     /**
      * @var Methods
diff --git a/src/Compiler/Lang/Assembler/MethodAssembler.php b/src/Compiler/Lang/Assembler/MethodAssembler.php
@@ -13,6 +13,7 @@
 use PHPJava\Compiler\Lang\Assembler\Traits\Enhancer\ConstantPoolEnhanceable;
 use PHPJava\Compiler\Lang\Assembler\Traits\Enhancer\Operation\LocalVariableAssignable;
 use PHPJava\Compiler\Lang\Assembler\Traits\Enhancer\Operation\LocalVariableLoadable;
+use PHPJava\Compiler\Lang\Assembler\Traits\ImportManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\OperationManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\ParameterParseable;
 use PHPJava\Kernel\Maps\OpCode;
diff --git a/src/Compiler/Lang/Assembler/ParameterServiceInterface.php b/src/Compiler/Lang/Assembler/ParameterServiceInterface.php
@@ -6,6 +6,7 @@
 use PHPJava\Compiler\Builder\Finder\ConstantPoolFinder;
 use PHPJava\Compiler\Lang\Assembler\Processors\AbstractProcessor;
 use PHPJava\Compiler\Lang\Assembler\Store\Store;
+use PHPJava\Compiler\Lang\Assembler\Structure\Accessor\Imports;
 use PHPJava\Compiler\Lang\Assembler\Structure\Accessor\StructureAccessorsLocator;
 
 /**
@@ -21,9 +22,11 @@
  * @method ConstantPoolFinder getConstantPoolFinder()
  * @method AbstractAssembler|AbstractProcessor setMethodAssembler(MethodAssembler $methodAssembler)
  * @method MethodAssembler getMethodAssembler()
- * @method AbstractAssembler|AbstractProcessor setClassAssembler(ClassAssembler $methodAssembler)
+ * @method AbstractAssembler|AbstractProcessor setClassAssembler(ClassAssembler $classAssembler)
  * @method ClassAssembler getClassAssembler()
  * @method StructureAccessorsLocator getStructureAccessorsLocator()
+ * @method Imports getImportsAccessor()
+ * @method AbstractAssembler|AbstractProcessor setImportsAccessor(Imports $importsAccessor)
  * @emthod EntryPointClassAssembler getEntryPointClassAssembler()
  * @emthod AbstractAssembler|AbstractProcessor setEntryPointClassAssembler(EntryPointClassAssembler $entryPointClassAssembler)
  */
diff --git a/src/Compiler/Lang/Assembler/Processors/AbstractProcessor.php b/src/Compiler/Lang/Assembler/Processors/AbstractProcessor.php
@@ -11,6 +11,7 @@
 use PHPJava\Compiler\Lang\Assembler\Traits\Enhancer\ConstantPoolEnhanceable;
 use PHPJava\Compiler\Lang\Assembler\Traits\Enhancer\Operation\NamespaceManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\EntryPointClassAssemblerManageable;
+use PHPJava\Compiler\Lang\Assembler\Traits\ImportManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\MethodAssemblerManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\StoreManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\StreamManageable;
@@ -35,6 +36,7 @@ abstract class AbstractProcessor implements ProcessorInterface, ParameterService
     use ClassAssemblerManageable;
     use EntryPointClassAssemblerManageable;
     use StructureAccessorsLocatorManageable;
+    use ImportManageable;
 
     public static function factory(): self
     {
diff --git a/src/Compiler/Lang/Assembler/Processors/StatementProcessor.php b/src/Compiler/Lang/Assembler/Processors/StatementProcessor.php
@@ -11,7 +11,9 @@
 use PHPJava\Compiler\Lang\Assembler\Statements\ExpressionStatementAssembler;
 use PHPJava\Compiler\Lang\Assembler\Statements\ForStatementAssembler;
 use PHPJava\Compiler\Lang\Assembler\Statements\IfStatementAssembler;
+use PHPJava\Compiler\Lang\Assembler\Structure\Accessor\Imports;
 use PHPJava\Compiler\Lang\Assembler\Traits\Bindable;
+use PHPJava\Compiler\Lang\Assembler\Traits\ImportManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\NodeExtractable;
 use PHPJava\Compiler\Lang\Assembler\Traits\OperationManageable;
 use PHPJava\Exceptions\AssembleStructureException;
@@ -24,6 +26,8 @@ class StatementProcessor extends AbstractProcessor
     use Bindable;
     use NodeExtractable;
 
+    protected $imports = [];
+
     /**
      * @param Node[] $nodes
      */
@@ -66,6 +70,12 @@ public function execute(array $nodes, ?callable $callback = null): array
                     $entryPointClassAssembler
                         ->assemble();
                     break;
+                case \PhpParser\Node\Stmt\Use_::class:
+                    /**
+                     * @var \PhpParser\Node\Stmt\Use_ $statement
+                     */
+                    $this->imports[] = $statement;
+                    break;
                 case \PhpParser\Node\Stmt\Class_::class:
                     /**
                      * @var \PhpParser\Node\Stmt\Class_ $statement
@@ -74,6 +84,7 @@ public function execute(array $nodes, ?callable $callback = null): array
                         ->setStreamReader($this->getStreamReader())
                         ->setNamespace($this->getNamespace())
                         ->setStructureAccessorsLocator($this->getStructureAccessorsLocator())
+                        ->setImportsAccessor($this->getImportsAccessor() ?? new Imports($this->imports))
                         ->assemble();
                     break;
                 case \PhpParser\Node\Stmt\If_::class:
diff --git a/src/Compiler/Lang/Assembler/Structure/Accessor/Classes.php b/src/Compiler/Lang/Assembler/Structure/Accessor/Classes.php
@@ -25,6 +25,9 @@ public function find(string $className): Methods
     protected function findOnNode(Node $node, string $path, array $tracedPath = []): ?Node\Stmt\Class_
     {
         switch (get_class($node)) {
+            case \PhpParser\Node\Stmt\Use_::class:
+                // Nothing to do
+                break;
             case \PhpParser\Node\Stmt\Namespace_::class:
                 /**
                  * @var \PhpParser\Node\Stmt\Namespace_ $node
@@ -53,7 +56,7 @@ protected function findOnNode(Node $node, string $path, array $tracedPath = []):
                 break;
             default:
                 throw new AssembleStructureException(
-                    'Cannot find structure on class.'
+                    'Cannot find structure on class or ' . get_class($node) . ' is not supported statement.'
                 );
         }
         return null;
diff --git a/src/Compiler/Lang/Assembler/Structure/Accessor/Imports.php b/src/Compiler/Lang/Assembler/Structure/Accessor/Imports.php
@@ -0,0 +1,49 @@
+<?php
+namespace PHPJava\Compiler\Lang\Assembler\Structure\Accessor;
+
+use PHPJava\Exceptions\NotFoundImportException;
+
+class Imports extends AbstractAccessor implements AccessorInterface
+{
+    public function resolvePath(string $path): string
+    {
+        $isTopLevelNamespace = ($path[0] ?? null) === '\\';
+        foreach ($this->nodes as $node) {
+            /**
+             * @var \PhpParser\Node\Stmt\Use_ $node
+             */
+            foreach ($node->uses as $useNode) {
+                /**
+                 * @var \PhpParser\Node\Stmt\UseUse $useNode
+                 */
+                $merged = ltrim(implode('\\', $useNode->name->parts), '\\');
+                $comparedResult = $isTopLevelNamespace
+                    ? $this->compareAtFirst(
+                        $path,
+                        '\\' . $merged
+                    )
+                    : $this->compareAtLast(
+                        $path,
+                        $merged
+                    );
+
+                if ($comparedResult) {
+                    return $merged;
+                }
+            }
+        }
+        throw new NotFoundImportException(
+            'Not found import path for ' . $path
+        );
+    }
+
+    protected function compareAtFirst(string $path, string $target): bool
+    {
+        return !!preg_match('/\A' . preg_quote($path, '/') . '/', $target);
+    }
+
+    protected function compareAtLast(string $path, string $target): bool
+    {
+        return !!preg_match('/' . preg_quote($path, '/') . '\z/', $target);
+    }
+}
diff --git a/src/Compiler/Lang/Assembler/Traits/Bindable.php b/src/Compiler/Lang/Assembler/Traits/Bindable.php
@@ -46,6 +46,9 @@ protected function bindParameters(ParameterServiceInterface $from): ParameterSer
             ->setStructureAccessorsLocator(
                 $this->getStructureAccessorsLocator()
             )
+            ->setImportsAccessor(
+                $this->getImportsAccessor()
+            )
             ->setClassAssembler(
                 $this instanceof ClassAssembler
                     ? $this
diff --git a/src/Compiler/Lang/Assembler/Traits/ImportManageable.php b/src/Compiler/Lang/Assembler/Traits/ImportManageable.php
@@ -0,0 +1,46 @@
+<?php
+namespace PHPJava\Compiler\Lang\Assembler\Traits;
+
+use PHPJava\Compiler\Builder\Attributes\Architects\Operation;
+use PHPJava\Compiler\Builder\Finder\ConstantPoolFinder;
+use PHPJava\Compiler\Lang\Assembler\Enhancer\ConstantPoolEnhancer;
+use PHPJava\Compiler\Lang\Assembler\EntryPointClassAssembler;
+use PHPJava\Compiler\Lang\Assembler\Structure\Accessor\Imports;
+use PHPJava\Exceptions\NotFoundImportException;
+
+/**
+ * @method Operation getOperation()
+ * @method ConstantPoolEnhancer getEnhancedConstantPool()
+ * @method ConstantPoolFinder getConstantPoolFinder()
+ */
+trait ImportManageable
+{
+    /**
+     * @var Imports
+     */
+    protected $importsAccessor;
+
+    public function setImportsAccessor(?Imports $importsAccessor): self
+    {
+        $this->importsAccessor = $importsAccessor;
+        return $this;
+    }
+
+    public function getImportsAccessor(): ?Imports
+    {
+        return $this->importsAccessor;
+    }
+
+    public function convertWithImport(string $omittedImportPath): string
+    {
+        try {
+            return $this
+                ->getImportsAccessor()
+                ->resolvePath(
+                    $omittedImportPath
+                );
+        } catch (NotFoundImportException $e) {
+            return ltrim($omittedImportPath, '\\');
+        }
+    }
+}
diff --git a/src/Compiler/Lang/Assembler/Traits/NodeExtractable.php b/src/Compiler/Lang/Assembler/Traits/NodeExtractable.php
@@ -24,6 +24,7 @@ protected function filterExtractingNodes(array &$nodes, int $extractType): void
                 case \PhpParser\Node\Stmt\Namespace_::class:
                     $this->filterExtractingNodes($node->stmts, $extractType);
                     break;
+                case \PhpParser\Node\Stmt\Use_::class:
                 case \PhpParser\Node\Stmt\Class_::class:
                     if ($extractType !== NodeExtractorEnum::EXTRACT_MODULES) {
                         unset($nodes[$key]);
diff --git a/src/Compiler/Lang/Assembler/Traits/ParameterParseable.php b/src/Compiler/Lang/Assembler/Traits/ParameterParseable.php
@@ -51,8 +51,32 @@ public function parseParameterFromNode(Node $node): array
             foreach ($documentBlock->getTagsByName('param') as $documentParameter) {
                 /**
                  * @var \phpDocumentor\Reflection\DocBlock\Tags\Param $documentParameter
+                 * @var \phpDocumentor\Reflection\Types\Object_|null $typeObject
                  */
-                $type = (string) $documentParameter->getType();
+                $typeObject = $documentParameter
+                    ->getType();
+                $stringifiedType = (string) $typeObject;
+
+                $type = $stringifiedType;
+
+                if ($typeObject instanceof \phpDocumentor\Reflection\Types\Array_) {
+                    $typeObject = $typeObject
+                        ->getValueType();
+                }
+
+                if ($typeObject instanceof \phpDocumentor\Reflection\Types\Object_) {
+                    $fullPath = (string) $typeObject->getFqsen();
+
+                    $type = $typeObject
+                        ->getFqsen()
+                        ->getName();
+
+                    // FIXED: phpDocumentor has an omitted path completion problem
+                    // This statement fix it.
+                    if ($fullPath !== '\\' . ((string) $type)) {
+                        $type = $fullPath;
+                    }
+                }
 
                 $variableName = $documentParameter->getVariableName();
 
@@ -64,17 +88,19 @@ public function parseParameterFromNode(Node $node): array
 
                 // Update variable detail.
                 $parameters[$variableName] = [
-                    'type' => Formatter::convertPHPPrimitiveTypeToJavaType(
-                        str_replace(
-                            '[]',
-                            '',
-                            ltrim(
-                                $type,
-                                '\\'
+                    'type' => $this->convertWithImport(
+                        Formatter::convertPHPPrimitiveTypeToJavaType(
+                            str_replace(
+                                '[]',
+                                '',
+                                $type
                             )
                         )
                     ),
-                    'dimensions_of_array' => substr_count($type, '[]'),
+                    'dimensions_of_array' => substr_count(
+                        $stringifiedType,
+                        '[]'
+                    ),
                     'order' => $paramOrdersTable[$variableName],
                 ];
 
@@ -92,7 +118,9 @@ public function parseParameterFromNode(Node $node): array
             if ($parameter instanceof Node\Identifier) {
                 $type = $parameter->name;
                 $parameters[$variableName] = [
-                    'type' => Formatter::convertPHPPrimitiveTypeToJavaType($type),
+                    'type' => $this->convertWithImport(
+                        Formatter::convertPHPPrimitiveTypeToJavaType($type)
+                    ),
                     'dimensions_of_array' => 0,
                     'order' => $paramOrdersTable[$variableName],
                 ];
diff --git a/src/Exceptions/NotFoundImportException.php b/src/Exceptions/NotFoundImportException.php
@@ -0,0 +1,6 @@
+<?php
+namespace PHPJava\Exceptions;
+
+class NotFoundImportException extends \Exception
+{
+}
diff --git a/src/IO/Standard/Output.php b/src/IO/Standard/Output.php
@@ -14,7 +14,7 @@ private static function getOutputHandler()
         if ($outputHandle === null) {
             $outputHandle = fopen(
                 GlobalOptions::get('output.handler') ?? Runtime::OUTPUT_HANDLER,
-                'rw'
+                'rw+'
             );
         }
         return $outputHandle;
diff --git a/tests/Cases/Compiler/Codes/TestUseStatement.php b/tests/Cases/Compiler/Codes/TestUseStatement.php
@@ -0,0 +1,13 @@
+<?php
+use \PHPJava\Packages\java\lang\_String;
+
+class TestUseStatement
+{
+    /**
+     * @param _String[] $args
+     */
+    public static function main($args)
+    {
+        echo "Hello World!\n";
+    }
+}
diff --git a/tests/Cases/Compiler/Codes/TestUseStatementWithNamespace.php b/tests/Cases/Compiler/Codes/TestUseStatementWithNamespace.php
@@ -0,0 +1,14 @@
+<?php
+namespace PHPJava\UseStatement;
+use \PHPJava\Packages\java\lang\_String;
+
+class TestUseStatementWithNamespace
+{
+    /**
+     * @param _String[] $args
+     */
+    public static function main($args)
+    {
+        echo "Hello World!\n";
+    }
+}
diff --git a/tests/Cases/Compiler/StructureTest.php b/tests/Cases/Compiler/StructureTest.php
