aot
/
compiler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(core): 优化代码结构和性能

Browse Source 
- 调整 import 语句顺序，将 Node 相关引入规范化
- 规范化字符串拼接操作，统一使用点号连接
- 统一比较运算符写法，调整变量与常量的比较顺序
- 移除多余空行和分号，精简代码结构
- 标准化缩进和代码格式，提升可读性
- 优化循环和条件判断逻辑，使用前置递增递减
- 修复类定义和方法定义的格式一致性
- 更新依赖管理方式，优化编译器配置加载
pull/1/head
韩天峰 7 months ago
parent 1c074d140e
commit 8c20fd18c8
20 changed files with 829 additions and 682 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/Php/AstNodeType.php
  2. 4
      src/Php/ClassLikeDef.php
  3. 436
      src/Php/CompilerBase.php
  4. 2
      src/Php/Constants.php
  5. 26
      src/Php/Encryptor.php
  6. 111
      src/Php/Extractor.php
  7. 8
      src/Php/FileScanner.php
  8. 10
      src/Php/FileSorter.php
  9. 10
      src/Php/FuncCallOptimizer.php
  10. 1
      src/Php/FunctionDef.php
  11. 10
      src/Php/MagicMethodDetector.php
  12. 6
      src/Php/Preprocessor.php
  13. 15
      src/Php/Reflection.php
  14. 1
      src/Php/SyntaxError.php
  15. 75
      src/Php/Translator.php
  16. 17
      src/template/extension.cc.php

3
src/Php/AstNodeType.php
Unescape View File

@ -2,9 +2,9 @@
namespace PhpAot\Php; namespace PhpAot\Php;
use PhpParser\Node;
use PhpParser\Node\Expr; use PhpParser\Node\Expr;
use PhpParser\NodeAbstract; use PhpParser\NodeAbstract;
use PhpParser\Node;
trait AstNodeType trait AstNodeType
{ {
@ -12,6 +12,7 @@ trait AstNodeType
{ {
return $expr instanceof Expr\ArrayDimFetch; return $expr instanceof Expr\ArrayDimFetch;
} }
protected function isVarExpr(NodeAbstract $expr): bool protected function isVarExpr(NodeAbstract $expr): bool
{ {
return $expr instanceof Expr\Variable; return $expr instanceof Expr\Variable;

4
src/Php/ClassLikeDef.php
Unescape View File

@ -8,7 +8,6 @@ class ClassLikeDef
public string $namespace; public string $namespace;
public string $extends = ''; public string $extends = '';
public function __construct(string $name, string $namespace = '') public function __construct(string $name, string $namespace = '')
{ {
$this->name = $name; $this->name = $name;
@ -17,12 +16,13 @@ class ClassLikeDef
public function getNamespacedName(bool $symbolic = true): string public function getNamespacedName(bool $symbolic = true): string
{ {
if ($this->namespace === '') { if ('' === $this->namespace) {
return $this->name; return $this->name;
} }
if ($symbolic) { if ($symbolic) {
return str_replace('\\', '_', $this->namespace.'_'.$this->name); return str_replace('\\', '_', $this->namespace.'_'.$this->name);
} }
return $this->namespace.'\\\\'.$this->name; return $this->namespace.'\\\\'.$this->name;
} }
} }

436
src/Php/CompilerBase.php
View File

File diff suppressed because it is too large Load Diff

2
src/Php/Constants.php
Unescape View File

@ -4,7 +4,7 @@ namespace PhpAot\Php;
class Constants class Constants
{ {
const array CPP_RESERVED_NAMES = [ public const array CPP_RESERVED_NAMES = [
'auto', 'auto',
'break', 'break',
'case', 'case',

26
src/Php/Encryptor.php
Unescape View File

@ -2,9 +2,6 @@
namespace PhpAot\Php; namespace PhpAot\Php;
use PhpParser\Node;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Identifier;
use PhpParser\PrettyPrinter\Standard; use PhpParser\PrettyPrinter\Standard;
class Encryptor extends \PhpAot\Core\Translator class Encryptor extends \PhpAot\Core\Translator
@ -35,6 +32,7 @@ class Encryptor extends \PhpAot\Core\Translator
foreach ($this->headers as $header) { foreach ($this->headers as $header) {
$lines[] = '#include <'.$header.'>'; $lines[] = '#include <'.$header.'>';
} }
return implode(PHP_EOL, $lines).PHP_EOL.PHP_EOL; return implode(PHP_EOL, $lines).PHP_EOL.PHP_EOL;
} }
@ -47,6 +45,7 @@ class Encryptor extends \PhpAot\Core\Translator
{ {
$this->parseStmts($this->stmts); $this->parseStmts($this->stmts);
$prettyPrinter = new Standard(); $prettyPrinter = new Standard();
return $prettyPrinter->prettyPrintFile($this->stmts); return $prettyPrinter->prettyPrintFile($this->stmts);
} }
@ -55,7 +54,6 @@ class Encryptor extends \PhpAot\Core\Translator
file_put_contents($file, $code); file_put_contents($file, $code);
} }
public function getLine($node): int public function getLine($node): int
{ {
return $node->getLine(); return $node->getLine();
@ -87,11 +85,11 @@ class Encryptor extends \PhpAot\Core\Translator
} }
$code = $return.' '.$name.'('.$params.') {'.PHP_EOL; $code = $return.' '.$name.'('.$params.') {'.PHP_EOL;
$this->indentLevel++; ++$this->indentLevel;
$stmts = $this->parseStmts($v->stmts); $stmts = $this->parseStmts($v->stmts);
$this->indentLevel--; --$this->indentLevel;
$code .= $stmts; $code .= $stmts;
$code .= "}"; $code .= '}';
return $code; return $code;
} }
@ -129,7 +127,6 @@ class Encryptor extends \PhpAot\Core\Translator
} }
} }
private function parseParams($params) private function parseParams($params)
{ {
$list = []; $list = [];
@ -139,6 +136,7 @@ class Encryptor extends \PhpAot\Core\Translator
$list[] = $type.' '.$name; $list[] = $type.' '.$name;
$this->typeMap[$name] = $type; $this->typeMap[$name] = $type;
} }
return implode(', ', $list); return implode(', ', $list);
} }
@ -179,6 +177,7 @@ class Encryptor extends \PhpAot\Core\Translator
foreach ($lines as $line) { foreach ($lines as $line) {
$code .= $this->getIndent().$line.PHP_EOL; $code .= $this->getIndent().$line.PHP_EOL;
} }
return $code; return $code;
} }
@ -239,6 +238,7 @@ class Encryptor extends \PhpAot\Core\Translator
foreach ($exprs as $expr) { foreach ($exprs as $expr) {
$code .= $this->parseExpr($expr); $code .= $this->parseExpr($expr);
} }
return $code; return $code;
} }
@ -284,7 +284,7 @@ class Encryptor extends \PhpAot\Core\Translator
{ {
$items = $node->items; $items = $node->items;
$list = []; $list = [];
$this->indentLevel++; ++$this->indentLevel;
foreach ($items as $item) { foreach ($items as $item) {
if ($item->key) { if ($item->key) {
$list[] = $this->getIndent().'{ php::Variant('.$this->parseIdentifier($item->key).'), php::Variant('.$this->parseIdentifier($item->value).') }'; $list[] = $this->getIndent().'{ php::Variant('.$this->parseIdentifier($item->key).'), php::Variant('.$this->parseIdentifier($item->value).') }';
@ -292,7 +292,8 @@ class Encryptor extends \PhpAot\Core\Translator
$list[] = $this->getIndent().'php::Variant('.$this->parseIdentifier($item->value).')'; $list[] = $this->getIndent().'php::Variant('.$this->parseIdentifier($item->value).')';
} }
} }
$this->indentLevel--; --$this->indentLevel;
return '{'.PHP_EOL. return '{'.PHP_EOL.
implode(', '.PHP_EOL, $list).PHP_EOL. implode(', '.PHP_EOL, $list).PHP_EOL.
$this->getIndent(). $this->getIndent().
@ -323,6 +324,7 @@ class Encryptor extends \PhpAot\Core\Translator
foreach ($list as $li) { foreach ($list as $li) {
$out .= '-I '.$li.' '; $out .= '-I '.$li.' ';
} }
return $out; return $out;
} }
@ -336,6 +338,7 @@ class Encryptor extends \PhpAot\Core\Translator
foreach ($list as $li) { foreach ($list as $li) {
$out .= '-L '.$li.' '; $out .= '-L '.$li.' ';
} }
return $out; return $out;
} }
@ -349,6 +352,7 @@ class Encryptor extends \PhpAot\Core\Translator
foreach ($list as $li) { foreach ($list as $li) {
$out .= '-l'.$li.' '; $out .= '-l'.$li.' ';
} }
return $out; return $out;
} }
@ -372,6 +376,7 @@ class Encryptor extends \PhpAot\Core\Translator
if (isset($this->decodeMap[$expr->name])) { if (isset($this->decodeMap[$expr->name])) {
$expr->name = $this->decodeMap[$expr->name]; $expr->name = $this->decodeMap[$expr->name];
} }
return $expr; return $expr;
} }
@ -425,7 +430,6 @@ class Encryptor extends \PhpAot\Core\Translator
{ {
$name = $expr->name->name; $name = $expr->name->name;
if (isset($this->constants[$name])) { if (isset($this->constants[$name])) {
} }
} }
} }

111
src/Php/Extractor.php
Unescape View File

@ -13,28 +13,29 @@ class Extractor
} }
/** /**
* 检查 ctags 是否可用 * 检查 ctags 是否可用.
*/ */
private function checkCtags(): void private function checkCtags(): void
{ {
$output = shell_exec("{$this->ctagsPath} --version 2>&1"); $output = shell_exec("{$this->ctagsPath} --version 2>&1");
if ($output === null) { if (null === $output) {
$this->error("未找到 ctags 命令\n安装: sudo apt install universal-ctags"); $this->error("未找到 ctags 命令\n安装: sudo apt install universal-ctags");
} }
$this->isUniversalCtags = stripos($output, 'Universal Ctags') !== false; $this->isUniversalCtags = false !== stripos($output, 'Universal Ctags');
if (!$this->isUniversalCtags) { if (!$this->isUniversalCtags) {
$this->warn("建议使用 Universal Ctags 以获得更好的支持"); $this->warn('建议使用 Universal Ctags 以获得更好的支持');
} }
} }
/** /**
* 提取函数定义 * 提取函数定义.
* *
* @param string $filename 文件路径 * @param string $filename 文件路径
* @param array $prefixes 函数名前缀列表 * @param array $prefixes 函数名前缀列表
*
* @return array 函数列表 * @return array 函数列表
*/ */
public function extractFunctions(string $filename, array $prefixes = ['php_']): array public function extractFunctions(string $filename, array $prefixes = ['php_']): array
@ -44,7 +45,7 @@ class Extractor
} }
$this->info("分析文件: {$filename}"); $this->info("分析文件: {$filename}");
$this->info("函数前缀: " . implode(', ', $prefixes)); $this->info('函数前缀: '.implode(', ', $prefixes));
// 运行 ctags // 运行 ctags
$tags = $this->runCtags($filename); $tags = $this->runCtags($filename);
@ -52,7 +53,7 @@ class Extractor
// 过滤和解析函数 // 过滤和解析函数
$functions = []; $functions = [];
foreach ($tags as $tag) { foreach ($tags as $tag) {
if ($tag['kind'] !== 'function') { if ('function' !== $tag['kind']) {
continue; continue;
} }
@ -78,13 +79,13 @@ class Extractor
} }
} }
$this->info("找到 " . count($functions) . " 个函数"); $this->info('找到 '.count($functions).' 个函数');
return $functions; return $functions;
} }
/** /**
* 运行 ctags 命令 * 运行 ctags 命令.
*/ */
private function runCtags(string $filename): array private function runCtags(string $filename): array
{ {
@ -96,8 +97,8 @@ class Extractor
$output = shell_exec($cmd); $output = shell_exec($cmd);
if ($output === null) { if (null === $output) {
throw new RuntimeException("ctags 执行失败"); throw new RuntimeException('ctags 执行失败');
} }
// 解析 JSON 输出 // 解析 JSON 输出
@ -110,7 +111,7 @@ class Extractor
} }
$tag = json_decode($line, true); $tag = json_decode($line, true);
if ($tag === null) { if (null === $tag) {
continue; continue;
} }
@ -121,7 +122,7 @@ class Extractor
} }
/** /**
* 解析单个函数的详细信息 * 解析单个函数的详细信息.
*/ */
private function parseFunction(string $filename, array $tag): ?array private function parseFunction(string $filename, array $tag): ?array
{ {
@ -152,21 +153,21 @@ class Extractor
'parameters' => $parameters, 'parameters' => $parameters,
'location' => [ 'location' => [
'file' => $filename, 'file' => $filename,
'line' => $lineNum 'line' => $lineNum,
], ],
'scope' => $tag['scope'] ?? null, 'scope' => $tag['scope'] ?? null,
'scopeKind' => $tag['scopeKind'] ?? null 'scopeKind' => $tag['scopeKind'] ?? null,
]; ];
} }
/** /**
* 从源文件中提取完整的函数签名 * 从源文件中提取完整的函数签名.
*/ */
private function extractSignature(string $filename, int $lineNum, string $funcName): string private function extractSignature(string $filename, int $lineNum, string $funcName): string
{ {
$lines = file($filename, FILE_IGNORE_NEW_LINES); $lines = file($filename, FILE_IGNORE_NEW_LINES);
if ($lines === false || $lineNum > count($lines)) { if (false === $lines || $lineNum > count($lines)) {
return ''; return '';
} }
@ -174,12 +175,12 @@ class Extractor
$signatureLines = []; $signatureLines = [];
$maxLines = min($lineNum + 20, count($lines)); $maxLines = min($lineNum + 20, count($lines));
for ($i = $lineNum - 1; $i < $maxLines; $i++) { for ($i = $lineNum - 1; $i < $maxLines; ++$i) {
$line = $lines[$i]; $line = $lines[$i];
$signatureLines[] = $line; $signatureLines[] = $line;
// 检查是否到达函数体或声明结束 // 检查是否到达函数体或声明结束
if (strpos($line, '{') !== false || strpos($line, ';') !== false) { if (false !== strpos($line, '{') || false !== strpos($line, ';')) {
break; break;
} }
} }
@ -200,7 +201,7 @@ class Extractor
} }
/** /**
* 解析返回类型 * 解析返回类型.
*/ */
private function parseReturnType(string $signature, string $funcName): string private function parseReturnType(string $signature, string $funcName): string
{ {
@ -222,7 +223,7 @@ class Extractor
} }
/** /**
* 解析参数列表 * 解析参数列表.
*/ */
private function parseParameters(string $signature, string $funcName): array private function parseParameters(string $signature, string $funcName): array
{ {
@ -236,7 +237,7 @@ class Extractor
$paramsStr = trim($matches[1]); $paramsStr = trim($matches[1]);
// 空参数或 void // 空参数或 void
if (empty($paramsStr) || $paramsStr === 'void') { if (empty($paramsStr) || 'void' === $paramsStr) {
return []; return [];
} }
@ -261,7 +262,7 @@ class Extractor
} }
/** /**
* 智能分割参数（处理嵌套的模板和括号） * 智能分割参数（处理嵌套的模板和括号）.
*/ */
private function splitParameters(string $paramsStr): array private function splitParameters(string $paramsStr): array
{ {
@ -270,16 +271,16 @@ class Extractor
$depth = 0; $depth = 0;
$length = strlen($paramsStr); $length = strlen($paramsStr);
for ($i = 0; $i < $length; $i++) { for ($i = 0; $i < $length; ++$i) {
$char = $paramsStr[$i]; $char = $paramsStr[$i];
if ($char === '<' || $char === '(' || $char === '[') { if ('<' === $char || '(' === $char || '[' === $char) {
$depth++; ++$depth;
$current .= $char; $current .= $char;
} elseif ($char === '>' || $char === ')' || $char === ']') { } elseif ('>' === $char || ')' === $char || ']' === $char) {
$depth--; --$depth;
$current .= $char; $current .= $char;
} elseif ($char === ',' && $depth === 0) { } elseif (',' === $char && 0 === $depth) {
$params[] = $current; $params[] = $current;
$current = ''; $current = '';
} else { } else {
@ -295,7 +296,7 @@ class Extractor
} }
/** /**
* 解析单个参数 * 解析单个参数.
*/ */
private function parseParameter(string $param): ?array private function parseParameter(string $param): ?array
{ {
@ -309,19 +310,19 @@ class Extractor
if (preg_match('/^(.+?)\s+(\w+)\s*$/', $param, $matches)) { if (preg_match('/^(.+?)\s+(\w+)\s*$/', $param, $matches)) {
return [ return [
'type' => trim($matches[1]), 'type' => trim($matches[1]),
'name' => trim($matches[2]) 'name' => trim($matches[2]),
]; ];
} }
// 只有类型，没有名称 // 只有类型，没有名称
return [ return [
'type' => $param, 'type' => $param,
'name' => '' 'name' => '',
]; ];
} }
/** /**
* 批量提取多个文件 * 批量提取多个文件.
*/ */
public function extractFromFiles(array $files, array $prefixes = ['php_']): array public function extractFromFiles(array $files, array $prefixes = ['php_']): array
{ {
@ -340,7 +341,7 @@ class Extractor
} }
/** /**
* 输出信息 * 输出信息.
*/ */
private function info(string $message): void private function info(string $message): void
{ {
@ -348,7 +349,7 @@ class Extractor
} }
/** /**
* 输出警告 * 输出警告.
*/ */
private function warn(string $message): void private function warn(string $message): void
{ {
@ -356,7 +357,7 @@ class Extractor
} }
/** /**
* 输出错误并退出 * 输出错误并退出.
*/ */
private function error(string $message): void private function error(string $message): void
{ {
@ -365,7 +366,7 @@ class Extractor
} }
/** /**
* 提取函数并添加额外信息 * 提取函数并添加额外信息.
*/ */
public function extractWithMetadata(string $filename, array $prefixes = ['php_']): array public function extractWithMetadata(string $filename, array $prefixes = ['php_']): array
{ {
@ -380,7 +381,7 @@ class Extractor
} }
/** /**
* 提取函数的元数据（注释、属性等） * 提取函数的元数据（注释、属性等）.
*/ */
private function extractMetadata(string $filename, array $func): array private function extractMetadata(string $filename, array $func): array
{ {
@ -404,8 +405,8 @@ class Extractor
// 检测修饰符 // 检测修饰符
$signature = $func['signature']; $signature = $func['signature'];
$metadata['isStatic'] = strpos($signature, 'static') !== false; $metadata['isStatic'] = false !== strpos($signature, 'static');
$metadata['isInline'] = strpos($signature, 'inline') !== false; $metadata['isInline'] = false !== strpos($signature, 'inline');
// 提取文档注释中的标签 // 提取文档注释中的标签
$metadata['docTags'] = $this->parseDocTags($comments); $metadata['docTags'] = $this->parseDocTags($comments);
@ -414,7 +415,7 @@ class Extractor
} }
/** /**
* 提取函数前的注释 * 提取函数前的注释.
*/ */
private function extractComments(array $lines, int $lineNum): array private function extractComments(array $lines, int $lineNum): array
{ {
@ -427,21 +428,21 @@ class Extractor
// 空行 // 空行
if (empty($line)) { if (empty($line)) {
$i--; --$i;
continue; continue;
} }
// C++ 风格注释 // C++ 风格注释
if (str_starts_with($line, '//')) { if (str_starts_with($line, '//')) {
array_unshift($comments, substr($line, 2)); array_unshift($comments, substr($line, 2));
$i--; --$i;
continue; continue;
} }
// C 风格注释结束 // C 风格注释结束
if (str_ends_with($line, '*/')) { if (str_ends_with($line, '*/')) {
$commentLines = [$line]; $commentLines = [$line];
$i--; --$i;
// 继续向上查找注释开始 // 继续向上查找注释开始
while ($i >= 0) { while ($i >= 0) {
@ -451,7 +452,7 @@ class Extractor
if (str_starts_with($commentLine, '/*')) { if (str_starts_with($commentLine, '/*')) {
break; break;
} }
$i--; --$i;
} }
// 解析多行注释 // 解析多行注释
@ -461,7 +462,7 @@ class Extractor
$comment = preg_replace('#^\s*\*\s?#m', '', $comment); $comment = preg_replace('#^\s*\*\s?#m', '', $comment);
array_unshift($comments, trim($comment)); array_unshift($comments, trim($comment));
$i--; --$i;
continue; continue;
} }
@ -473,7 +474,7 @@ class Extractor
} }
/** /**
* 检测是否是 PHP 函数宏定义 * 检测是否是 PHP 函数宏定义.
*/ */
private function isPHPFunction(string $signature): bool private function isPHPFunction(string $signature): bool
{ {
@ -485,7 +486,7 @@ class Extractor
]; ];
foreach ($phpMacros as $macro) { foreach ($phpMacros as $macro) {
if (strpos($signature, $macro) !== false) { if (false !== strpos($signature, $macro)) {
return true; return true;
} }
} }
@ -494,7 +495,7 @@ class Extractor
} }
/** /**
* 解析文档注释标签 * 解析文档注释标签.
*/ */
private function parseDocTags(array $comments): array private function parseDocTags(array $comments): array
{ {
@ -520,7 +521,7 @@ class Extractor
} }
/** /**
* 生成函数统计信息 * 生成函数统计信息.
*/ */
public function generateStatistics(array $functions): array public function generateStatistics(array $functions): array
{ {
@ -552,12 +553,12 @@ class Extractor
// 有注释的函数 // 有注释的函数
if (!empty($func['metadata']['comments'])) { if (!empty($func['metadata']['comments'])) {
$stats['withComments']++; ++$stats['withComments'];
} }
// PHP 函数宏 // PHP 函数宏
if ($func['metadata']['isPHPFunction'] ?? false) { if ($func['metadata']['isPHPFunction'] ?? false) {
$stats['isPHPFunction']++; ++$stats['isPHPFunction'];
} }
} }
@ -565,13 +566,13 @@ class Extractor
} }
/** /**
* 导出为 Markdown 文档 * 导出为 Markdown 文档.
*/ */
public function exportToMarkdown(array $functions, string $title = 'API 文档'): string public function exportToMarkdown(array $functions, string $title = 'API 文档'): string
{ {
$md = "# {$title}\n\n"; $md = "# {$title}\n\n";
$md .= "生成时间: " . date('Y-m-d H:i:s') . "\n\n"; $md .= '生成时间: '.date('Y-m-d H:i:s')."\n\n";
$md .= "总计: " . count($functions) . " 个函数\n\n"; $md .= '总计: '.count($functions)." 个函数\n\n";
$md .= "---\n\n"; $md .= "---\n\n";
foreach ($functions as $func) { foreach ($functions as $func) {

8
src/Php/FileScanner.php
Unescape View File

@ -2,8 +2,6 @@
namespace PhpAot\Php; namespace PhpAot\Php;
use FilesystemIterator;
class FileScanner class FileScanner
{ {
private string $directory; private string $directory;
@ -45,12 +43,14 @@ class FileScanner
public function addExcludePattern(string $pattern): self public function addExcludePattern(string $pattern): self
{ {
$this->excludePatterns[] = $pattern; $this->excludePatterns[] = $pattern;
return $this; return $this;
} }
public function setExcludePatterns(array $patterns): self public function setExcludePatterns(array $patterns): self
{ {
$this->excludePatterns = $patterns; $this->excludePatterns = $patterns;
return $this; return $this;
} }
@ -68,6 +68,7 @@ class FileScanner
break; break;
} }
} }
return $excluded; return $excluded;
} }
@ -75,7 +76,7 @@ class FileScanner
{ {
$files = []; $files = [];
$iterator = new \RecursiveIteratorIterator( $iterator = new \RecursiveIteratorIterator(
new \RecursiveDirectoryIterator($this->directory, FilesystemIterator::SKIP_DOTS) new \RecursiveDirectoryIterator($this->directory, \FilesystemIterator::SKIP_DOTS)
); );
foreach ($iterator as $file) { foreach ($iterator as $file) {
@ -92,6 +93,7 @@ class FileScanner
} }
} }
} }
return $files; return $files;
} }

10
src/Php/FileSorter.php
Unescape View File

@ -22,13 +22,13 @@ class FileSorter
$inDegree = array_fill_keys($allFiles, 0); $inDegree = array_fill_keys($allFiles, 0);
foreach ($dependencies as $deps) { foreach ($dependencies as $deps) {
foreach ($deps as $dep) { foreach ($deps as $dep) {
$inDegree[$dep]++; ++$inDegree[$dep];
} }
} }
$queue = []; $queue = [];
foreach ($inDegree as $file => $degree) { foreach ($inDegree as $file => $degree) {
if ($degree === 0) { if (0 === $degree) {
$queue[] = $file; $queue[] = $file;
} }
} }
@ -40,8 +40,8 @@ class FileSorter
if (isset($dependencies[$current])) { if (isset($dependencies[$current])) {
foreach ($dependencies[$current] as $dep) { foreach ($dependencies[$current] as $dep) {
$inDegree[$dep]--; --$inDegree[$dep];
if ($inDegree[$dep] === 0) { if (0 === $inDegree[$dep]) {
$queue[] = $dep; $queue[] = $dep;
} }
} }
@ -49,7 +49,7 @@ class FileSorter
} }
if (count($sorted) !== count($allFiles)) { if (count($sorted) !== count($allFiles)) {
throw new \RuntimeException("Circular dependency of function call detected"); throw new \RuntimeException('Circular dependency of function call detected');
} }
return array_reverse($sorted); return array_reverse($sorted);

10
src/Php/FuncCallOptimizer.php
Unescape View File

@ -8,10 +8,10 @@ trait FuncCallOptimizer
{ {
protected function parseFuncCallWithOptimizer(string $name, Node\Expr\FuncCall $expr): string|false protected function parseFuncCallWithOptimizer(string $name, Node\Expr\FuncCall $expr): string|false
{ {
if ($name === 'strlen' or $name === 'sizeof' or $name === 'count') { if ('strlen' === $name or 'sizeof' === $name or 'count' === $name) {
return 'php::len('.$this->parseIdentifier($expr->args[0]->value).')'; return 'php::len('.$this->parseIdentifier($expr->args[0]->value).')';
} }
if (count($expr->args) == 1) { if (1 == count($expr->args)) {
switch ($name) { switch ($name) {
case 'intval': case 'intval':
return $this->convertIntExpr($this->parseExpr($expr->args[0]->value)); return $this->convertIntExpr($this->parseExpr($expr->args[0]->value));
@ -24,19 +24,21 @@ trait FuncCallOptimizer
default: default:
break; break;
} }
} elseif (count($expr->args) == 2) { } elseif (2 == count($expr->args)) {
switch ($name) { switch ($name) {
case 'objval': case 'objval':
$arg1 = $expr->args[0]->value; $arg1 = $expr->args[0]->value;
$arg2 = $expr->args[1]->value; $arg2 = $expr->args[1]->value;
return $this->convertObjectExpr($this->parseExpr($arg1), $this->parseExpr($arg2)); return $this->convertObjectExpr($this->parseExpr($arg1), $this->parseExpr($arg2));
default: default:
break; break;
} }
} }
if ($name === 'abs') { if ('abs' === $name) {
return 'php::math::abs('.$this->parseIdentifier($expr->args[0]->value).')'; return 'php::math::abs('.$this->parseIdentifier($expr->args[0]->value).')';
} }
return false; return false;
} }
} }

1
src/Php/FunctionDef.php
Unescape View File

@ -14,7 +14,6 @@ class FunctionDef
public string $params = ''; public string $params = '';
public bool $method = false; public bool $method = false;
public function __construct(string $name, string $returnType) public function __construct(string $name, string $returnType)
{ {
$this->name = $name; $this->name = $name;

10
src/Php/MagicMethodDetector.php
Unescape View File

@ -6,14 +6,14 @@ use PhpParser\NodeAbstract;
trait MagicMethodDetector trait MagicMethodDetector
{ {
function checkRequiredArgNum(string $name, MethodDef $methodDef, NodeAbstract $v): void public function checkRequiredArgNum(string $name, MethodDef $methodDef, NodeAbstract $v): void
{ {
if ($name == '__call' or $name == '__callStatic' or $name == '__set') { if ('__call' == $name or '__callStatic' == $name or '__set' == $name) {
if (count($methodDef->functionDef->argInfoList) != 2) { if (2 != count($methodDef->functionDef->argInfoList)) {
$this->fatalError($v, 'Method '.$this->class."::$name() must take exactly 2 arguments"); $this->fatalError($v, 'Method '.$this->class."::$name() must take exactly 2 arguments");
} }
} elseif ($name == '__get') { } elseif ('__get' == $name) {
if (count($methodDef->functionDef->argInfoList) != 1) { if (1 != count($methodDef->functionDef->argInfoList)) {
$this->fatalError($v, 'Method '.$this->class."::$name() must take exactly 1 argument"); $this->fatalError($v, 'Method '.$this->class."::$name() must take exactly 1 argument");
} }
} }

6
src/Php/Preprocessor.php
Unescape View File

@ -54,12 +54,14 @@ class Preprocessor extends CompilerBase
public function getCppFile(string $file): string public function getCppFile(string $file): string
{ {
$info = pathinfo($file); $info = pathinfo($file);
return $this->buildDir.'/'.$this->removeCommonPrefix($this->buildDir, $info['dirname'].'/'.$info['filename'].'.cc'); return $this->buildDir.'/'.$this->removeCommonPrefix($this->buildDir, $info['dirname'].'/'.$info['filename'].'.cc');
} }
public function getObjectFile(string $cppFile): string public function getObjectFile(string $cppFile): string
{ {
$info = pathinfo($cppFile); $info = pathinfo($cppFile);
return $info['dirname'].'/'.$info['filename'].'.o'; return $info['dirname'].'/'.$info['filename'].'.o';
} }
@ -72,6 +74,7 @@ class Preprocessor extends CompilerBase
if (file_exists($cppFile) and filemtime($cppFile) > filemtime($file)) { if (file_exists($cppFile) and filemtime($cppFile) > filemtime($file)) {
return true; return true;
} }
return false; return false;
} }
@ -79,6 +82,7 @@ class Preprocessor extends CompilerBase
{ {
if ($this->hasCppFileCache($file)) { if ($this->hasCppFileCache($file)) {
$this->climate->darkGray('skip: '.$file.', cache exists'); $this->climate->darkGray('skip: '.$file.', cache exists');
return; return;
} }
@ -146,7 +150,6 @@ class Preprocessor extends CompilerBase
} }
} }
protected function prepareClass(Node\Stmt\Class_|Node\Stmt\Trait_ $class): string protected function prepareClass(Node\Stmt\Class_|Node\Stmt\Trait_ $class): string
{ {
$this->class = $this->parseIdentifier($class->name); $this->class = $this->parseIdentifier($class->name);
@ -167,6 +170,7 @@ class Preprocessor extends CompilerBase
} }
} }
$this->class = ''; $this->class = '';
return $code; return $code;
} }
} }

15
src/Php/Reflection.php
Unescape View File

@ -2,10 +2,6 @@
namespace PhpAot\Php; namespace PhpAot\Php;
use ReflectionFunction;
use ReflectionParameter;
use ReflectionUnionType;
class Reflection class Reflection
{ {
private static array $functions = []; private static array $functions = [];
@ -14,13 +10,13 @@ class Reflection
{ {
if (!isset(self::$functions[$fn])) { if (!isset(self::$functions[$fn])) {
try { try {
$ref = new ReflectionFunction($fn); $ref = new \ReflectionFunction($fn);
;
} catch (\ReflectionException $e) { } catch (\ReflectionException $e) {
return null; return null;
} }
self::$functions[$fn] = $ref; self::$functions[$fn] = $ref;
} }
return self::$functions[$fn]; return self::$functions[$fn];
} }
@ -34,13 +30,14 @@ class Reflection
if (!$returnType) { if (!$returnType) {
return null; return null;
} }
if ($returnType instanceof ReflectionUnionType) { if ($returnType instanceof \ReflectionUnionType) {
return null; return null;
} }
return $returnType->getName(); return $returnType->getName();
} }
public static function getFunctionParameter(string $fn, int $index): ?ReflectionParameter public static function getFunctionParameter(string $fn, int $index): ?\ReflectionParameter
{ {
$func = self::getFunction($fn); $func = self::getFunction($fn);
if (!$func) { if (!$func) {
@ -50,6 +47,7 @@ class Reflection
if ($index >= count($args)) { if ($index >= count($args)) {
return null; return null;
} }
return $args[$index]; return $args[$index];
} }
@ -59,6 +57,7 @@ class Reflection
if (!$param) { if (!$param) {
return null; return null;
} }
return $param->isPassedByReference() ? $param->getName() : null; return $param->isPassedByReference() ? $param->getName() : null;
} }
} }

1
src/Php/SyntaxError.php
Unescape View File

@ -4,5 +4,4 @@ namespace PhpAot\Php;
class SyntaxError extends \RuntimeException class SyntaxError extends \RuntimeException
{ {
} }

75
src/Php/Translator.php
Unescape View File

@ -3,12 +3,11 @@
namespace PhpAot\Php; namespace PhpAot\Php;
use MJS\TopSort\Implementations\StringSort; use MJS\TopSort\Implementations\StringSort;
use Symfony\Component\Yaml\Yaml;
use PhpParser\Modifiers; use PhpParser\Modifiers;
use PhpParser\Node; use PhpParser\Node;
use PhpParser\Node\Stmt\Foreach_; use PhpParser\Node\Stmt\Foreach_;
use PhpParser\NodeAbstract;
use PhpParser\NodeTraverser; use PhpParser\NodeTraverser;
use Symfony\Component\Yaml\Yaml;
class Translator extends Preprocessor class Translator extends Preprocessor
{ {
@ -85,6 +84,7 @@ class Translator extends Preprocessor
{ {
if ($this->hasCppFileCache($file)) { if ($this->hasCppFileCache($file)) {
$this->climate->darkGray('skip: '.$file.', cache exists'); $this->climate->darkGray('skip: '.$file.', cache exists');
return $this->getCppFile($file); return $this->getCppFile($file);
} }
$phpCode = $this->loadFile($file); $phpCode = $this->loadFile($file);
@ -96,6 +96,7 @@ class Translator extends Preprocessor
$cppFile = $this->getCppFile($file); $cppFile = $this->getCppFile($file);
$this->save($cppCode, $cppFile); $this->save($cppCode, $cppFile);
$this->phpSrcFiles[] = $file; $this->phpSrcFiles[] = $file;
return $cppFile; return $cppFile;
} catch (RedoException $e) { } catch (RedoException $e) {
continue; continue;
@ -112,7 +113,7 @@ class Translator extends Preprocessor
{ {
$list = []; $list = [];
$parentCe = $this->getParentClassCe($classDef); $parentCe = $this->getParentClassCe($classDef);
if ($parentCe !== '') { if ('' !== $parentCe) {
$list = [$parentCe]; $list = [$parentCe];
} }
// interface 没有 implements // interface 没有 implements
@ -120,6 +121,7 @@ class Translator extends Preprocessor
return $list; return $list;
} }
$implements = $this->getImplementCe($classDef); $implements = $this->getImplementCe($classDef);
return array_merge($list, $implements); return array_merge($list, $implements);
} }
@ -134,6 +136,7 @@ class Translator extends Preprocessor
if (empty($depsCeList)) { if (empty($depsCeList)) {
return ''; return '';
} }
return 'zend_class_entry *'.implode(', zend_class_entry *', $depsCeList); return 'zend_class_entry *'.implode(', zend_class_entry *', $depsCeList);
} }
@ -162,6 +165,7 @@ class Translator extends Preprocessor
protected function getFilesFromDir(string $path): array protected function getFilesFromDir(string $path): array
{ {
$scanner = new FileScanner($path); $scanner = new FileScanner($path);
return $scanner->scan(); return $scanner->scan();
} }
@ -175,7 +179,7 @@ class Translator extends Preprocessor
$list = []; $list = [];
foreach ($sources as $src) { foreach ($sources as $src) {
$src = trim($src); $src = trim($src);
if ($src[0] != '/') { if ('/' != $src[0]) {
$absPath = $projectDir.'/'.$src; $absPath = $projectDir.'/'.$src;
} else { } else {
$absPath = $src; $absPath = $src;
@ -198,27 +202,28 @@ class Translator extends Preprocessor
if (is_array($cfg['cxxflags'])) { if (is_array($cfg['cxxflags'])) {
$this->cxxflags = implode(' ', $cfg['cxxflags']); $this->cxxflags = implode(' ', $cfg['cxxflags']);
} else { } else {
$this->cxxflags = str_replace("\n", " ", $cfg['cxxflags']); $this->cxxflags = str_replace("\n", ' ', $cfg['cxxflags']);
} }
} }
if (!empty($cfg['ldflags'])) { if (!empty($cfg['ldflags'])) {
if (is_array($cfg['ldflags'])) { if (is_array($cfg['ldflags'])) {
$this->ldflags = implode(' ', $cfg['ldflags']); $this->ldflags = implode(' ', $cfg['ldflags']);
} else { } else {
$this->ldflags = str_replace("\n", " ", $cfg['ldflags']); $this->ldflags = str_replace("\n", ' ', $cfg['ldflags']);
} }
} }
if (!empty($cfg['name'])) { if (!empty($cfg['name'])) {
$this->setTargetName($cfg['name']); $this->setTargetName($cfg['name']);
} }
return $list; return $list;
} }
public function getFiles(string $path): array public function getFiles(string $path): array
{ {
$realpath = realpath($path); $realpath = realpath($path);
if ($realpath === false) { if (false === $realpath) {
die("path not exists: $path\n"); exit("path not exists: $path\n");
} }
$path = $realpath; $path = $realpath;
@ -228,9 +233,9 @@ class Translator extends Preprocessor
$this->setTargetName($targetName); $this->setTargetName($targetName);
} else { } else {
$ext = pathinfo($path, PATHINFO_EXTENSION); $ext = pathinfo($path, PATHINFO_EXTENSION);
if ($ext === 'yml') { if ('yml' === $ext) {
$list = $this->parseProjectYaml($path); $list = $this->parseProjectYaml($path);
} elseif ($ext === 'php') { } elseif ('php' === $ext) {
$list = [$path]; $list = [$path];
$targetName = FileScanner::getFileName($path); $targetName = FileScanner::getFileName($path);
$this->setTargetName($targetName); $this->setTargetName($targetName);
@ -238,6 +243,7 @@ class Translator extends Preprocessor
$this->error('Unsupported file type: '.$path); $this->error('Unsupported file type: '.$path);
} }
} }
return $list; return $list;
} }
@ -254,6 +260,7 @@ class Translator extends Preprocessor
if (!$classDef->extends) { if (!$classDef->extends) {
return ''; return '';
} }
return self::PREFIX.'class_entry_'.$classDef->extends; return self::PREFIX.'class_entry_'.$classDef->extends;
} }
@ -263,6 +270,7 @@ class Translator extends Preprocessor
foreach ($classDef->implements as $interface) { foreach ($classDef->implements as $interface) {
$list[] = self::PREFIX.'class_entry_'.$interface; $list[] = self::PREFIX.'class_entry_'.$interface;
} }
return $list; return $list;
} }
@ -334,7 +342,7 @@ class Translator extends Preprocessor
global $argv; global $argv;
$processed = [$argv[0]]; $processed = [$argv[0]];
for ($i = 1; $i < count($argv); $i++) { for ($i = 1; $i < count($argv); ++$i) {
$arg = $argv[$i]; $arg = $argv[$i];
if (preg_match('/^-([a-zA-Z])(.+)$/', $arg, $matches)) { if (preg_match('/^-([a-zA-Z])(.+)$/', $arg, $matches)) {
$option = $matches[1]; $option = $matches[1];
@ -370,6 +378,10 @@ class Translator extends Preprocessor
$literalStringsCount = count($this->literalStrings); $literalStringsCount = count($this->literalStrings);
$lines[] = 'extern php::Var '.self::LITERAL_STRINGS.'['.$literalStringsCount.'];'.PHP_EOL; $lines[] = 'extern php::Var '.self::LITERAL_STRINGS.'['.$literalStringsCount.'];'.PHP_EOL;
$classEntryCount = count($this->classMap);
$lines[] = 'extern zend_class_entry *'.self::PREFIX.self::CLASS_ENTRY_MAP.'['.$classEntryCount.'];'.PHP_EOL;
$code = implode(PHP_EOL, $lines).PHP_EOL.PHP_EOL; $code = implode(PHP_EOL, $lines).PHP_EOL.PHP_EOL;
$this->writeFile($file, $code); $this->writeFile($file, $code);
} }
@ -378,6 +390,7 @@ class Translator extends Preprocessor
{ {
ob_start(); ob_start();
include __DIR__.'/../template/'.$template; include __DIR__.'/../template/'.$template;
return ob_get_clean(); return ob_get_clean();
} }
@ -450,7 +463,7 @@ class Translator extends Preprocessor
public function genExtension(string $file): void public function genExtension(string $file): void
{ {
if ($this->buildMode == 'bin') { if ('bin' == $this->buildMode) {
if (!isset($this->nativeFunctions['main'])) { if (!isset($this->nativeFunctions['main'])) {
$this->climate->red('When the build mode is a binary executable file, the `main()` function must be defined'); $this->climate->red('When the build mode is a binary executable file, the `main()` function must be defined');
exit(1); exit(1);
@ -473,6 +486,7 @@ class Translator extends Preprocessor
if (file_exists($objectFile) and filemtime($objectFile) > filemtime($cppFile)) { if (file_exists($objectFile) and filemtime($objectFile) > filemtime($cppFile)) {
return true; return true;
} }
return false; return false;
} }
@ -480,6 +494,7 @@ class Translator extends Preprocessor
{ {
if ($this->hasObjectFileCache($cppFile)) { if ($this->hasObjectFileCache($cppFile)) {
$this->climate->darkGray('skip: '.$cppFile.', cache exists'); $this->climate->darkGray('skip: '.$cppFile.', cache exists');
return; return;
} }
$cmd = $this->cppCompiler.' -c '.$cppFile.' -o '.$objectFile; $cmd = $this->cppCompiler.' -c '.$cppFile.' -o '.$objectFile;
@ -492,7 +507,7 @@ class Translator extends Preprocessor
{ {
$objectList = implode(' ', $objectFiles); $objectList = implode(' ', $objectFiles);
$targetFile = $this->targetName; $targetFile = $this->targetName;
if ($this->buildMode == 'ext' and !str_ends_with($targetFile, '.so')) { if ('ext' == $this->buildMode and !str_ends_with($targetFile, '.so')) {
$targetFile .= '.so'; $targetFile .= '.so';
} }
$linkCmd = $this->cppCompiler.' '.$objectList.' -o '.$targetFile; $linkCmd = $this->cppCompiler.' '.$objectList.' -o '.$targetFile;
@ -532,6 +547,8 @@ class Translator extends Preprocessor
$code .= 'extern '.$constant->type.' '.$name.';'.PHP_EOL; $code .= 'extern '.$constant->type.' '.$name.';'.PHP_EOL;
} }
$code .= 'extern zend_class_entry *php_get_class_entry(int class_id, const char *class_name);'.PHP_EOL;
$this->writeFile($file, $code); $this->writeFile($file, $code);
} }
@ -555,7 +572,7 @@ class Translator extends Preprocessor
if ($this->useCppNamespace) { if ($this->useCppNamespace) {
$ns = explode('\\', $ns); $ns = explode('\\', $ns);
$ns = array_filter($ns, function ($v) { $ns = array_filter($ns, function ($v) {
return $v !== ''; return '' !== $v;
}); });
foreach ($ns as $name) { foreach ($ns as $name) {
$code .= 'namespace '.$name.' {'.PHP_EOL; $code .= 'namespace '.$name.' {'.PHP_EOL;
@ -588,6 +605,7 @@ class Translator extends Preprocessor
} }
$code .= $ns_end; $code .= $ns_end;
$this->resetNamespace(); $this->resetNamespace();
return $code; return $code;
} }
@ -597,9 +615,9 @@ class Translator extends Preprocessor
$output = shell_exec($genStubCmd); $output = shell_exec($genStubCmd);
$this->climate->info('generate stub file: '.$file); $this->climate->info('generate stub file: '.$file);
$this->climate->comment($genStubCmd); $this->climate->comment($genStubCmd);
$stubFilenameWithoutExtension = str_replace([".stub.php", '.php'], "", $file); $stubFilenameWithoutExtension = str_replace(['.stub.php', '.php'], '', $file);
$headerFile = $this->getArgInfoHeaderFile($stubFilenameWithoutExtension, true); $headerFile = $this->getArgInfoHeaderFile($stubFilenameWithoutExtension, true);
if (!str_contains($output, "Saved")) { if (!str_contains($output, 'Saved')) {
$this->error("failed to generate arginfo header file: `$headerFile`, output: $output"); $this->error("failed to generate arginfo header file: `$headerFile`, output: $output");
} }
$this->argInfoHeaderFiles[] = $headerFile; $this->argInfoHeaderFiles[] = $headerFile;
@ -649,6 +667,7 @@ class Translator extends Preprocessor
$this->fatalError($class, "Class `{$this->class}` uses a non-empty array as the default value for an property, and the constructor must be set."); $this->fatalError($class, "Class `{$this->class}` uses a non-empty array as the default value for an property, and the constructor must be set.");
} }
$this->resetClass(); $this->resetClass();
return $code; return $code;
} }
@ -701,7 +720,7 @@ class Translator extends Preprocessor
$callParams = $functionDef->argInfoList ? rtrim($callParams, ',') : ''; $callParams = $functionDef->argInfoList ? rtrim($callParams, ',') : '';
} }
if ($functionDef->returnType !== self::TYPE_VOID) { if (self::TYPE_VOID !== $functionDef->returnType) {
$cppCode .= $this->getIndent().'auto retval = '.$fn.'('.$callParams.');'.PHP_EOL; $cppCode .= $this->getIndent().'auto retval = '.$fn.'('.$callParams.');'.PHP_EOL;
$cppCode .= $this->getIndent().'php::move(retval, return_value);'.PHP_EOL; $cppCode .= $this->getIndent().'php::move(retval, return_value);'.PHP_EOL;
} else { } else {
@ -719,7 +738,7 @@ class Translator extends Preprocessor
$cppCode .= $this->getIndent().self::TYPE_OBJECT.' this_(&execute_data->This);'.PHP_EOL; $cppCode .= $this->getIndent().self::TYPE_OBJECT.' this_(&execute_data->This);'.PHP_EOL;
foreach ($classDef->properties as $property) { foreach ($classDef->properties as $property) {
if ($property->type === self::TYPE_ARRAY and $property->default and $property->default !== self::TYPE_ARRAY . '{}') { if (self::TYPE_ARRAY === $property->type and $property->default and $property->default !== self::TYPE_ARRAY.'{}') {
$propOffset = self::PREFIX.$this->getPropertyOffset($property->name, $classDef->name, $classDef->namespace); $propOffset = self::PREFIX.$this->getPropertyOffset($property->name, $classDef->name, $classDef->namespace);
$cppCode .= $this->getIndent().'this_.getPropertyIndirect('.$propOffset.') = '.$property->default.';'.PHP_EOL; $cppCode .= $this->getIndent().'this_.getPropertyIndirect('.$propOffset.') = '.$property->default.';'.PHP_EOL;
} }
@ -727,6 +746,7 @@ class Translator extends Preprocessor
$fn = self::PREFIX.$this->getNativeMethodName($classDef, $methodDef); $fn = self::PREFIX.$this->getNativeMethodName($classDef, $methodDef);
$cppCode .= $this->genWrapperFunctionArgs($fn, $methodDef->functionDef); $cppCode .= $this->genWrapperFunctionArgs($fn, $methodDef->functionDef);
return $cppCode; return $cppCode;
} }
@ -736,6 +756,7 @@ class Translator extends Preprocessor
$cppCode = 'ZEND_FUNCTION('.$name.'){'.PHP_EOL; $cppCode = 'ZEND_FUNCTION('.$name.'){'.PHP_EOL;
$fn = self::PREFIX.$this->getNativeName($functionDef->name); $fn = self::PREFIX.$this->getNativeName($functionDef->name);
$cppCode .= $this->genWrapperFunctionArgs($fn, $functionDef); $cppCode .= $this->genWrapperFunctionArgs($fn, $functionDef);
return $cppCode; return $cppCode;
} }
@ -750,7 +771,6 @@ class Translator extends Preprocessor
$cppCode .= '}'.PHP_EOL.PHP_EOL; $cppCode .= '}'.PHP_EOL.PHP_EOL;
} }
protected function genClassWrapper(ClassDef|InterfaceDef $classDef): string protected function genClassWrapper(ClassDef|InterfaceDef $classDef): string
{ {
$cppCode = ''; $cppCode = '';
@ -845,6 +865,7 @@ class Translator extends Preprocessor
} }
$code .= '};'.PHP_EOL.PHP_EOL; $code .= '};'.PHP_EOL.PHP_EOL;
return $code; return $code;
} }
@ -855,6 +876,7 @@ class Translator extends Preprocessor
foreach ($headers as $header) { foreach ($headers as $header) {
$lines[] = '#include <'.$header.'>'; $lines[] = '#include <'.$header.'>';
} }
return implode(PHP_EOL, $lines).PHP_EOL.PHP_EOL; return implode(PHP_EOL, $lines).PHP_EOL.PHP_EOL;
} }
@ -867,6 +889,7 @@ class Translator extends Preprocessor
foreach ($list as $const) { foreach ($list as $const) {
$code .= $this->getIndent().$this->genClassConstant($const); $code .= $this->getIndent().$this->genClassConstant($const);
} }
return $code; return $code;
} }
@ -884,6 +907,7 @@ class Translator extends Preprocessor
foreach ($list as $prop) { foreach ($list as $prop) {
$code .= $this->getIndent().$this->genClassProperty($prop); $code .= $this->getIndent().$this->genClassProperty($prop);
} }
return $code; return $code;
} }
@ -893,6 +917,7 @@ class Translator extends Preprocessor
if ($prop->default) { if ($prop->default) {
$code .= ' = '.$prop->default; $code .= ' = '.$prop->default;
} }
return $code.';'.PHP_EOL; return $code.';'.PHP_EOL;
} }
@ -905,6 +930,7 @@ class Translator extends Preprocessor
$code = $returnType.' '.$name.'('.implode(', ', $_args).') {'.PHP_EOL; $code = $returnType.' '.$name.'('.implode(', ', $_args).') {'.PHP_EOL;
$code .= implode(PHP_EOL, $lines).PHP_EOL; $code .= implode(PHP_EOL, $lines).PHP_EOL;
$code .= '}'.PHP_EOL; $code .= '}'.PHP_EOL;
return $code; return $code;
} }
@ -930,7 +956,7 @@ class Translator extends Preprocessor
foreach ($v->props as $prop) { foreach ($v->props as $prop) {
$propDef = new PropertyDef($this->parseIdentifier($prop->name), $flags, $type); $propDef = new PropertyDef($this->parseIdentifier($prop->name), $flags, $type);
if ($prop->default) { if ($prop->default) {
if ($prop->default->getType() == 'Expr_Array' and count($prop->default->items) > 0) { if ('Expr_Array' == $prop->default->getType() and count($prop->default->items) > 0) {
$this->classDef->requireCtor = true; $this->classDef->requireCtor = true;
$propDef->type = self::TYPE_ARRAY; $propDef->type = self::TYPE_ARRAY;
} }
@ -961,6 +987,7 @@ class Translator extends Preprocessor
foreach ($implements as $implement) { foreach ($implements as $implement) {
$list[] = $this->parseIdentifier($implement); $list[] = $this->parseIdentifier($implement);
} }
return $list; return $list;
} }
@ -990,10 +1017,10 @@ class Translator extends Preprocessor
$code .= 'if ('.$tmpVar.') {'.PHP_EOL; $code .= 'if ('.$tmpVar.') {'.PHP_EOL;
$this->indentLevel++; ++$this->indentLevel;
$code .= $this->getIndent().$tmpVar.'.exec("rewind");'.PHP_EOL; $code .= $this->getIndent().$tmpVar.'.exec("rewind");'.PHP_EOL;
$code .= $this->getIndent().'for (;'.$tmpVar.'.exec("valid"); '.$tmpVar.'.exec("next")) {'.PHP_EOL; $code .= $this->getIndent().'for (;'.$tmpVar.'.exec("valid"); '.$tmpVar.'.exec("next")) {'.PHP_EOL;
$this->indentLevel++; ++$this->indentLevel;
$valueVar = $this->parseIdentifier($node->valueVar); $valueVar = $this->parseIdentifier($node->valueVar);
$this->checkVar($node, $valueVar); $this->checkVar($node, $valueVar);
@ -1006,11 +1033,11 @@ class Translator extends Preprocessor
} }
$code .= $this->parseStmts($node->stmts); $code .= $this->parseStmts($node->stmts);
$code .= '}'.PHP_EOL; $code .= '}'.PHP_EOL;
$this->indentLevel--; --$this->indentLevel;
$code .= $this->getIndent().'} else {'.PHP_EOL; $code .= $this->getIndent().'} else {'.PHP_EOL;
$code .= $this->getIndent().$tmpArrayVar.' = php::call("get_object_vars", {'.$obj.'});'.PHP_EOL; $code .= $this->getIndent().$tmpArrayVar.' = php::call("get_object_vars", {'.$obj.'});'.PHP_EOL;
$code .= $this->parseForeachArray($node, $tmpArrayVar); $code .= $this->parseForeachArray($node, $tmpArrayVar);
$this->indentLevel--; --$this->indentLevel;
$code .= '}'.PHP_EOL; $code .= '}'.PHP_EOL;
return $code; return $code;

17
src/template/extension.cc.php
Unescape View File

@ -21,6 +21,16 @@ foreach ($this->classCeList as $ce):
zend_class_entry * <?= $ce ?>; zend_class_entry * <?= $ce ?>;
<?php endforeach; ?> <?php endforeach; ?>
// class entry
zend_class_entry *<?= Translator::PREFIX . Translator::CLASS_ENTRY_MAP . '[' . count($this->classMap) . ']' ?>;
zend_class_entry *php_get_class_entry(int class_id, const char *class_name) {
if (<?= Translator::PREFIX . Translator::CLASS_ENTRY_MAP ?>[class_id] == nullptr) {
<?= Translator::PREFIX . Translator::CLASS_ENTRY_MAP ?>[class_id] = php::getClassEntrySafe(class_name);
}
return <?= Translator::PREFIX . Translator::CLASS_ENTRY_MAP ?>[class_id];
}
// literal strings // literal strings
php::Var <?=Translator::LITERAL_STRINGS?>[] = { php::Var <?=Translator::LITERAL_STRINGS?>[] = {
<?php <?php
@ -97,6 +107,13 @@ foreach ($this->classes as $classDef):
endforeach; endforeach;
endforeach; endforeach;
?> ?>
// class entry
<?php
foreach ($this->classMap as $class => $id):
?>
<?= Translator::PREFIX . Translator::CLASS_ENTRY_MAP . '[' . $id . ']' ?> = php::getClassEntry("<?= $this->escapeString($class) ?>");
<?php endforeach; ?>
} }
void php_app_clean() { void php_app_clean() {

Write Preview
Loading…
Cancel
Save