phabel/php-parser
1
0
Fork 0
mirror of https://github.com/phabelio/PHP-Parser.git synced 2024-12-15 10:26:55 +01:00
Code Issues Projects Releases Wiki Activity
1,095 Commits 15 Branches 81 Tags 6.5 MiB
e4a54fa90a
Commit Graph

480 Commits

Author SHA1 Message Date
Nikita Popov
a79306ccd9 Rename StaticVar::$name to $var 
As it now holds a Variable
 2017-01-19 23:35:31 +01:00
Nikita Popov
6238f5f9f9 Adjust code for constitent var mode 2017-01-19 23:32:49 +01:00
Nikita Popov
67274b9594 Enforce useConsistentVariableNames 2017-01-19 23:24:43 +01:00
Nikita Popov
ced914a3b7 Update doc comments to be more specific 
Now $stmts arrays really only contains Stmt nodes.
 2017-01-19 22:49:18 +01:00
Nikita Popov
7623d20f69 Automatically wrap in Stmt\Expression in builders 2017-01-19 22:39:21 +01:00
Nikita Popov
1bfbd7bcc8 Make useExpressionStatement only supported mode 2017-01-19 21:15:26 +01:00
Nikita Popov
065c720c28 Merge branch 'formatPreservingPrint' 2017-01-19 21:06:32 +01:00
Nikita Popov
0c9c8d58ab Drop deprecated $type subnodes 
These have been replaced by $flags in 3.0
 2017-01-19 21:00:44 +01:00
Nikita Popov
3b4dd387b8 Comment out code for handling new keywords 2017-01-19 20:58:45 +01:00
Nikita Popov
61574a1818 Drop support for PHP 5.5 2017-01-19 20:55:08 +01:00
algo13
ba57202ed7 Fixed method name casing (#336) 
Make it match the parent class.
 2017-01-14 12:01:25 +01:00
Nikita Popov
f21309f52f Add NameResolver mode that does not modify nodes 2016-12-26 21:45:33 +01:00
Nikita Popov
4d2a4d02b0 Add first shot at format preserving pretty printer 2016-12-26 18:28:49 +01:00
Nikita Popov
9b2d35d1ac Add expression statement mode 2016-12-24 23:54:24 +01:00
Nikita Popov
0f582e1708 Add VarLikeIdentifier 
For representing Identifiers that have an implicit leading $.

With this done, maybe go one step further?
 * Rename VarLikeIdentifier -> VarIdentifier / VarName
 * Use VarIdentifier / VarName also as an inner node in Variable.
   Not sure if this adds any real value.
 2016-12-23 12:39:27 +01:00
Nikita Popov
d32d937d47 Use Identifier for property names as well 2016-12-23 00:25:45 +01:00
Nikita Popov
f46c909b5a Represent prop in static prop fetch using Identifier 2016-12-23 00:22:30 +01:00
Nikita Popov
a947e731c3 Add useConsistentVariableNodes mode 
The parameter case is a bit weird, because the subnode is called
"name" here, rather than "var". Nothing we can do about that in
this version though.

The two parser options might be merged. I've kept it separate,
because I think this variable representation should become the
default (or even only representation) in the future, while I'm
less sure about the Identifier thing.
 2016-12-23 00:10:59 +01:00
Nikita Popov
122f449960 Represent builtin types using Identifier as well 2016-12-22 22:23:30 +01:00
Nikita Popov
6bcc6c31dd Add useIdentifierNodes mode to parser 
In this mode non-namespaced names that are currently represented
using strings will be represented using Identifier nodes instead.
Identifier nodes have a string $name subnode and coerce to string.

This allows preserving attributes and in particular location
information on identifiers.
 2016-12-22 21:15:44 +01:00
Felix Becker
3e8c8d248d Add originalName attribute in NameResolver 
For now gated behind a preserveOriginalNames option.
 2016-12-22 20:25:02 +01:00
Nikita Popov
58970e2a37 Improve LNumber/DNumber pretty printing 
* Support PHP_INT_MIN
* Support negative binary/octal/hex numbers
* Support INF/-INF/NAN in namespaces
 2016-12-11 16:31:59 +01:00
Nikita Popov
c1e0bab4f8 Add support for negative interpolated offsets 
A late addition to PHP 7.1 which I missed.
 2016-12-11 13:44:17 +01:00
Nikita Popov
70319e27ee Parse 0 in "$a[0]" as LNumber (#325) 2016-12-07 20:24:00 +01:00
Nikita Popov
5219f75719 Fix pretty-printing of nullable types 2016-12-06 12:26:21 +01:00
Ondrej Mirtes
a485ecd7ba NameResolver - resolve Name in NullableType 2016-12-06 12:21:30 +01:00
Matthew Brown
030de805e1 Add NullableType to types of properties/args that offer it (#323) 2016-12-05 13:30:29 +01:00
Nikita Popov
3e158a2313 Wrap List_ in ArrayItem 
This was correctly done for the 'key'=>list() form, but not for
unkeyed nested lists.
 2016-12-01 13:32:37 +01:00
Nikita Popov
bcdfb703d5 Cleanup imports 
Thanks PhpStorm :)
 2016-11-23 22:58:18 +01:00
Nikita Popov
27281e9130 Fix attribute assignment for Error nodes 2016-11-23 22:51:32 +01:00
Nikita Popov
b02f8ac07d Add support for dumping positions in NodeDumper 2016-11-23 22:25:17 +01:00
Nikita Popov
e52ffc4447 Support recovery from Foo:: 2016-11-22 19:47:04 +01:00
Nikita Popov
c5cdd5ad73 Support recovery from free-standing $ 2016-11-21 17:01:39 +01:00
Nikita Popov
c0630f8169 Support recovery for new without class name 2016-11-21 16:51:53 +01:00
Nikita Popov
c0f0edf044 Mark Name::$parts as deprecated 2016-10-22 17:05:00 +02:00
Nikita Popov
fa7357b483 Represent empty Name::slice() using null 
Instead of a Name([]) dummy value, that is invalid in other
contexts.
 2016-10-22 17:02:38 +02:00
Nikita Popov
91cb82d3d2 Explicitly support Name copy construction 
It already worked beforehand by accident ... make clear it's
actually supported.
 2016-10-22 16:41:58 +02:00
Nikita Popov
7672b974ff Remove Name::append() and Name::prepend() 2016-10-22 00:25:15 +02:00
Nikita Popov
0d0accfa9f Add setDocComment() to Node interface 
Previously it was only part of NodeAbstract.
 2016-10-21 23:26:51 +02:00
Matthew Brown
623bad2c8b Type encapsulated string parts specifically 2016-10-21 11:46:54 +02:00
Matthew Brown
f66cf8f0dd $name can be null for PHP 7 anonymous classes 2016-10-21 11:46:14 +02:00
Nikita Popov
a46b309975 Move constants into NodeTraverser class 
Not that the interface makes much sense anyway, but these are
implementation details of a specific traverser.
 2016-10-16 22:13:09 +02:00
Nikita Popov
f99a96e0a2 Introduce ErrorHandler 
Add ErrorHandler interface, as well as ErrorHandler\Throwing
and ErrorHandler\Collecting. The error handler is passed to
Parser::parse(). This supersedes the throwOnError option.

NameResolver now accepts an ErrorHandler in the ctor.
 2016-10-16 22:12:46 +02:00
Nikita Popov
90834bff8e Add namespacedName attribute on runtime-resolved names 
The NameResolver now adds a namespacedName attribute on function/
const names which cannot be statically resolved.
 2016-10-11 19:44:22 +02:00
Nikita Popov
a910f6a247 Remove $separator arg from Name::toString() 2016-10-09 12:45:15 +02:00
Nikita Popov
caa5c0cc76 Graceful handling for "special" errors 
Nearly all special errors are now handled gracefully, i.e. the
parser will be able to continue after encountering them. In some
cases the associated error range has been improved using the new
end attribute stack.

To achieve this the error handling code has been moved out of the
node constructors and into special methods in the parser.
 2016-10-09 12:38:18 +02:00
Nikita Popov
5e5cb86e83 Remove support for node cloning in traverser 2016-10-09 00:41:55 +02:00
Nikita Popov
2be7838fc6 Correctly assign attrs for encaps vars 2016-10-08 23:58:39 +02:00
Nikita Popov
f6eb341b15 Fix GroupUse prefix attribute assignment 2016-10-08 23:55:46 +02:00
Nikita Popov
b2fe43cf7a Next try... 2016-09-30 21:06:48 +02:00
Nikita Popov
648a246be0 Next try to fix HHVM build 2016-09-30 20:57:21 +02:00
Nikita Popov
5025d75160 Try to fix HHVM build 2016-09-30 20:33:56 +02:00
Nikita Popov
c79ea6d1d3 Support recovery from lexer errors 
Lexer::startLexing() no longer throws, instead errors can be fetched
using Lexer::getErrors().

Lexer errors now also contain full line and position information.
 2016-09-30 20:23:36 +02:00
Nikita Popov
e926efd62e Fix regex 2016-09-30 19:17:10 +02:00
Nikita Popov
17d1e738fa Don't use ~__EMU sequences in emulative lexer 
These were necessary back in the day when we had to emulate some
complex functionality such as nowdoc strings. Now we can simply
directly translate certain token sequences.

The motivation for this change is to avoid preprocessing of the source
code, which would complicate offset-aware error handling inside the
lexer as offsets would no longer be correct.
 2016-09-30 19:10:16 +02:00
Nikita Popov
9e5d3bbe25 Remove Error::(get|set)RawLine() 
These have been superseded by Error::(get|set)StartLine().
 2016-09-30 18:30:01 +02:00
Nikita Popov
f3c7dc9d89 Add Error::getMessageWithColumnInfo() 2016-09-30 18:24:43 +02:00
Nikita Popov
c5e0c3d7e2 Catch lexer errors in throwOnError=0 mode 2016-09-30 13:49:34 +02:00
Nikita Popov
ea47b6e0d6 Add NodeAbstract::setDocComment() 2016-09-17 20:51:22 +02:00
Nikita Popov
1ab24d26ee Add support for PHP 7.1 types to builders 
This adds support for void, iterable and nullable types.
 2016-09-16 13:53:13 +02:00
Nikita Popov
a7120116b0 Merge branch '2.x' 2016-08-30 22:38:34 +02:00
Nikita Popov
83f34e7fa4 Retain comments on blocks on first inner statement 2016-08-30 22:37:51 +02:00
Nikita Popov
d0cfb98133 Merge branch '2.x' 
Conflicts:
	lib/PhpParser/Parser/Php7.php
 2016-08-30 22:14:09 +02:00
Nikita Popov
13f7321def Forbid "=& new" in PHP 7 mode 2016-08-30 22:12:01 +02:00
Nikita Popov
7dae6c7a6b Implement JsonSerializable for Nodes and Comments 
Exposes the properties and adds an additional nodeType property.
 2016-07-25 20:59:09 +02:00
Nikita Popov
977cbab8e7 Decrement errorState when recovering from -> error 
It's likely that an error after -> will trigger another one due to
missing semicolon without shifting a single token. We prevent an
immediate failure in this case by manually setting errorState to 2,
which will suppress the duplicate error message, but allow error
recovery.
 2016-07-25 17:37:54 +02:00
Nikita Popov
09086fbe0a Support partial parsing of $foo-> 
Introduce Error node for this purpose.
 2016-07-25 17:03:58 +02:00
Nikita Popov
ec614c95dd Add hasLeadingNewline attribute to InlineHTML 
Use this attribute to not print an extra newline if the original
code did not have it.
 2016-07-25 16:44:25 +02:00
Nikita Popov
b740076ab1 Remove deprecated Name::set*() methods 2016-07-25 14:50:37 +02:00
Nikita Popov
c9fea2ef67 Extend Name::slice() to support negative length+offset 2016-07-25 14:47:24 +02:00
Nikita Popov
818ef2e692 Make PrettyPrinter\Standard methods protected 
I'm not sure how these ever ended up being public.
 2016-07-25 14:27:03 +02:00
Nikita Popov
5f97b12576 Introduce explicit Finally node 2016-07-25 14:25:04 +02:00
Nikita Popov
1dea9111a2 NodeDumper: Resolve type for include/use as well 2016-07-25 14:04:04 +02:00
Nikita Popov
174e6c3cab NodeDumper: Print modifiers as strings 2016-07-25 13:53:49 +02:00
Nikita Popov
18129480ae Rename $type subnode to $flags 
Type makes it sound like a type-hint, and on a number of other nodes
$type is used for exactly that. Use $flags to hold modifiers instead.
 2016-07-25 13:33:19 +02:00
Nikita Popov
867ae5148d Bring Trait constructor in line with Class/interface 2016-07-22 17:01:51 +02:00
Nikita Popov
537b59d4d1 PHP 7.1: Support multi-catch 
Catch::$type is now an array Catch::$types.
 2016-07-22 15:40:00 +02:00
Nikita Popov
7ff12b8fcb Remove deprecated Comment methods 2016-07-09 22:00:39 +02:00
Nikita Popov
574665b45b PHP 7.1: list() with keys 
Expr\List will now contain ArrayItems instead of plain variables.
I'm reusing ArrayItem, because code handling list() must also handle
arrays, and this allows both to go through the same code path.

This also renames Expr\List->vars to ->items.

TODO: Should Expr\List be dropped in favor of Expr\Array with an
extra flag?
 2016-07-09 21:55:55 +02:00
Nikita Popov
437890d386 PHP 7: Short destructuring syntax 
Potentially the pretty printer should force use of [] in assignment
context, instead of relying on the existance of the right attribute.
 2016-07-06 23:43:23 +02:00
Nikita Popov
1edf72c040 PHP 7: Support nullable types 
Using a new NullableType node.
 2016-07-06 18:36:18 +02:00
Nikita Popov
7a54aca468 Merge branch '2.x' 2016-07-06 02:21:57 +02:00
Nikita Popov
81f7da3b23 Fix computation of expected tokens in parse errors 2016-07-06 02:21:48 +02:00
Nikita Popov
5ea2a76d80 PHP 7.1: Class constant visibility support 2016-07-05 23:01:06 +02:00
Nikita Popov
5044fce1ff PHP 7.1: Add void+iterable support 
In PHP 7 mode, these will now be represented as strings 'void'
and 'iterable'.
 2016-07-05 22:35:27 +02:00
Nikita Popov
038e11da4b Remove support for PHP 5.4 2016-07-05 22:29:41 +02:00
Nikita Popov
96cbd48df6 Improve error recovery quality 
In particular, support recovering from a missing trailing semicolon,
while keeping the rest of the expression.
 2016-04-20 16:47:50 +02:00
algo13
371c783344 Escape all low control characters in strings 2016-04-19 17:45:39 +02:00
Nikita Popov
5a6e7dd452 Avoid superfluous newline when printing Nops 2016-04-19 15:10:51 +02:00
Nikita Popov
90eb1165d1 Switch Exit kind attribute to flag 
To be consistent with everything else.
 2016-04-19 14:51:05 +02:00
Nikita Popov
e7869b9f14 Forbid invalid octals in PHP 7 mode 2016-04-18 13:59:18 +02:00
Nikita Popov
4c7ad7e194 Allow nop statements before namespace declaration 2016-04-16 21:39:49 +02:00
Remi Collet
f8a40b3f24 Make autoloader more PSR-4 (#268) 2016-04-15 15:07:30 +02:00
Graham Campbell
e7f0860d85 Tweaked a phpdoc description 2016-04-10 21:10:55 +09:00
lvht
39f93f09f9 Add setReturnType() method to function/method builders 
Also support scalar type hints in existing setTypeHint() method on params.
 2016-04-09 18:41:38 +09:00
Nikita Popov
588e6a4d4c Add string kinds and doc string labels 
Scalar\String_ and Scalar\Encapsed now have an additional "kind"
attribute, which may be one of:

 * String_::KIND_SINGLE_QUOTED
 * String_::KIND_DOUBLE_QUOTED
 * String_::KIND_NOWDOC
 * String_::KIND_HEREDOC

Additionally, if the string kind is one of the latter two, an
attribute "docLabel" is provided, which contains the doc string
label (STR in <<<STR) that was originally used.

The pretty printer will try to take the original kind of the string,
as well as the used doc string label into account.
 2016-04-07 12:09:00 +09:00
Nikita Popov
52cb5ecec7 Fix comment reformatting for some cases 
It did not correctly deal with non-standard comments containing
indented lines.
 2016-04-07 11:47:40 +09:00
Nikita Popov
14de71898e Fix nop statement comment assignment 
Keep around the start attributes on the lookahead token around in
a separate parser property.
 2016-04-05 19:19:15 +09:00
Nikita Popov
b31a973fa7 Another fix for B"" handling 
The lexer fix also need to account for uppercase B.
 2016-04-04 22:07:50 +09:00
Nikita Popov
9ac3592190 Handle uppercase B"" prefix 2016-04-02 21:15:49 +09:00
Nikita Popov
35011d2e4d Deduplicate attribute assignment code a bit 2016-04-02 08:02:58 +09:00
Nikita Popov
60f01bdd86 Deprecate setters on Comment 
No point in making it mutable
 2016-04-02 07:55:28 +09:00
Nikita Popov
15a2388d75 Add start file offset to Comments 2016-04-02 07:54:01 +09:00
Nikita Popov
eb4bfe1366 Add sanity check for leaveNode() return value 2016-03-27 14:52:15 +02:00
Nikita Popov
fc36239be5 Remove internal LNumber::parse() method 
Combine it into ::fromString(), as they both do the same checks.
 2016-03-10 13:01:42 +01:00
Nikita Popov
f493219c7d Move "kind" attribute handling out of lexer 
Doesn't belong there and will cause issue with multiple assignments.
 2016-03-10 12:55:15 +01:00
Nikita Popov
aa199120c7 Add kind attribute for arrays 
To distinguish array() and [] syntax. The pretty printer respects
this attribute. The shortArraySyntax pretty printer option acts as
a default in case the attribute is not specified.
 2016-03-09 21:31:54 +01:00
Nikita Popov
ae30f97af6 Add "kind" attribute to LNumbers 
Kind specifies whether the number was formatted as decimal, octal,
binary or hex. The pretty printer reproduces the number kind (but
not necessarily the exact formatting).
 2016-03-09 21:10:55 +01:00
Nikita Popov
47c342a3e4 Add "kind" attribute to Stmt\Exit_ 
Attribute specifies whether this is a "die" or an "exit" and the
pretty printer behaves accordingly.
 2016-03-09 20:20:36 +01:00
Nikita Popov
7eac2cfd8b Introduce Nop statement to collect dangling comments 
A Nop statement will be inserted into statement lists if there are
any trailing comments in the list (which would otherwise not be
associated with any node).

The pretty printer output currently still contains a superfluous
newline.
 2016-03-09 19:48:36 +01:00
Nikita Popov
a0c216bf4b Add dumpComments option to NodeDumper 
Adding this as an option to avoid breaking people's tests.

Some of the test results show pretty clearly that we are incorrectly
assigning the same comment multiple times for nested nodes (mentioned
in #36).
 2016-03-09 19:48:36 +01:00
Nikita Popov
9829bf69cd Fix issue #251 2016-02-28 20:28:32 +01:00
Nikita Popov
1fe8f09caa Fix __halt_compiler() pretty printing edge case 
We can't strip the <?php at the end of a __halt_compiler() segment
in file mode.

Fixed by being a bit more explicit in prettyPrintFile() about what
we want to do...
 2016-02-20 18:24:32 +01:00
Nikita Popov
65af37f7b0 Doc comment tweaks 2016-02-20 17:06:09 +01:00
Nikita Popov
d6361136e1 Update semi-reserved keyword list 
Magic constant names have been added after the PHP 7 release.

We do not support and likely will not support __halt_compiler here
due to lexer limitations.
 2016-02-09 13:30:39 +01:00
Nikita Popov
6dffb72ce0 Merge branch '1.x' 2016-01-15 22:02:35 +01:00
Nikita Popov
eb73441032 Support hashbang before namespace declaration 
Fixes issue #243.
 2016-01-15 22:01:51 +01:00
Jesse Schalken
5c2cc50455 Remove some more unecessary @property doc comments 2015-12-29 23:15:00 +11:00
Jesse Schalken
58eb1ea7c3 Remove some unecessary @property doc comments 2015-12-29 23:13:55 +11:00
Nikita Popov
719ca71d4a Distinguish declare(); and declare(){} 
It makes semantic difference and the latter form is actually
forbidden for strict_types.

This sets Declare->stmts to null for the body-less case.
 2015-12-07 12:12:00 +01:00
Nikita Popov
a9074c7444 Introduce Scalar\EncapsedStringPart 2015-12-03 22:55:07 +01:00
Nikita Popov
75cd4ab7a5 Use error_clear_last() on PHP 7 
Instead of the ugly undefined variable hack
 2015-11-21 22:27:56 +01:00
Nikita Popov
39a039fa42 Add option for short array syntax in pretty printer 2015-09-21 15:12:59 +08:00
Nikita Popov
eecaf1e93b Merge branch '1.x' 
Conflicts:
	grammar/rebuildParsers.php
	lib/PhpParser/Parser.php
 2015-09-19 22:07:29 +08:00
Nikita Popov
950ada4cba Fix issue #227 
Use \z instead of $.
 2015-09-19 22:05:23 +08:00
Nikita Popov
f57d217e91 Update group use support 
To conform with current PHP 7 implementation

* Allow use \Foo\{Bar};
* Disallow use Foo\{\Bar};
* Disallow missing trailing semicolon (that was a bug)
 2015-08-20 16:42:49 +02:00
Nikita Popov
2496cd38ad Various docs fixes 2015-07-14 21:11:54 +02:00
Nikita Popov
feb82eed33 Disable cloning in traverser by default 2015-07-14 17:39:56 +02:00
Nikita Popov
0ef15c111a Merge branch '1.x' 2015-07-14 17:08:28 +02:00
Nikita Popov
d341d94976 Add ClassLike::getMethod($name) 
To allow getting individual method with a given name.
 2015-07-14 17:07:45 +02:00
Nikita Popov
0265c28e6e Switch NameResolver resolve methods to be immutable 
To make it theoretically possible to expose this as API.

Add slice() method to Name to allow this. Deprecate existing mutable
Name APIs.
 2015-07-12 23:56:57 +02:00
Nikita Popov
5bd8cb84de Add dummy ParserFactory test 
:/
 2015-07-12 22:53:17 +02:00
Nikita Popov
ebeeae19a6 Merge branch '1.x' 2015-07-12 22:12:28 +02:00
Nikita Popov
5ede167835 Fix infinite recursion in Use builder __call 2015-07-12 22:11:43 +02:00
Nikita Popov
49324ea412 Drop default values from Scalar ctor params 2015-07-12 22:02:18 +02:00
Nikita Popov
21e51c8cf6 Add some tests for Multiple parser 2015-07-12 22:00:02 +02:00
Nikita Popov
e7a2abb03b Merge branch '1.x' 2015-07-11 22:33:19 +02:00
Nikita Popov
b862de1f5b Support properties in trait builder 2015-07-11 22:31:45 +02:00
Nikita Popov
8090531acd Fix pretty printing of const derefs for 5.x 
(FOO)[0] is only supported on 7.x
 2015-07-09 12:38:30 +02:00
Nikita Popov
1d62e9d8cc Fix implicit visibility for properties as well 
Also switch to using PPP mask.
 2015-07-05 20:17:52 +02:00
Lisachenko Alexander
e3195c246f Fix public modifier check for ClassMethod node 2015-07-05 20:17:50 +02:00
Nikita Popov
90ab32f046 Merge branch '1.x' 2015-07-05 20:16:41 +02:00
Nikita Popov
7434a682e5 Fix implicit visibility for properties as well 
Also switch to using PPP mask.
 2015-07-05 20:16:21 +02:00
Lisachenko Alexander
0fbb5f90a1 Fix public modifier check for ClassMethod node 2015-07-05 20:10:48 +02:00
Nikita Popov
f872fa9b0b Merge branch '1.x' 2015-07-04 14:40:53 +02:00
Nikita Popov
d5668f536d Fix __HALT_COMPILER_OFFSET__ support on HHVM 2015-07-04 13:15:48 +02:00
Nikita Popov
a5db176903 Merge branch '1.x' 2015-07-02 18:09:38 +02:00
Nikita Popov
42e368e964 Fix returnType typehints 
Fixes issues #207
 2015-07-02 18:06:41 +02:00
Nikita Popov
9c9a8cddce Merge branch '1.x' 2015-06-20 12:34:36 +02:00
Nikita Popov
fd7ee2e083 Add missing regex anchor 2015-06-20 12:34:10 +02:00
Nikita Popov
179d32cfaf Simplify handleHaltCompiler() implementation 
Nowadays we're already tracking the filePos, no need to
recompute it.
 2015-06-20 12:33:33 +02:00
Nikita Popov
f2b7a31509 Rename ParserInterface to Parser 
And drop the alias of Parser to Parser\Php5.
 2015-06-20 11:47:25 +02:00
Nikita Popov
813c9f1545 Add basic ParserFactory 2015-06-20 11:28:58 +02:00
Nikita Popov
ef9a154d09 Add support for unicode escape sequences 
Only parsed if the PHP 7 parser is used.
 2015-06-13 20:51:02 +02:00
Nikita Popov
0da72fad00 Support scalar type declarations 2015-06-13 20:16:09 +02:00
Nikita Popov
71fa7c6674 Support UVS in pretty printer 
Try to generate interoperable code where possible (but not
everything can be expressed in PHP 5).
 2015-06-13 20:01:01 +02:00
Nikita Popov
bc21514ecf Move token constants into separate class 
As these are shared between Php5 and Php7 parsers they should be
in some common place, otherwise we'd have to always reference either
one or the other.
 2015-06-13 18:39:55 +02:00
Nikita Popov
61e060694d Implement generalized yield operator 
And split tokens.y off, so I don't waste time debugging this again...
 2015-06-13 18:11:40 +02:00
Nikita Popov
602b9807eb Import some UVS tests 2015-06-13 15:42:09 +02:00
Nikita Popov
d18dcc0c7f Implement UVS 2015-06-13 14:59:24 +02:00
Nikita Popov
74c57eef0e Test PHP 5 and PHP 7 parsers 
At this point they should return the same result.
 2015-06-13 13:56:45 +02:00
Nikita Popov
fdbddc4b8c Add Multiple parser 2015-06-13 13:38:24 +02:00
Nikita Popov
ca3b44bf60 Fork separate PHP 7 parser 
Also add ParserInterface
 2015-06-13 13:09:34 +02:00
Nikita Popov
dca46febc9 Implement semi-reserved identifiers 2015-06-13 12:47:13 +02:00
Nikita Popov
1a1bd1448d Support mixed group use declarations 2015-06-13 11:27:38 +02:00
Nikita Popov
9620f79cdc Add partial group use support 
Supported via Stmt\GroupUse which has Name $prefix in addition to
the usual.

Still missing: Mixed group uses.
 2015-06-12 23:05:28 +02:00
Nikita Popov
583b560f71 Drop {@inheritDoc} 
Those are unnecessary and actually against the spec.
 2015-06-12 20:37:43 +02:00
Nikita Popov
db3dafd64d Merge branch '1.x' 2015-06-05 18:57:04 +02:00
Suralc
bb2c5303ae Add a FunctionLike interface to Methods, Functions and Closures. 
The elements listed above share common elements like parameters, possible return types and bodies.
 2015-06-05 18:56:25 +02:00
Nikita Popov
51ec2a25fe Move parser to Parser\Php5 
Old name still exists.
 2015-05-02 22:50:11 +02:00
Nikita Popov
5d1e3be7d4 Anonymize some callbacks 2015-05-02 22:35:15 +02:00
Nikita Popov
9d42e4a2e2 Drop short array simulation from .phpy syntax 
Instead use real short array syntax.
 2015-05-02 22:30:44 +02:00
Nikita Popov
cc75dd3612 Drop support for PHP 7 aliases 2015-05-02 22:21:12 +02:00
Nikita Popov
5f621c5adc Drop support for legacy aliases from v0.9 2015-05-02 22:19:25 +02:00
Nikita Popov
29b9015f51 Drop support for old Node format 2015-05-02 22:17:34 +02:00
Nikita Popov
e6619f5514 Drop 5.4 support from emulative lexer 2015-05-02 22:13:55 +02:00
Nikita Popov
8b64195cf2 Try .17G print if .16G is not enough 
This should be enough for all cases, because: A double has 53 bits
of mantissa (including the implicit 1 bit), which is 53*ln(2)/ln(10)
= 15.95 decimal digits. However the leading decimal digit may encode
less than the usual 3.32 bits, which will push this over the edge to
requiring 17 decimal digits.
 2015-05-02 11:48:55 +02:00
Nikita Popov
9caa51b3a5 Add some more tests 2015-05-01 20:18:04 +02:00
Nikita Popov
5513073a53 Drop Lexer::getPosition() 
This was a leftover from the original column info implementation.
 2015-05-01 20:18:01 +02:00
Nikita Popov
648800f07f Increase float pretty printing precision 
This removes the reliance on the "precision" ini setting.
Furthermore the default of precision=14 is not sufficient.
 2015-05-01 19:15:33 +02:00
Nikita Popov
57ac7e39bf Drop name magic from rebuildParser.php 
Now using explicitly imported names, instead of magically
prepending Name\.

Also remove trailing whitespace from generated file.
 2015-04-30 19:20:38 +02:00
Nikita Popov
3b7d8e8b5d Enable basic error recovery 
Adding only a single recovery rule for now.

The API is now:
 * throwOnError parser option must be disabled.
 * List of Errors is available through $parser->getErrors(). This
   method is available either way.
 * If no recovery is possible $parser->parse() will return null.
   (Obviously only if throwOnError is disabled).
 2015-04-30 17:41:57 +02:00
Nikita Popov
a35c2a2067 Add column info to EOF errors 
EOF errors are now located one past the end of the file.
 2015-04-27 15:37:41 +02:00
Nikita Popov
55b2ead967 Make special class name checks case insensitive 2015-04-26 23:13:27 +02:00
Nikita Popov
e1a0ec3724 Add support for anonymous classes 
Has not landed upstream yet, but syntax is unlikely to change.
 2015-04-26 23:04:31 +02:00
Nikita Popov
66896dbde6 Poison attribute initializations in parser 
Those should error if they end up being used.
 2015-04-26 22:32:18 +02:00
Nikita Popov
338bc1f8e7 Fix "print" pretty-printing 
Precedence was previously ignored.
 2015-04-26 11:56:04 +02:00
Nikita Popov
ab80054e97 Add support for "yield from" 2015-04-26 11:56:02 +02:00
Nikita Popov
a6d2cd69f8 Clarify attribute assignment code 
* Don't assign to attribute stack on reduce - why was that there
in the first place?
* Assign attributes to the position in the stack where the first
token of the production is, instead of one position earlier.
* Add a comment to clarify why we also assign attributes on read,
instead of just on shift.
 2015-04-26 11:56:01 +02:00
Nikita Popov
6996db1e3a Build node attributes inside semantic action methods 
Minor performance improvement for parsing, also allows to access
attributes with higher granulity in the parser, though this is not
currently done.

* #n can now be used to access the stack position of a token. $n
  is the same as $this->semStack[#n]. (Post-translate $n will
  actually be the stack position.)
* $attributeStack is now $this->startAttributeStack and
  $endAttributes is now $this->endAttributes.
* Attributes for a node are now computed inside the individual
  reduction methods, instead of being passed as a parameter.
  Accessible through the attributes() macro.
 2015-04-26 11:55:59 +02:00
Nikita Popov
7a40498cb4 Regenerate parser 
Also drop the error() parser macro.
 2015-04-19 18:12:56 +02:00
Nikita Popov
65f1adbe65 Merge primary error recovery code 
The grammar does not yet actually implement error recovery.
 2015-04-19 18:11:05 +02:00
Nikita Popov
c8454271e1 Make column info 1-based 2015-04-18 21:20:45 +02:00
Nikita Popov
62f83a0dc2 Add column info for non-syntax errors where relatively precise 
Should it also be added if only rough information is available? E.g.
spanning an entire class?
 2015-04-18 13:27:58 +02:00
Nikita Popov
611fa5c7f1 Test parser position information (syntax errors) 2015-04-18 13:27:57 +02:00
Nikita Popov
4defbc2174 Make Error column info attribute based 2015-04-18 12:51:26 +02:00
Gerrit Addiks
33a39fae06 added column-numbers to syntax errors 2015-04-18 10:14:49 +02:00
Nikita Popov
e4eab9ec0c Simplify code 
The new class couldn't already exist at that point - if it did, the
old name would have been aliased already and the autoloader wouldn't
trigger.
 2015-04-03 22:30:30 +02:00
Nikita Popov
6aaa87f143 Fix PHP 7 alias registration 
This fixes the case where the old name is used before the new one
is ever used, e.g. when manually constructing nodes, as opposed to
parsing them.

The previous approach would try to register the alias from OLD to
NEW. This would trigger autoloading on NEW and afterwards it would
register the alias from OLD to NEW. Afterwards the alias registration
which originally triggered the autoload would run, thus redeclaring
the class.

TL;DR aliases suck, closes #192.
 2015-04-03 22:22:39 +02:00
Markus Malkusch
8d18848fb0 Don't set unserialize_callback_func in Autoloader::register() as it has side effects even when the library is not used 2015-04-03 16:25:33 +02:00
Nikita Popov
805078e0a9 Add missing type hints 2015-03-28 18:14:24 +01:00
Nikita Popov
52dafafd10 Resolve param type hints earlier 
For convenience of concurrent visitors that want to perform
enterNode actions based on Stmt\Function_ etc.

Fixes #188.
 2015-03-25 20:57:39 +01:00
Nikita Popov
617bf0aa41 Fix registering of PHP 7 aliases 
The previous approach was causing issues, because "instanceof"
does not invoke the autoloader.
 2015-03-24 20:04:50 +01:00
Nikita Popov
dce19b074b Strict type compliance 
Were this library to be fully annotated with scalar types and
return types where possible and were strict types to be enabled
for all files, the test suite would now pass.
 2015-03-24 11:19:17 +01:00
Nikita Popov
cea0c4a9d6 Don't register aliases on PHP 7 2015-03-22 16:03:57 +01:00
Matthieu Napoli
729c7bde0c #184 Add a flag to NodeTraverser to avoid cloning nodes 2015-03-22 11:19:04 +13:00
Nikita Popov
8982315b4e Rename Cast\Object as well 
As it will very likely be soft-reserved in PHP 7.

Old alias is still available, as usual.
 2015-03-21 18:57:55 +01:00
Nikita Popov
0f556c16f5 Fix a few more Scalar\String_ occurances 
Totally forgot that the parser uses macros...
 2015-03-21 18:54:52 +01:00
Nikita Popov
7ec277e1e1 Replace another Scalar\String occurance 
Also canonicalize NameResover tests to avoid those pesky CRLF
issues.
 2015-03-21 18:47:20 +01:00
Nikita Popov
1a627872f0 Rename nodes for compat with PHP 7 
The old names will still be available on PHP 5.x.
 2015-03-20 21:49:38 +01:00
Nikita Popov
592836c4dc Add support for T_HASHBANG (HHVM) 2015-03-14 19:53:08 +01:00
Andreas Lutro
d225555830 Ensure compatibility with multiple autoloaders 
Running a .phar or regular PHP executable that requires and includes its own
version of php-parser will cause a "cannot redeclare class" error if said
executable also includes the autoloader of the current working directory.
 2015-03-13 23:54:32 +01:00
Nikita Popov
251e689283 Add support for spaceship operator (<=>) [PHP 7] 
Added as Expr\BinaryOp\Spaceship.
 2015-03-12 23:13:31 +01:00
Nikita Popov
01f4be6b4d Add support for null coalesce operator (??) [PHP 7] 
Added as Expr\BinaryOp\Coalesce.
 2015-03-12 22:45:56 +01:00
Nikita Popov
dc28449d81 Drop whitespace after ... varargs collection 
Also drop an obsolete pretty printer test.
 2015-03-12 22:19:34 +01:00
Nikita Popov
3ad0d4b310 Add support for return type declarations [PHP 7] 
This adds an additional "returnType" subnode to Stmt\Function_,
Stmt\ClassMethod and Expr\Closure, as well as the corresponding
support in the name resolver and pretty printer.
 2015-03-12 22:16:12 +01:00
Nikita Popov
0c34706799 Add "use" builder 2015-03-10 16:05:55 +01:00
Nikita Popov
f9fc2fc9ee Add support for global namespace in NS builder 
NULL argument can now be used to create a global namespace {} block.
 2015-03-10 15:28:19 +01:00
Nikita Popov
a2d7e8977a Use real properties for storing subnodes 
Instead of storing subnodes in a subNodes dictionary, they are
now stored as simple properties. This requires declarating the
properties, assigning them in the constructor, overriding
the getSubNodeNames() method and passing NULL to the first argument
of the NodeAbstract constructor.

[Deprecated: It's still possible to use the old mode of operation
for custom nodes by passing an array of subnodes to the constructor.]

The only behavior difference this should cause is that getSubNodeNames()
will always return the original subnode names and skip any additional
properties that were dynamically added. E.g. this means that the
"namespacedName" node added by the NameResolver visitor is not treated
as a subnode, but as a dynamic property instead.

This change improves performance and memory usage.
 2015-03-09 08:54:20 +01:00
Thomas Ruiz
73cace360d Implicit public should not generate as explicit public 2015-03-08 20:21:01 +01:00
Markus Staab
ce5c76d79b prevent a unnecessary concat 
analog to b7ffdbbb92
 2015-02-13 16:02:54 +01:00
Nikita Popov
b7ffdbbb92 Optimize node dumper 
For very deeply nested node trees this extra concatenation makes a
huge difference...
 2015-02-13 15:20:25 +01:00
Tom Rochette
1366e833a1 Move getMethods() to new ClassLike node 
Class_, Interface_ and Trait_ extend the ClassLike node, which
provides the getMethods() method.
 2015-01-31 22:59:38 +01:00
Nikita Popov
a710f32a6a Make Node\Expr\BinOp an abstract class 
Only the children should be used ...
 2015-01-18 00:10:02 +01:00
Nikita Popov
4071c4645d Add NodeTraverser::DONT_TRAVERSE_CHILDREN support 2015-01-11 22:13:58 +01:00
Nikita Popov
4cd2b95a23 Fix 5.3 build and some small cleanups 2014-12-19 18:54:56 +01:00
Nikita Popov
7ab88416ac Enforce Name|string for names in builders 
While array (with name components) could technically be allowed (as
they are supported by the Name node itself), more likely than not
an array would due to incorrect usage of the API (e.g. array instead
of variadics).
 2014-12-19 18:50:16 +01:00
Nikita Popov
ba625063e7 Support fully-qualified and ns-relative names in builders 2014-12-19 18:48:21 +01:00
Stepan Anchugov
01643e06d3 Add namespace builder 2014-12-19 18:19:33 +01:00
Nikita Popov
4387454fe0 Add trait builder (for completeness...) 2014-12-19 17:59:23 +01:00
Nikita Popov
55fdbc6dbc Extract common builder methods to abstract classes 
Declaration for fns/classes in general and FunctionLike for
functions/methods in particular.
 2014-12-19 17:47:51 +01:00
Nikita Popov
a7797918b8 Update lexer docs for attribute options 2014-12-19 00:37:37 +01:00
Nikita Popov
46975107a7 Support token position attributes in lexer 
Also change endFilePos semantics to refer to the last character that
is *included* in the token, rather than one past the last character.
This ensures that all end* attributes have the same semantics.
 2014-12-19 00:37:36 +01:00
Nikita Popov
2438848487 Add support for doc comments in builders 2014-12-13 13:44:40 +01:00
nikic
7c98ad6f9b Support file offsets in emulative lexer as well 
Also run normal lexer tests against emulative lexer and fix a bug
in __halt_compiler() handling found as a result.
 2014-11-27 20:57:38 +01:00
Máximo Cuadros Ortiz
d774dbc1b7 Add optional startFilePos and endFilePos attributes 
The lexer can now optionally add startFilePos and endFilePos
attributes, which are offsets in to the lexed code string.

The end offset currently points one past the last character of
the token - this is pending further discussion.

The attributes are not added by default and have to be enabled
using the new 'usedAttributes' lexer option:

	$lexer = new Lexer([
		'usedAttributes' => [
			'comments', 'startLine', 'endLine',
			'startFilePos', 'endFilePos'
		]
	]);
 2014-11-27 20:38:29 +01:00
nikic
e26e63e9b0 Error on final or abstract properties 2014-11-13 20:25:52 +01:00
nikic
0f69f12b94 Use "public" visibility when not explicitly given 
Fixes issue #143
 2014-11-13 20:21:21 +01:00
nikic
7fbdb79a08 Fix whitespace when printing trait alias modifiers 2014-11-03 16:16:15 +01:00
Arne Blankerts
6fad8ff32a Make NameResolver resolve trait alias and precedence names 2014-11-03 16:06:43 +01:00
nikic
99df8b86ae Support HHVM T_ONUMBER token 2014-09-30 20:55:58 +02:00
nikic
3d40e2217d Annotate some APIs as @internal 2014-09-30 20:26:06 +02:00
nikic
3e1665bbbd Disallow new without a class name 
Fixes #137.
 2014-09-28 12:41:35 +02:00
nikic
fd064dac6c Very that node type is valid in XML unserializer 2014-09-12 00:39:59 +02:00
nikic
d9bd550414 Fix XML unserializer 2014-09-12 00:37:21 +02:00
nikic
94eca2ce44 Remove deprecated Template and TemplateLoader 2014-09-12 00:25:30 +02:00
nikic
616be1d0fc Use emulative lexer for < 5.6RC1 
Earlier releases come with incorrect tokenizer data for T_POW and
T_POW_EQUAL.
 2014-08-31 16:33:41 +02:00
nikic
452e1c0180 Add constant dereferencing, a list-minute 5.6 change 2014-08-31 16:14:36 +02:00
nikic
6d0589d14f Ensure that special class names are unqualified 
Replicates the PHP error message
 2014-08-11 22:04:52 +02:00
nikic
ef121e690c Preserve case of "static" class name 2014-08-11 21:44:50 +02:00