Skip to content

Allow new (<expr>) as syntax #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thekid merged 3 commits into from
Feb 15, 2020
Merged

Allow new (<expr>) as syntax #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c816992
Allow `new (<expr>)` as syntax
thekid Feb 15, 2020
fe874ce
Add test for instantiation operator
thekid Feb 15, 2020
ff2d8c9
QA: Use [] for string offsets instead of {}, which is deprecated
thekid Feb 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/main/php/lang/ast/emit/PHP.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ protected function emitCast($result, $cast) {
static $native= ['string' => true, 'int' => true, 'float' => true, 'bool' => true, 'array' => true, 'object' => true];

$name= $cast->type->name();
if ('?' === $name{0}) {
if ('?' === $name[0]) {
$result->out->write('cast(');
$this->emitOne($result, $cast->expression);
$result->out->write(',\''.$name.'\', false)');
Expand Down Expand Up @@ -662,9 +662,18 @@ protected function emitArguments($result, $arguments) {
}

protected function emitNew($result, $new) {
$result->out->write('new '.$new->type.'(');
$this->emitArguments($result, $new->arguments);
$result->out->write(')');
if ($new->type instanceof Node) {
$t= $result->temp();
$result->out->write('('.$t.'= ');
$this->emitOne($result, $new->type);
$result->out->write(') ? new '.$t.'(');
$this->emitArguments($result, $new->arguments);
$result->out->write(') : null');
} else {
$result->out->write('new '.$new->type.'(');
$this->emitArguments($result, $new->arguments);
$result->out->write(')');
}
}

protected function emitNewClass($result, $new) {
Expand Down
22 changes: 16 additions & 6 deletions src/main/php/lang/ast/syntax/PHP.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,19 +281,29 @@ public function __construct() {
});

$this->prefix('new', 0, function($parse, $token) {
$type= $parse->token;
$parse->forward();
if ('(' === $parse->token->value) {
$parse->expecting('(', 'new type');
$type= $this->expression($parse, 0);
$parse->expecting(')', 'new type');
} else if ('variable' === $parse->token->kind) {
$type= '$'.$parse->token->value;
$parse->forward();
} else if ('class' === $parse->token->value) {
$type= null;
$parse->forward();
} else {
$type= $parse->scope->resolve($parse->token->value);
$parse->forward();
}

$parse->expecting('(', 'new arguments');
$arguments= $this->expressions($parse);
$parse->expecting(')', 'new arguments');

if ('variable' === $type->kind) {
return new NewExpression('$'.$type->value, $arguments, $token->line);
} else if ('class' === $type->value) {
if (null === $type) {
return new NewClassExpression($this->clazz($parse, null), $arguments, $token->line);
} else {
return new NewExpression($parse->scope->resolve($type->value), $arguments, $token->line);
return new NewExpression($type, $arguments, $token->line);
}
});

Expand Down
54 changes: 54 additions & 0 deletions src/test/php/lang/ast/unittest/emit/InstantiationTest.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?php namespace lang\ast\unittest\emit;

use unittest\Assert;
use util\Date;

class InstantiationTest extends EmittingTest {

#[@test]
public function new_type() {
$r= $this->run('class <T> {
public function run() {
return new \\util\\Date();
}
}');
Assert::instance(Date::class, $r);
}

#[@test]
public function new_var() {
$r= $this->run('class <T> {
public function run() {
$class= \\util\\Date::class;
return new $class();
}
}');
Assert::instance(Date::class, $r);
}

#[@test]
public function new_expr() {
$r= $this->run('class <T> {
private function factory() { return \\util\\Date::class; }

public function run() {
return new ($this->factory())();
}
}');
Assert::instance(Date::class, $r);
}

#[@test]
public function passing_argument() {
$r= $this->run('class <T> {
public $value;

public function __construct($value= null) { $this->value= $value; }

public function run() {
return new self("Test");
}
}');
Assert::equals('Test', $r->value);
}
}
16 changes: 16 additions & 0 deletions src/test/php/lang/ast/unittest/parse/OperatorTest.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,22 @@ public function new_type() {
);
}

#[@test]
public function new_var() {
$this->assertParsed(
[new NewExpression('$class', [], self::LINE)],
'new $class();'
);
}

#[@test]
public function new_expr() {
$this->assertParsed(
[new NewExpression(new InvokeExpression(new Literal('factory', self::LINE), [], self::LINE), [], self::LINE)],
'new (factory())();'
);
}

#[@test]
public function new_type_with_args() {
$this->assertParsed(
Expand Down