Merge branch '3.4' into 4.4

fabpot · fabpot · commit 208ceff59b98 · 2020-03-15T11:05:03.000+01:00
* 3.4:
  Add missing dots at the end of exception messages
diff --git a/Lexer.php b/Lexer.php
@@ -59,12 +59,12 @@ public function tokenize($expression)
             } elseif (false !== strpos(')]}', $expression[$cursor])) {
                 // closing bracket
                 if (empty($brackets)) {
-                    throw new SyntaxError(sprintf('Unexpected "%s"', $expression[$cursor]), $cursor, $expression);
+                    throw new SyntaxError(sprintf('Unexpected "%s".', $expression[$cursor]), $cursor, $expression);
                 }
 
                 list($expect, $cur) = array_pop($brackets);
                 if ($expression[$cursor] != strtr($expect, '([{', ')]}')) {
-                    throw new SyntaxError(sprintf('Unclosed "%s"', $expect), $cur, $expression);
+                    throw new SyntaxError(sprintf('Unclosed "%s".', $expect), $cur, $expression);
                 }
 
                 $tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1);
@@ -87,15 +87,15 @@ public function tokenize($expression)
                 $cursor += \strlen($match[0]);
             } else {
                 // unlexable
-                throw new SyntaxError(sprintf('Unexpected character "%s"', $expression[$cursor]), $cursor, $expression);
+                throw new SyntaxError(sprintf('Unexpected character "%s".', $expression[$cursor]), $cursor, $expression);
             }
         }
 
         $tokens[] = new Token(Token::EOF_TYPE, null, $cursor + 1);
 
         if (!empty($brackets)) {
             list($expect, $cur) = array_pop($brackets);
-            throw new SyntaxError(sprintf('Unclosed "%s"', $expect), $cur, $expression);
+            throw new SyntaxError(sprintf('Unclosed "%s".', $expect), $cur, $expression);
         }
 
         return new TokenStream($tokens, $expression);
diff --git a/Node/BinaryNode.php b/Node/BinaryNode.php
@@ -148,13 +148,13 @@ public function evaluate($functions, $values)
                 return $left * $right;
             case '/':
                 if (0 == $right) {
-                    throw new \DivisionByZeroError('Division by zero');
+                    throw new \DivisionByZeroError('Division by zero.');
                 }
 
                 return $left / $right;
             case '%':
                 if (0 == $right) {
-                    throw new \DivisionByZeroError('Modulo by zero');
+                    throw new \DivisionByZeroError('Modulo by zero.');
                 }
 
                 return $left % $right;
diff --git a/Parser.php b/Parser.php
@@ -98,7 +98,7 @@ public function parse(TokenStream $stream, $names = [])
 
         $node = $this->parseExpression();
         if (!$stream->isEOF()) {
-            throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s"', $stream->current->type, $stream->current->value), $stream->current->cursor, $stream->getExpression());
+            throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s".', $stream->current->type, $stream->current->value), $stream->current->cursor, $stream->getExpression());
         }
 
         return $node;
@@ -194,13 +194,13 @@ public function parsePrimaryExpression()
                     default:
                         if ('(' === $this->stream->current->value) {
                             if (false === isset($this->functions[$token->value])) {
-                                throw new SyntaxError(sprintf('The function "%s" does not exist', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, array_keys($this->functions));
+                                throw new SyntaxError(sprintf('The function "%s" does not exist.', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, array_keys($this->functions));
                             }
 
                             $node = new Node\FunctionNode($token->value, $this->parseArguments());
                         } else {
                             if (!\in_array($token->value, $this->names, true)) {
-                                throw new SyntaxError(sprintf('Variable "%s" is not valid', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, $this->names);
+                                throw new SyntaxError(sprintf('Variable "%s" is not valid.', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, $this->names);
                             }
 
                             // is the name used in the compiled code different
@@ -226,7 +226,7 @@ public function parsePrimaryExpression()
                 } elseif ($token->test(Token::PUNCTUATION_TYPE, '{')) {
                     $node = $this->parseHashExpression();
                 } else {
-                    throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s"', $token->type, $token->value), $token->cursor, $this->stream->getExpression());
+                    throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s".', $token->type, $token->value), $token->cursor, $this->stream->getExpression());
                 }
         }
 
@@ -288,7 +288,7 @@ public function parseHashExpression()
             } else {
                 $current = $this->stream->current;
 
-                throw new SyntaxError(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s"', $current->type, $current->value), $current->cursor, $this->stream->getExpression());
+                throw new SyntaxError(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s".', $current->type, $current->value), $current->cursor, $this->stream->getExpression());
             }
 
             $this->stream->expect(Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
@@ -326,7 +326,7 @@ public function parsePostfixExpression($node)
                     // As a result, if $token is NOT an operator OR $token->value is NOT a valid property or method name, an exception shall be thrown.
                     (Token::OPERATOR_TYPE !== $token->type || !preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A', $token->value))
                 ) {
-                    throw new SyntaxError('Expected name', $token->cursor, $this->stream->getExpression());
+                    throw new SyntaxError('Expected name.', $token->cursor, $this->stream->getExpression());
                 }
 
                 $arg = new Node\ConstantNode($token->value, true);
diff --git a/SyntaxError.php b/SyntaxError.php
@@ -15,7 +15,7 @@ class SyntaxError extends \LogicException
 {
     public function __construct(string $message, int $cursor = 0, string $expression = '', string $subject = null, array $proposals = null)
     {
-        $message = sprintf('%s around position %d', $message, $cursor);
+        $message = sprintf('%s around position %d', rtrim($message, '.'), $cursor);
         if ($expression) {
             $message = sprintf('%s for expression `%s`', $message, $expression);
         }
diff --git a/TokenStream.php b/TokenStream.php
@@ -49,7 +49,7 @@ public function next()
         ++$this->position;
 
         if (!isset($this->tokens[$this->position])) {
-            throw new SyntaxError('Unexpected end of expression', $this->current->cursor, $this->expression);
+            throw new SyntaxError('Unexpected end of expression.', $this->current->cursor, $this->expression);
         }
 
         $this->current = $this->tokens[$this->position];
@@ -66,7 +66,7 @@ public function expect($type, $value = null, $message = null)
     {
         $token = $this->current;
         if (!$token->test($type, $value)) {
-            throw new SyntaxError(sprintf('%sUnexpected token "%s" of value "%s" ("%s" expected%s)', $message ? $message.'. ' : '', $token->type, $token->value, $type, $value ? sprintf(' with value "%s"', $value) : ''), $token->cursor, $this->expression);
+            throw new SyntaxError(sprintf('%sUnexpected token "%s" of value "%s" ("%s" expected%s).', $message ? $message.'. ' : '', $token->type, $token->value, $type, $value ? sprintf(' with value "%s"', $value) : ''), $token->cursor, $this->expression);
         }
         $this->next();
     }

Original file line number	Diff line number	Diff line change
`@@ -59,12 +59,12 @@ public function tokenize($expression)`
`59`	`59`	`} elseif (false !== strpos(')]}', $expression[$cursor])) {`
`60`	`60`	`// closing bracket`
`61`	`61`	`if (empty($brackets)) {`
`62`		`- throw new SyntaxError(sprintf('Unexpected "%s"', $expression[$cursor]), $cursor, $expression);`
	`62`	`+ throw new SyntaxError(sprintf('Unexpected "%s".', $expression[$cursor]), $cursor, $expression);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`list($expect, $cur) = array_pop($brackets);`
`66`	`66`	`if ($expression[$cursor] != strtr($expect, '([{', ')]}')) {`
`67`		`- throw new SyntaxError(sprintf('Unclosed "%s"', $expect), $cur, $expression);`
	`67`	`+ throw new SyntaxError(sprintf('Unclosed "%s".', $expect), $cur, $expression);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`$tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1);`
`@@ -87,15 +87,15 @@ public function tokenize($expression)`
`87`	`87`	`$cursor += \strlen($match[0]);`
`88`	`88`	`} else {`
`89`	`89`	`// unlexable`
`90`		`- throw new SyntaxError(sprintf('Unexpected character "%s"', $expression[$cursor]), $cursor, $expression);`
	`90`	`+ throw new SyntaxError(sprintf('Unexpected character "%s".', $expression[$cursor]), $cursor, $expression);`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`$tokens[] = new Token(Token::EOF_TYPE, null, $cursor + 1);`
`95`	`95`
`96`	`96`	`if (!empty($brackets)) {`
`97`	`97`	`list($expect, $cur) = array_pop($brackets);`
`98`		`- throw new SyntaxError(sprintf('Unclosed "%s"', $expect), $cur, $expression);`
	`98`	`+ throw new SyntaxError(sprintf('Unclosed "%s".', $expect), $cur, $expression);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`return new TokenStream($tokens, $expression);`
Original file line number	Diff line number	Diff line change
`@@ -148,13 +148,13 @@ public function evaluate($functions, $values)`
`148`	`148`	`return $left * $right;`
`149`	`149`	`case '/':`
`150`	`150`	`if (0 == $right) {`
`151`		`- throw new \DivisionByZeroError('Division by zero');`
	`151`	`+ throw new \DivisionByZeroError('Division by zero.');`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`return $left / $right;`
`155`	`155`	`case '%':`
`156`	`156`	`if (0 == $right) {`
`157`		`- throw new \DivisionByZeroError('Modulo by zero');`
	`157`	`+ throw new \DivisionByZeroError('Modulo by zero.');`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`return $left % $right;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class SyntaxError extends \LogicException`
`15`	`15`	`{`
`16`	`16`	`public function __construct(string $message, int $cursor = 0, string $expression = '', string $subject = null, array $proposals = null)`
`17`	`17`	`{`
`18`		`- $message = sprintf('%s around position %d', $message, $cursor);`
	`18`	`+ $message = sprintf('%s around position %d', rtrim($message, '.'), $cursor);`
`19`	`19`	`if ($expression) {`
`20`	`20`	$message = sprintf('%s for expression `%s`', $message, $expression);
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function next()`
`49`	`49`	`++$this->position;`
`50`	`50`
`51`	`51`	`if (!isset($this->tokens[$this->position])) {`
`52`		`- throw new SyntaxError('Unexpected end of expression', $this->current->cursor, $this->expression);`
	`52`	`+ throw new SyntaxError('Unexpected end of expression.', $this->current->cursor, $this->expression);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`$this->current = $this->tokens[$this->position];`
`@@ -66,7 +66,7 @@ public function expect($type, $value = null, $message = null)`
`66`	`66`	`{`
`67`	`67`	`$token = $this->current;`
`68`	`68`	`if (!$token->test($type, $value)) {`
`69`		`- throw new SyntaxError(sprintf('%sUnexpected token "%s" of value "%s" ("%s" expected%s)', $message ? $message.'. ' : '', $token->type, $token->value, $type, $value ? sprintf(' with value "%s"', $value) : ''), $token->cursor, $this->expression);`
	`69`	`+ throw new SyntaxError(sprintf('%sUnexpected token "%s" of value "%s" ("%s" expected%s).', $message ? $message.'. ' : '', $token->type, $token->value, $type, $value ? sprintf(' with value "%s"', $value) : ''), $token->cursor, $this->expression);`
`70`	`70`	`}`
`71`	`71`	`$this->next();`
`72`	`72`	`}`