kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Adjust precedence of in.

Browse Source
This commit is contained in:
Stephen Chung 2020-10-13 16:01:42 +08:00
parent 9dceeaf114
commit 13c4d0bbb3
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASES.md
View File

@ -20,7 +20,7 @@ Breaking changes
* New reserved symbols: `++`, `--`, `..`, `...`. * New reserved symbols: `++`, `--`, `..`, `...`.
* Callback signature for custom syntax implementation function is changed to allow for more flexibility. * Callback signature for custom syntax implementation function is changed to allow for more flexibility.
* Default call stack depth for `debug` builds is reduced to 12 (from 16). * Default call stack depth for `debug` builds is reduced to 12 (from 16).
* Precedence for `~` and `%` is raised. * Precedence for `~` is raised, while `in` is moved below logic comparison operators.
New features New features
------------ ------------

16
doc/src/engine/custom-op.md
View File

@ -84,7 +84,11 @@ Operator Precedence
All operators in Rhai has a _precedence_ indicating how tightly they bind. All operators in Rhai has a _precedence_ indicating how tightly they bind.
The following _precedence table_ show the built-in precedence of standard Rhai operators: A higher precedence binds more tightly than a lower precedence, so `*` and `/` binds before `+` and `-` etc.
When registering a custom operator, the operator's precedence must also be provided.
The following _precedence table_ shows the built-in precedence of standard Rhai operators:
| Category | Operators | Precedence (0-255) | | Category | Operators | Precedence (0-255) |
| ------------------- | :-------------------------------------------------------------------------------------: | :----------------: | | ------------------- | :-------------------------------------------------------------------------------------: | :----------------: |
@ -92,15 +96,11 @@ The following _precedence table_ show the built-in precedence of standard Rhai o
| Logic and bit masks | <code>\|\|</code>, <code>\|</code>, `^` | 30 | | Logic and bit masks | <code>\|\|</code>, <code>\|</code>, `^` | 30 |
| Logic and bit masks | `&`, `&&` | 60 | | Logic and bit masks | `&`, `&&` | 60 |
| Comparisons | `==`, `!=` | 90 | | Comparisons | `==`, `!=` | 90 |
| Comparisons | `>`, `>=`, `<`, `<=` | 110 | | | `in` | 110 |
| | `in` | 130 | | Comparisons | `>`, `>=`, `<`, `<=` | 130 |
| Arithmetic | `+`, `-` | 150 | | Arithmetic | `+`, `-` | 150 |
| Arithmetic | `*`, `/`, `%` | 180 | | Arithmetic | `*`, `/`, `%` | 180 |
| Arithmetic | `~` | 190 | | Arithmetic | `~` | 190 |
| Bit-shifts | `<<`, `>>` | 210 | | Bit-shifts | `<<`, `>>` | 210 |
| Object | `.` _(binds to right)_ | 240 | | Object | `.` _(binds to right)_ | 240 |
| _Others_ | | 0 | | Unary operators | unary `+`, `-`, `!` _(binds to right)_ | 255 |
A higher precedence binds more tightly than a lower precedence, so `*` and `/` binds before `+` and `-` etc.
When registering a custom operator, the operator's precedence must also be provided.

4
src/token.rs
View File

@ -617,9 +617,9 @@ impl Token {
EqualsTo | NotEqualsTo => 90, EqualsTo | NotEqualsTo => 90,
LessThan | LessThanEqualsTo | GreaterThan | GreaterThanEqualsTo => 110, In => 110,
In => 130, LessThan | LessThanEqualsTo | GreaterThan | GreaterThanEqualsTo => 10,
Plus | Minus => 150, Plus | Minus => 150,