Details

Reviewers

Group Reviewers

Commits

rPHUdc0626970a6d: Don't eat whitespace after T_OPEN_TAG

Summary

Currently the scanner eats whitespace after <?php but not after <?. This means that <?php tokenises to T_OPEN_TAG (see https://secure.phabricator.com/xhpast/view/853/) whereas <? tokenises to T_OPEN_TAG, T_WHITESPACE (see https://secure.phabricator.com/xhpast/view/854/).

Test Plan

Before	After

Diff Detail

Repository

rPHU libphutil

Branch

master

Lint

Lint Passed

Unit

Tests Passed

Build Status

Buildable 7621
Build 8282: [Placeholder Plan] Wait for 30 Seconds
Build 8280: arc lint + arc unit

Event Timeline

joshuaspence updated this revision to Diff 33533.Aug 13 2015, 10:20 PM

joshuaspence retitled this revision from to Don't eat whitespace after T_OPEN_TAG.

joshuaspence updated this object.

joshuaspence edited the test plan for this revision. (Show Details)

joshuaspence added a reviewer: epriestley.

Herald added a reviewer: Blessed Reviewers. · View Herald TranscriptAug 13 2015, 10:20 PM

Herald added a subscriber: Korvin. · View Herald Transcript

joshuaspence added a child revision: D13534: Add a linter rule for newlines after PHP open tags.Aug 13 2015, 10:21 PM

Fix unit tests

Does this parse this input:

<?phpnot

...as containing a T_OPEN_TAG? It should not, since PHP will only recognize <?php as a T_OPEN_TAG if it is followed by whitespace.

This revision now requires changes to proceed.Aug 27 2015, 11:44 AM

That is, with short_open_tag=1, this is a PHP script which prints "2":

<?echo 1+1;

While this is just a block of T_INLINE_HTML and prints the file content literally:

<?phpecho 1+1;

Hmm, it looks like <?phpecho 1+1; is a syntax error according to the current XHPAST:

> echo '<?phpecho 1+1;' | ./support/xhpast/xhpast 
XHPAST Parse Error: syntax error, unexpected T_LNUMBER on line 1

Use a lookahead

Forgot generated files

joshuaspence edited the test plan for this revision. (Show Details)Aug 29 2015, 12:31 AM

In D13890#153774, @joshuaspence wrote:
Hmm, it looks like <?phpecho 1+1; is a syntax error according to the current XHPAST:
> echo '<?phpecho 1+1;' | ./support/xhpast/xhpast 
XHPAST Parse Error: syntax error, unexpected T_LNUMBER on line 1

Filed T9286 for this.

Rebase

epriestley accepted this revision.Aug 30 2015, 12:37 PM

epriestley edited edge metadata.

This revision is now accepted and ready to land.Aug 30 2015, 12:37 PM

Closed by commit rPHUdc0626970a6d: Don't eat whitespace after T_OPEN_TAG (authored by joshuaspence, committed by joshuaspence). · Explain WhyAug 30 2015, 8:50 PM

This revision was automatically updated to reflect the committed changes.

Don't eat whitespace after T_OPEN_TAG
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 33535

src/parser/xhpast/tests/data/base-pass.php.expect

src/parser/xhpast/tests/data/php-access-on-instanciation.expect

src/parser/xhpast/tests/data/php-array-dereference-2.expect

src/parser/xhpast/tests/data/php-array-dereference-3.expect

src/parser/xhpast/tests/data/php-array-dereference.expect

src/parser/xhpast/tests/data/php-binary-literal.php.expect

src/parser/xhpast/tests/data/php-callable-typehint.php.expect

src/parser/xhpast/tests/data/php-comments.php.expect

src/parser/xhpast/tests/data/php-empty-heredoc.php.expect

src/parser/xhpast/tests/data/php-finally.php.expect

src/parser/xhpast/tests/data/php-literal-index.php.expect

src/parser/xhpast/tests/data/php-literals.php.expect

src/parser/xhpast/tests/data/php-short-array.php.expect

src/parser/xhpast/tests/data/php-syntax.php.expect

src/parser/xhpast/tests/data/php-tags.php.expect

src/parser/xhpast/tests/data/php-traits.php.expect

src/parser/xhpast/tests/data/php-yield.php.expect

src/parser/xhpast/bin/PhutilXHPASTBinary.php

support/xhpast/scanner.l

support/xhpast/scanner.lex.hpp

support/xhpast/scanner.lex.cpp

support/xhpast/xhpast.cpp

Don't eat whitespace after T_OPEN_TAGClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 33535

src/parser/xhpast/__tests__/data/base-pass.php.expect

src/parser/xhpast/__tests__/data/php-access-on-instanciation.expect

src/parser/xhpast/__tests__/data/php-array-dereference-2.expect

src/parser/xhpast/__tests__/data/php-array-dereference-3.expect

src/parser/xhpast/__tests__/data/php-array-dereference.expect

src/parser/xhpast/__tests__/data/php-binary-literal.php.expect

src/parser/xhpast/__tests__/data/php-callable-typehint.php.expect

src/parser/xhpast/__tests__/data/php-comments.php.expect

src/parser/xhpast/__tests__/data/php-empty-heredoc.php.expect

src/parser/xhpast/__tests__/data/php-finally.php.expect

src/parser/xhpast/__tests__/data/php-literal-index.php.expect

src/parser/xhpast/__tests__/data/php-literals.php.expect

src/parser/xhpast/__tests__/data/php-short-array.php.expect

src/parser/xhpast/__tests__/data/php-syntax.php.expect

src/parser/xhpast/__tests__/data/php-tags.php.expect

src/parser/xhpast/__tests__/data/php-traits.php.expect

src/parser/xhpast/__tests__/data/php-yield.php.expect

src/parser/xhpast/bin/PhutilXHPASTBinary.php

support/xhpast/scanner.l

support/xhpast/scanner.lex.hpp

support/xhpast/scanner.lex.cpp

support/xhpast/xhpast.cpp

Don't eat whitespace after T_OPEN_TAG
ClosedPublic
Actions

Revision Contents
Changeset List

src/parser/xhpast/tests/data/base-pass.php.expect

src/parser/xhpast/tests/data/php-access-on-instanciation.expect

src/parser/xhpast/tests/data/php-array-dereference-2.expect

src/parser/xhpast/tests/data/php-array-dereference-3.expect

src/parser/xhpast/tests/data/php-array-dereference.expect

src/parser/xhpast/tests/data/php-binary-literal.php.expect

src/parser/xhpast/tests/data/php-callable-typehint.php.expect

src/parser/xhpast/tests/data/php-comments.php.expect

src/parser/xhpast/tests/data/php-empty-heredoc.php.expect

src/parser/xhpast/tests/data/php-finally.php.expect

src/parser/xhpast/tests/data/php-literal-index.php.expect

src/parser/xhpast/tests/data/php-literals.php.expect

src/parser/xhpast/tests/data/php-short-array.php.expect

src/parser/xhpast/tests/data/php-syntax.php.expect

src/parser/xhpast/tests/data/php-tags.php.expect

src/parser/xhpast/tests/data/php-traits.php.expect

src/parser/xhpast/tests/data/php-yield.php.expect