Skip to content

Commit 8f57b1e

Browse files
committed
Fixed final load issues with newer PHP constructs, including with use, resolves #10
1 parent 482e3eb commit 8f57b1e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/lang/php/ast/AbstractSyntax.rsc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public data ClosureUse = closureUse(Expr varName, bool byRef);
3333

3434
public data IncludeType = include() | includeOnce() | require() | requireOnce();
3535

36-
public data PHPType = nullableType(str typeName) | regularType(str typeName) | noType();
36+
public data PHPType = nullableType(PHPType nestedType) | regularType(Name typeName) | noType();
3737

3838
// NOTE: In PHP, yield is a statement, but it can also be used as an expression.
3939
// To handle this, we just treat it as an expression. The parser does this as well.
@@ -135,7 +135,7 @@ public data Stmt
135135
| tryCatch(list[Stmt] body, list[Catch] catches)
136136
| tryCatchFinally(list[Stmt] body, list[Catch] catches, list[Stmt] finallyBody)
137137
| unset(list[Expr] unsetVars)
138-
| use(list[Use] uses, OptionName prefix, UseType useType)
138+
| useStmt(list[Use] uses, UseType useType)
139139
| \while(Expr cond, list[Stmt] body)
140140
| emptyStmt()
141141
| block(list[Stmt] body)

0 commit comments

Comments
 (0)