diff --git a/doc/Expr.adoc b/doc/Expr.adoc index 9bf5ead..9f80c15 100644 --- a/doc/Expr.adoc +++ b/doc/Expr.adoc @@ -439,8 +439,8 @@ _non-empty-list_ = "**[**" _any-value_ {"**,**" _any-value_} "**]**" + | [blue]`+` | _Join_ | Joins two lists | [blue]`[1,2] + [3]` -> _[1,2,3]_ | [blue]`-` | _Difference_ | Left list without elements in the right list | [blue]`[1,2,3] - [2]` -> _[1,3]_ -| [blue]`>>` | _Front insertion_ | Insert an item in front | [blue]`0 >> [1,2]` -> _[0,1,2]_ -| [blue]`<<` | _Back insertion_ | Insert an item at end | [blue]`[1,2] << 3` -> _[1,2,3]_ +| [blue]`+>` | _Front insertion_ | Insert an item in front | [blue]`0 +> [1,2]` -> _[0,1,2]_ +| [blue]`<+` | _Back insertion_ | Insert an item at end | [blue]`[1,2] <+ 3` -> _[1,2,3]_ | [blue]`[]` | _Item at index_ | Item at given position | [blue]`[1,2,3][1]` -> _2_ | [blue]`in` | _Item in list_ | True if item is in list | [blue]`2 in [1,2,3]` -> _true_ + [blue]`6 in [1,2,3]` -> _false_ @@ -735,7 +735,7 @@ NOTE: These operators have a high priority, in particular higher than the operat The table below shows all supported operators by decreasing priorities. .Operators priorities -[cols="^2,^2,^2,^5,^6"] +[cols="^3,^2,^2,^5,^6"] |=== | Priority | Operators | Position | Operation | Operands and results @@ -765,9 +765,9 @@ The table below shows all supported operators by decreasing priorities. | [blue]`+` | _Infix_ | _Dict-join_ | _dict_ `+` _dict_ -> _dict_ | [blue]`-` | _Infix_ | _Subtraction_ | _number_ `-` _number_ -> _number_ | [blue]`-` | _Infix_ | _List-difference_ | _list_ `-` _list_ -> _list_ -.3+|*BINARY*| [blue]`&` | _Infix_ | _Binary And_ | _number_ `&` _number_ -> _number_ -| [blue]`\|` | _Infix_ | _Binary Or_ | _number_ `\|` _number_ -> _number_ -| [blue]`~` | _Prefix_ | _Binary Not_ | `~` _number_ -> _number_ +.1+|*BINARY NOT*| [blue]`~` | _Prefix_ | _Binary Not_ | `~` _number_ -> _number_ +.1+|*BINARY AND*| [blue]`&` | _Infix_ | _Binary And_ | _number_ `&` _number_ -> _number_ +.1+|*BINARY OR*| [blue]`\|` | _Infix_ | _Binary Or_ | _number_ `\|` _number_ -> _number_ .8+|*RELATION*| [blue]`<` | _Infix_ | _Less_ | _comparable_ `<` _comparable_ -> _boolean_ | [blue]`\<=` | _Infix_ | _less-equal_ | _comparable_ `\<=` _comparable_ -> _boolean_ | [blue]`>` | _Infix_ | _Greater_ | _comparable_ `>` _comparable_ -> _boolean_ @@ -776,11 +776,13 @@ The table below shows all supported operators by decreasing priorities. | [blue]`!=` | _Infix_ | _Not-equal_ | _comparable_ `!=` _comparable_ -> _boolean_ | [blue]`in` | _Infix_ | _Member-of-list_ | _any_ `in` _list_ -> _boolean_ | [blue]`in` | _Infix_ | _Key-of-dict_ | _any_ `in` _dict_ -> _boolean_ -.1+|*NOT*| [blue]`not` | _Prefix_ | _Not_ | `not` _boolean_ -> _boolean_ -.2+|*AND*| [blue]`and` | _Infix_ | _And_ | _boolean_ `and` _boolean_ -> _boolean_ +.1+|*LOGIC NOT*| [blue]`not` | _Prefix_ | _Not_ | `not` _boolean_ -> _boolean_ +.2+|*LOGIC AND*| [blue]`and` | _Infix_ | _And_ | _boolean_ `and` _boolean_ -> _boolean_ | [blue]`&&` | _Infix_ | _And_ | _boolean_ `&&` _boolean_ -> _boolean_ -.2+|*OR*| [blue]`or` | _Infix_ | _Or_ | _boolean_ `or` _boolean_ -> _boolean_ +.2+|*LOGIC OR*| [blue]`or` | _Infix_ | _Or_ | _boolean_ `or` _boolean_ -> _boolean_ | [blue]`\|\|` | _Infix_ | _Or_ | _boolean_ `\|\|` _boolean_ -> _boolean_ +.2+|*INSERT*| [blue]`+>` | _Infix_ | _Prepend_ | _any_ `+>` _list_ -> _list_ +| [blue]`<+` | _Infix_ | _Append_ | _list_ `<+` _any_ -> _list_ .3+|*ASSIGN*| [blue]`=` | _Infix_ | _Assignment_ | _identifier_ `=` _any_ -> _any_ | [blue]`>>` | _Infix_ | _Front-insert_ | _any_ `>>` _list_ -> _list_ | [blue]`<<` | _Infix_ | _Back-insert_ | _list_ `<<` _any_ -> _list_ diff --git a/doc/Expr.html b/doc/Expr.html index d52e783..ed7ca58 100644 --- a/doc/Expr.html +++ b/doc/Expr.html @@ -1380,16 +1380,16 @@ dev-expr -- Expressions calculator v1.10.0

[1,2,3] - [2] → [1,3]

-

>>

+

+>

Front insertion

Insert an item in front

-

0 >> [1,2] → [0,1,2]

+

0 +> [1,2] → [0,1,2]

-

<<

+

<+

Back insertion

Insert an item at end

-

[1,2] << 3 → [1,2,3]

+

[1,2] <+ 3 → [1,2,3]

[]

@@ -1900,11 +1900,11 @@ These operators have a high priority, in particular higher than the operator Table 8. Operators priorities - - - - - + + + + + @@ -2076,25 +2076,27 @@ These operators have a high priority, in particular higher than the operator

list - list → list

-

BINARY

+

BINARY NOT

+

~

+

Prefix

+

Binary Not

+

~ number → number

+ + +

BINARY AND

&

Infix

Binary And

number & number → number

+

BINARY OR

|

Infix

Binary Or

number | number → number

-

~

-

Prefix

-

Binary Not

-

~ number → number

- -

RELATION

<

Infix

@@ -2144,14 +2146,14 @@ These operators have a high priority, in particular higher than the operator

any in dict → boolean

-

NOT

+

LOGIC NOT

not

Prefix

Not

not boolean → boolean

-

AND

+

LOGIC AND

and

Infix

And

@@ -2164,7 +2166,7 @@ These operators have a high priority, in particular higher than the operator

boolean && boolean → boolean

-

OR

+

LOGIC OR

or

Infix

Or

@@ -2177,6 +2179,19 @@ These operators have a high priority, in particular higher than the operator

boolean || boolean → boolean

+

INSERT

+

+>

+

Infix

+

Prepend

+

any +> list → list

+ + +

<+

+

Infix

+

Append

+

list <+ any → list

+ +

ASSIGN

=

Infix

@@ -2461,7 +2476,7 @@ g(@p):any{}`