Skip to content

Fix breakout level literal parsing #197

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
merged 1 commit into from
Sep 28, 2017
Merged

Fix breakout level literal parsing #197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 12 additions & 16 deletions src/DiagnosticsProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,23 +94,19 @@ public static function checkDiagnostics($node) {
$breakoutLevel = $breakoutLevel->expression;
}

if ($breakoutLevel instanceof Node\Expression\NumericLiteral) {
if (
$breakoutLevel instanceof Node\NumericLiteral
&& $breakoutLevel->children->kind === TokenKind::IntegerLiteralToken
) {
$literalString = $breakoutLevel->getText();
if (
$breakoutLevel->children->kind === TokenKind::BinaryLiteralToken
&& \bindec(\substr($literalString, 2)) > 0
) {
return null;
$firstTwoChars = \substr($literalString, 0, 2);

if ($firstTwoChars === '0b' || $firstTwoChars === '0B') {
if (\bindec(\substr($literalString, 2)) > 0) {
return null;
}
}
else if (
\in_array($breakoutLevel->children->kind, [
TokenKind::DecimalLiteralToken,
TokenKind::HexadecimalLiteralToken,
TokenKind::OctalLiteralToken,
TokenKind::IntegerLiteralToken
])
&& \intval($literalString, 0) > 0
) {
else if (\intval($literalString, 0) > 0) {
return null;
}
}
Expand All @@ -125,7 +121,7 @@ public static function checkDiagnostics($node) {

return new Diagnostic(
DiagnosticKind::Error,
"Expected positive integer literal.",
"Positive integer literal expected.",
$start,
$end - $start
);
Expand Down