From a1a62b67948f131fc80ebe05f97ff3ea9cc6a186 Mon Sep 17 00:00:00 2001 From: Celestino Amoroso Date: Thu, 20 Jun 2024 07:10:59 +0200 Subject: [PATCH] Doc: little changes --- doc/Expr.adoc | 76 ++++++++++++++------------- doc/Expr.html | 141 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 124 insertions(+), 93 deletions(-) diff --git a/doc/Expr.adoc b/doc/Expr.adoc index 945b3f9..9cc90c7 100644 --- a/doc/Expr.adoc +++ b/doc/Expr.adoc @@ -674,42 +674,46 @@ The table below shows all supported operators by decreasing priorities. |=== | Priority | Operators | Position | Operation | Operands and results -.2+|*ITEM*| [blue]`.` | _Infix_ | _List item_| _list_ `"."` _integer_ -> _any_ -| [blue]`.` | _Infix_ | _Dict item_ | _dict_ `"."` _any_ -> _any_ -.2+|*INC*| [blue]`++` | _Postfix_ | _Post increment_| _integer-variable_ `"++"` -> _integer_ -| [blue]`++` | _Postfix_ | _Next item_ | _iterator_ `"++"` -> _any_ -.1+|*FACT*| [blue]`!` | _Postfix_ | _Factorial_| _integer_ `"!"` -> _integer_ -.3+|*SIGN*| [blue]`+`, [blue]`-` | _Prefix_ | _Change-sign_| (`"+"`\|`"-"`) _number_ -> _number_ -| [blue]`#` | _Prefix_ | _Lenght-of_ | `"#"` _collection_ -> _integer_ -| [blue]`#` | _Prefix_ | _Size-of_ | `"#"` _iterator_ -> _integer_ -.5+|*PROD*| [blue]`*` | _Infix_ | _Product_ | _number_ `"*"` _number_ -> _number_ -| [blue]`*` | _Infix_ | _String-repeat_ | _string_ `"*"` _integer_ -> _string_ -| [blue]`/` | _Infix_ | _Division_ | _number_ `"/"` _number_ -> _number_ -| [blue]`./` | _Infix_ | _Float-division_ | __number__ `"./"` _number_ -> _float_ -| [blue]`%` | _Infix_ | _Integer-remainder_ | _integer_ `"%"` _integer_ -> _integer_ -.6+|*SUM*| [blue]`+` | _Infix_ | _Sum_ | _number_ `"+"` _number_ -> _number_ -| [blue]`+` | _Infix_ | _String-concat_ | (_string_\|_number_) `"+"` (_string_\|_number_) -> _string_ -| [blue]`+` | _Infix_ | _List-join_ | _list_ `"+"` _list_ -> _list_ -| [blue]`+` | _Infix_ | _Dict-join_ | _dict_ `"+"` _dict_ -> _dict_ -| [blue]`-` | _Infix_ | _Subtraction_ | _number_ `"-"` _number_ -> _number_ -| [blue]`-` | _Infix_ | _List-difference_ | _list_ `"-"` _list_ -> _list_ -.8+|*RELATION*| [blue]`<` | _Infix_ | _less_ | _comparable_ `"<"` _comparable_ -> _boolean_ -| [blue]`\<=` | _Infix_ | _less-equal_ | _comparable_ `"\<="` _comparable_ -> _boolean_ -| [blue]`>` | _Infix_ | _greater_ | _comparable_ `">"` _comparable_ -> _boolean_ -| [blue]`>=` | _Infix_ | _greater-equal_ | _comparable_ `">="` _comparable_ -> _boolean_ -| [blue]`==` | _Infix_ | _equal_ | _comparable_ `"=="` _comparable_ -> _boolean_ -| [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_ -| [blue]`&&` | _Infix_ | _and_ | _boolean_ `"&&"` _boolean_ -> _boolean_ -.2+|*OR*| [blue]`or` | _Infix_ | _or_ | _boolean_ `"or"` _boolean_ -> _boolean_ -| [blue]`\|\|` | _Infix_ | _or_ | _boolean_ `"\|\|"` _boolean_ -> _boolean_ -.3+|*ASSIGN*| [blue]`=` | _Infix_ | _assignment_ | _identifier_ "=" _any_ -> _any_ -| [blue]`>>` | _Infix_ | _front-insert_ | _any_ ">>" _list_ -> _list_ -| [blue]`<<` | _Infix_ | _back-insert_ | _list_ "<<" _any_ -> _list_ - .1+|*BUT*| [blue]`but` | _Infix_ | _but_ | _any_ "but" _any_ -> _any_ +.2+|*ITEM*| [blue]`[`...`]` | _Postfix_ | _List item_| _list_ `[` _integer_ `]` -> _any_ +| [blue]`[`...`]` | _Postfix_ | _Dict item_ | _dict_ `[` _any_ `]` -> _any_ +.2+|*INC*| [blue]`++` | _Postfix_ | _Post increment_| _integer-variable_ `++` -> _integer_ +| [blue]`++` | _Postfix_ | _Next item_ | _iterator_ `++` -> _any_ +.1+|*FACT*| [blue]`!` | _Postfix_ | _Factorial_| _integer_ `!` -> _integer_ +.3+|*SIGN*| [blue]`+`, [blue]`-` | _Prefix_ | _Change-sign_| (`+`\|`-`) _number_ -> _number_ +| [blue]`#` | _Prefix_ | _Lenght-of_ | `#` _collection_ -> _integer_ +| [blue]`#` | _Prefix_ | _Size-of_ | `#` _iterator_ -> _integer_ +.2+|*SELECT*| [blue]`? : ::` | _Multi-Infix_ | _Case-Selector_ | _any-expr_ `?` _case-list_ _case-expr_ `:` _case-list_ _case-expr_ ... `::` _default-expr_ -> _any_ +| [blue]`? : ::` | _Multi-Infix_ | _Index-Selector_ | _int-expr_ `?` _case-expr_ `:` _case-expr_ ... `::` _default-expr_ -> _any_ +.1+|*FRACT*| [blue]`\|` | _Infix_ | _Fraction_ | _integer_ `\|` _integer_ -> _fraction_ +.5+|*PROD*| [blue]`*` | _Infix_ | _Product_ | _number_ `*` _number_ -> _number_ +| [blue]`*` | _Infix_ | _String-repeat_ | _string_ `*` _integer_ -> _string_ +| [blue]`/` | _Infix_ | _Division_ | _number_ `/` _number_ -> _number_ +| [blue]`./` | _Infix_ | _Float-division_ | __number__ `./` _number_ -> _float_ +| [blue]`%` | _Infix_ | _Integer-remainder_ | _integer_ `%` _integer_ -> _integer_ +.6+|*SUM*| [blue]`+` | _Infix_ | _Sum_ | _number_ `+` _number_ -> _number_ +| [blue]`+` | _Infix_ | _String-concat_ | (_string_\|_number_) `+` (_string_\|_number_) -> _string_ +| [blue]`+` | _Infix_ | _List-join_ | _list_ `+` _list_ -> _list_ +| [blue]`+` | _Infix_ | _Dict-join_ | _dict_ `+` _dict_ -> _dict_ +| [blue]`-` | _Infix_ | _Subtraction_ | _number_ `-` _number_ -> _number_ +| [blue]`-` | _Infix_ | _List-difference_ | _list_ `-` _list_ -> _list_ +.8+|*RELATION*| [blue]`<` | _Infix_ | _Less_ | _comparable_ `<` _comparable_ -> _boolean_ +| [blue]`\<=` | _Infix_ | _less-equal_ | _comparable_ `\<=` _comparable_ -> _boolean_ +| [blue]`>` | _Infix_ | _Greater_ | _comparable_ `>` _comparable_ -> _boolean_ +| [blue]`>=` | _Infix_ | _Greater-equal_ | _comparable_ `>=` _comparable_ -> _boolean_ +| [blue]`==` | _Infix_ | _Equal_ | _comparable_ `==` _comparable_ -> _boolean_ +| [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_ +| [blue]`&&` | _Infix_ | _And_ | _boolean_ `&&` _boolean_ -> _boolean_ +.2+|*OR*| [blue]`or` | _Infix_ | _Or_ | _boolean_ `or` _boolean_ -> _boolean_ +| [blue]`\|\|` | _Infix_ | _Or_ | _boolean_ `\|\|` _boolean_ -> _boolean_ +.3+|*ASSIGN*| [blue]`=` | _Infix_ | _Assignment_ | _identifier_ `=` _any_ -> _any_ +| [blue]`>>` | _Infix_ | _Front-insert_ | _any_ `>>` _list_ -> _list_ +| [blue]`<<` | _Infix_ | _Back-insert_ | _list_ `<<` _any_ -> _list_ +.1+|*BUT*| [blue]`but` | _Infix_ | _But_ | _any_ `but` _any_ -> _any_ +.1+|*RANGE*| [blue]`:` | _Infix_ | _Index-range_ | _integer_ `:` _integer_ -> _integer-pair_ |=== == Functions diff --git a/doc/Expr.html b/doc/Expr.html index d4988bc..33b15af 100644 --- a/doc/Expr.html +++ b/doc/Expr.html @@ -1795,231 +1795,258 @@ These operators have a high priority, in particular higher than the operator

ITEM

-

.

-

Infix

+

[…​]

+

Postfix

List item

-

list "." integer → any

+

list [ integer ] → any

-

.

-

Infix

+

[…​]

+

Postfix

Dict item

-

dict "." any → any

+

dict [ any ] → any

INC

++

Postfix

Post increment

-

integer-variable "++" → integer

+

integer-variable ++ → integer

++

Postfix

Next item

-

iterator "++" → any

+

iterator ++ → any

FACT

!

Postfix

Factorial

-

integer "!" → integer

+

integer ! → integer

SIGN

+, -

Prefix

Change-sign

-

("+“|”-") number → number

+

(+|-) number → number

#

Prefix

Lenght-of

-

"#" collection → integer

+

# collection → integer

#

Prefix

Size-of

-

"#" iterator → integer

+

# iterator → integer

+ + +

SELECT

+

? : ::

+

Multi-Infix

+

Case-Selector

+

any-expr ? case-list case-expr : case-list case-expr …​ :: default-expr → any

+ + +

? : ::

+

Multi-Infix

+

Index-Selector

+

int-expr ? case-expr : case-expr …​ :: default-expr → any

+ + +

FRACT

+

|

+

Infix

+

Fraction

+

integer | integer → fraction

PROD

*

Infix

Product

-

number "*" number → number

+

number * number → number

*

Infix

String-repeat

-

string "*" integer → string

+

string * integer → string

/

Infix

Division

-

number "/" number → number

+

number / number → number

./

Infix

Float-division

-

number "./" number → float

+

number ./ number → float

%

Infix

Integer-remainder

-

integer "%" integer → integer

+

integer % integer → integer

SUM

+

Infix

Sum

-

number "+" number → number

+

number + number → number

+

Infix

String-concat

-

(string|number) "+" (string|number) → string

+

(string|number) + (string|number) → string

+

Infix

List-join

-

list "+" list → list

+

list + list → list

+

Infix

Dict-join

-

dict "+" dict → dict

+

dict + dict → dict

-

Infix

Subtraction

-

number "-" number → number

+

number - number → number

-

Infix

List-difference

-

list "-" list → list

+

list - list → list

RELATION

<

Infix

-

less

-

comparable "<" comparable → boolean

+

Less

+

comparable < comparable → boolean

<=

Infix

less-equal

-

comparable "<=" comparable → boolean

+

comparable <= comparable → boolean

>

Infix

-

greater

-

comparable ">" comparable → boolean

+

Greater

+

comparable > comparable → boolean

>=

Infix

-

greater-equal

-

comparable ">=" comparable → boolean

+

Greater-equal

+

comparable >= comparable → boolean

==

Infix

-

equal

-

comparable "==" comparable → boolean

+

Equal

+

comparable == comparable → boolean

!=

Infix

-

not-equal

-

comparable "!=" comparable → boolean

+

Not-equal

+

comparable != comparable → boolean

in

Infix

-

member-of-list

-

any "in" list → boolean

+

Member-of-list

+

any in list → boolean

in

Infix

-

key-of-dict

-

any "in" dict → boolean

+

Key-of-dict

+

any in dict → boolean

NOT

not

Prefix

-

not

-

"not" boolean → boolean

+

Not

+

not boolean → boolean

AND

and

Infix

-

and

-

boolean "and" boolean → boolean

+

And

+

boolean and boolean → boolean

&&

Infix

-

and

-

boolean "&&" boolean → boolean

+

And

+

boolean && boolean → boolean

OR

or

Infix

-

or

-

boolean "or" boolean → boolean

+

Or

+

boolean or boolean → boolean

||

Infix

-

or

-

boolean "||" boolean → boolean

+

Or

+

boolean || boolean → boolean

ASSIGN

=

Infix

-

assignment

-

identifier "=" any → any

+

Assignment

+

identifier = any → any

>>

Infix

-

front-insert

-

any ">>" list → list

+

Front-insert

+

any >> list → list

<<

Infix

-

back-insert

-

list "<<" any → list

+

Back-insert

+

list << any → list

BUT

but

Infix

-

but

-

any "but" any → any

+

But

+

any but any → any

+ + +

RANGE

+

:

+

Infix

+

Index-range

+

integer : integer → integer-pair

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