danog/PHP-Parser
1
0
Fork 0
mirror of https://github.com/danog/PHP-Parser.git synced 2024-12-15 19:07:06 +01:00
Code Issues Projects Releases Wiki Activity
1,029 Commits 9 Branches 70 Tags 6.2 MiB
83b958763f
Commit Graph

443 Commits

Author SHA1 Message Date
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
Elliot Levin
c0340053d1 Fix case sensitivity for special class names 2014-08-11 21:41:54 +02:00
Yuriy Vilks
39f323b5ad Fix classname of Class_ in docblock of BuilderFactory 2014-08-11 20:53:18 +02:00
nikic
1f143393e5 Rewrite namespace handling code 
Add a check for disallowed statements between braced namespaces
while at it.
 2014-04-21 15:16:00 +02:00
nikic
6d1f77132c Move Stmt\Namespace_::postprocess() to parser 2014-04-21 12:30:55 +02:00
nikic
2e195d7cb2 Make sure that pretty printer preserves whitespace after <?php 2014-04-21 11:15:33 +02:00
nikic
947a897238 Make names in the parser more descriptive 
And improve the code a tad bit in general.

I left YY2TBLSTATES and YYNLSTATES around, because I don't fully
understand their role in the action double indexing.
 2014-04-20 23:05:51 +02:00
nikic
1edbc89749 Use normal properties instead of static ones 2014-04-20 00:34:31 +02:00
nikic
0faa844a75 Separate parser code from generated data 2014-04-20 00:19:35 +02:00
nikic
4743e9b0b8 Update constant scalar expression support 2014-04-19 22:53:13 +02:00
nikic
e4e56511b9 Merge branch '0.9' 2014-04-19 22:26:35 +02:00
Nikita Popov
c341ab2ecf Make autoloader for new names PSR-0 compliant 2014-04-02 09:44:45 +02:00
nikic
c62ffedfca Require file only if file exists 
Allows usage of class_exists() on undefined classes.
 2014-03-27 15:40:08 +01:00
nikic
4c06b0919a Merge branch '0.9' 
Conflicts:
	lib/PhpParser/Template.php
	lib/PhpParser/TemplateLoader.php
 2014-03-27 12:53:24 +01:00
Martin Hasoň
2605b8319e Added support for autoload $prepend 2014-03-27 12:39:30 +01:00
nikic
91f6880734 Improve pretty printing of empty statement lists 
The pStmts() method now also includes the leading \n, however only
if the statement list is non-empty.
 2014-03-27 12:31:21 +01:00
nikic
b3332184cf Minor cleanups to emulative lexer 
Be consistent about version numbers. We'll only emulate until
beta1 of a release, as that's the feature freeze release.
 2014-03-27 00:01:39 +01:00
nikic
1cb6e1407c Fix ** emulation wrt comments 2014-03-26 23:41:06 +01:00
nikic
a5e0bbcb62 Support use function/const in name resolver 2014-03-26 23:28:32 +01:00
nikic
3b7829b011 Add support for function and constant import (PHP 5.6) 2014-03-26 22:33:45 +01:00
nikic
bea89a0bf2 Add support for constant scalar expressions (PHP 5.6) 2014-03-26 21:48:12 +01:00
nikic
cda6f575f0 Add support for pow operator (PHP 5.6) 2014-03-26 19:18:16 +01:00
nikic
b5bcfa1168 Add support for argument unpacking (PHP 5.6) 2014-03-26 18:42:46 +01:00
nikic
96f1151ab2 Add support for variadic parameters (PHP 5.6) 2014-03-26 18:23:30 +01:00
nikic
f5be0d30f7 Guarantee that subnodes are always in the right order 2014-03-22 14:49:56 +01:00
Tomáš Polomský
c8c233f900 Correctly pretty print negative floats 2014-03-22 14:24:35 +01:00
nikic
8c59f41d02 Remove inline Name[] creations 
This ensures that the attributes on the Name nodes are correct.
 2014-03-22 14:24:33 +01:00
nikic
70077039b4 Add Scalar\MagicConst->getName() 
Return magic constant name, e.g. __CLASS__.

Resolves #95.
 2014-02-21 18:16:18 +01:00
nikic
1c8481bff6 Merge branch '0.9' 
Conflicts:
	lib/PhpParser/Lexer.php
	lib/PhpParser/Node/Stmt/Class.php
	lib/PhpParser/Node/Stmt/ClassMethod.php
	lib/PhpParser/Node/Stmt/Interface.php
	lib/PhpParser/Node/Stmt/Namespace.php
	lib/PhpParser/Node/Stmt/UseUse.php
	lib/PhpParser/Parser.php
 2014-02-12 20:23:12 +01:00
nikic
523e024ba0 Fix a number of other typos 2014-02-12 17:47:34 +01:00
nikic
f82862ec9c Port library to use namespaces, with BC for old names 2014-02-06 20:29:35 +01:00