Doc: changed fraction symbol and introduced binary operators

New dedicated priority for binary operators between relational and sum ones
2024-12-25 07:43:06 +01:00 · 2024-12-25 07:41:08 +01:00
4 changed files with 100 additions and 67 deletions
--- a/doc/Expr.adoc
+++ b/doc/Expr.adoc
@ -127,22 +127,22 @@ dev-expr -- Expressions calculator v1.10.0(build 14),2024/06/17 (celestino.amoro
 9.5
 >>> 0xFD + 0b1 + 0o1 <1>
 255
->>> 1|2 + 2|3 <2>
-7|6
+>>> 1:2 + 2:3 <2>
+7:6
 >>> ml <3>
->>> 1|2 + 2|3
+>>> 1:2 + 2:3
 7
 -
 6
->>> 4+2 but 5|2+0.5 <4>
+>>> 4+2 but 5:2+0.5 <4>
 3
->>> 4+2; 5|2+0.5 <5>
+>>> 4+2; 5:2+0.5 <5>
 3
 >>>
 ----

 <1> Number bases: 0x = _hexadecimal_, 0o = _octal_, 0b = _binary_.
-<2> Fractions: _numerator_ | _denominator_.
+<2> Fractions: _numerator_ : _denominator_.
 <3> Activate multi-line output of fractions.
 <4> But operator, see <<_but_operator>>.
 <5> Multi-expression: the same result of the previous single expression but this it is obtained with two separated calculations.
@ -236,11 +236,11 @@ _dec-seq_ = _see-integer-literal-syntax_
 |===

 ==== Fractions
-_Expr_ also supports fractions. Fraction literals are made with two integers separated by a vertical bar `|`.
+_Expr_ also supports fractions. Fraction literals are made with two integers separated by a colon character `:`.

 .Fraction literal syntax
 ====
-*_fraction_* = [__sign__] (_num-den-spec_ | _float-spec_) +
+*_fraction_* = [__sign__] (_num-den-spec_ "**:**" _float-spec_) +
 _sign_ = "**+**" | "**-**" +
 _num-den-spec_ = _digit-seq_ "**|**" _digit-seq_ +
 _float-spec_ = _dec-seq_ "**.**" [_dec-seq_] "**(**" _dec-seq_ "**)**" +
@ -249,44 +249,44 @@ _digit-seq_ = _see-integer-literal-syntax_
 ====

 .Examples
-`>>>` [blue]`1 | 2` +
-[green]`1|2`
+`>>>` [blue]`1 : 2` +
+[green]`1:2`

-`>>>` [blue]`4|6`  [gray]_// Fractions are always reduced to their lowest terms_ +
-[green]`2|3`
+`>>>` [blue]`4:6`  [gray]_// Fractions are always reduced to their lowest terms_ +
+[green]`2:3`

-`>>>` [blue]`1|2 + 2|3` +
-[green]`7|6`
+`>>>` [blue]`1:2 + 2:3` +
+[green]`7:6`

-`>>>` [blue]`1|2 * 2|3` +
-[green]`1|3`
+`>>>` [blue]`1:2 * 2:3` +
+[green]`1:3`

-`>>>` [blue]`1|2 / 1|3` +
-[green]`3|2`
+`>>>` [blue]`1:2 / 1:3` +
+[green]`3:2`

-`>>>` [blue]`1|2 ./ 1|3` [gray]_// Force decimal division_ +
+`>>>` [blue]`1:2 ./ 1:3` [gray]_// Force decimal division_ +
 [green]`1.5`

-`>>>` [blue]`-1|2` +
-[green]`-1|2`
+`>>>` [blue]`-1:2` +
+[green]`-1:2`

-`>>>` [blue]`1|-2` [gray]_// Invalid sign specification_ +
-[red]_Eval Error: [1:3] infix operator "|" requires two non-nil operands, got 1_
+`>>>` [blue]`1:-2` [gray]_// Invalid sign specification_ +
+[red]_Eval Error: [1:3] infix operator ":" requires two non-nil operands, got 1_

-`>>>` [blue]`1|(-2)` +
-[green]`-1|2`
+`>>>` [blue]`1:(-2)` +
+[green]`-1:2`


 Fractions can be used together with integers and floats in expressions.

 .Examples
-`>>>` [blue]`1|2 + 5` +
-[green]`11|2`
+`>>>` [blue]`1:2 + 5` +
+[green]`11:2`

-`>>>` [blue]`4 - 1|2` +
-[green]`7|2`
+`>>>` [blue]`4 - 1:2` +
+[green]`7:2`

-`>>>` [blue]`1.0 + 1|2` +
+`>>>` [blue]`1.0 + 1:2` +
 [green]`1.5`


@ -753,7 +753,7 @@ The table below shows all supported operators by decreasing priorities.
 | [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_
+.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_
@ -765,6 +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_
 .8+|*RELATION*| [blue]`<` | _Infix_ | _Less_ | _comparable_ `<` _comparable_ -> _boolean_
 | [blue]`\<=` | _Infix_ |  _less-equal_ | _comparable_ `\<=` _comparable_ -> _boolean_
 | [blue]`>` | _Infix_ |  _Greater_ | _comparable_ `>` _comparable_ -> _boolean_
--- a/doc/Expr.html
+++ b/doc/Expr.html
@ -474,6 +474,16 @@ pre.rouge .gh {
  color: #b8bb26;
  font-weight: bold;
 }
+pre.rouge .ge {
+  font-style: italic;
+}
+pre.rouge .ges {
+  font-weight: bold;
+  font-style: italic;
+}
+pre.rouge .gs {
+  font-weight: bold;
+}
 pre.rouge .k, pre.rouge .kn, pre.rouge .kp, pre.rouge .kr, pre.rouge .kv {
  color: #fb4934;
 }
@ -745,16 +755,16 @@ dev-expr <span class="nt">--</span> Expressions calculator v1.10.0<span class="o
 9.5
 <span class="o">&gt;&gt;&gt;</span> 0xFD + 0b1 + 0o1 <i class="conum" data-value="1"></i><b>(1)</b>
 255
-<span class="o">&gt;&gt;&gt;</span> 1|2 + 2|3 <i class="conum" data-value="2"></i><b>(2)</b>
-7|6
+<span class="o">&gt;&gt;&gt;</span> 1:2 + 2:3 <i class="conum" data-value="2"></i><b>(2)</b>
+7:6
 <span class="o">&gt;&gt;&gt;</span> ml <i class="conum" data-value="3"></i><b>(3)</b>
-<span class="o">&gt;&gt;&gt;</span> 1|2 + 2|3
+<span class="o">&gt;&gt;&gt;</span> 1:2 + 2:3
 7
 -
 6
-<span class="o">&gt;&gt;&gt;</span> 4+2 but 5|2+0.5 <i class="conum" data-value="4"></i><b>(4)</b>
+<span class="o">&gt;&gt;&gt;</span> 4+2 but 5:2+0.5 <i class="conum" data-value="4"></i><b>(4)</b>
 3
-<span class="o">&gt;&gt;&gt;</span> 4+2<span class="p">;</span> 5|2+0.5 <i class="conum" data-value="5"></i><b>(5)</b>
+<span class="o">&gt;&gt;&gt;</span> 4+2<span class="p">;</span> 5:2+0.5 <i class="conum" data-value="5"></i><b>(5)</b>
 3
 <span class="o">&gt;&gt;&gt;</span></code></pre>
 </div>
@ -767,7 +777,7 @@ dev-expr <span class="nt">--</span> Expressions calculator v1.10.0<span class="o
 </tr>
 <tr>
 <td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>Fractions: <em>numerator</em> | <em>denominator</em>.</td>
+<td>Fractions: <em>numerator</em> : <em>denominator</em>.</td>
 </tr>
 <tr>
 <td><i class="conum" data-value="3"></i><b>3</b></td>
@ -981,13 +991,13 @@ dev-expr <span class="nt">--</span> Expressions calculator v1.10.0<span class="o
 <div class="sect3">
 <h4 id="_fractions"><a class="anchor" href="#_fractions"></a><a class="link" href="#_fractions">2.1.3. Fractions</a></h4>
 <div class="paragraph">
-<p><em>Expr</em> also supports fractions. Fraction literals are made with two integers separated by a vertical bar <code>|</code>.</p>
+<p><em>Expr</em> also supports fractions. Fraction literals are made with two integers separated by a colon character <code>:</code>.</p>
 </div>
 <div class="exampleblock">
 <div class="title">Example 3. Fraction literal syntax</div>
 <div class="content">
 <div class="paragraph">
-<p><strong><em>fraction</em></strong> = [<em>sign</em>] (<em>num-den-spec</em> | <em>float-spec</em>)<br>
+<p><strong><em>fraction</em></strong> = [<em>sign</em>] (<em>num-den-spec</em> "<strong>:</strong>" <em>float-spec</em>)<br>
 <em>sign</em> = "<strong>+</strong>" | "<strong>-</strong>"<br>
 <em>num-den-spec</em> = <em>digit-seq</em> "<strong>|</strong>" <em>digit-seq</em><br>
 <em>float-spec</em> = <em>dec-seq</em> "<strong>.</strong>" [<em>dec-seq</em>] "<strong>(</strong>" <em>dec-seq</em> "<strong>)</strong>"<br>
@ -998,55 +1008,55 @@ dev-expr <span class="nt">--</span> Expressions calculator v1.10.0<span class="o
 </div>
 <div class="paragraph">
 <div class="title">Examples</div>
-<p><code>&gt;&gt;&gt;</code> <code class="blue">1 | 2</code><br>
-<code class="green">1|2</code></p>
+<p><code>&gt;&gt;&gt;</code> <code class="blue">1 : 2</code><br>
+<code class="green">1:2</code></p>
 </div>
 <div class="paragraph">
-<p><code>&gt;&gt;&gt;</code> <code class="blue">4|6</code>  <em class="gray">// Fractions are always reduced to their lowest terms</em><br>
-<code class="green">2|3</code></p>
+<p><code>&gt;&gt;&gt;</code> <code class="blue">4:6</code>  <em class="gray">// Fractions are always reduced to their lowest terms</em><br>
+<code class="green">2:3</code></p>
 </div>
 <div class="paragraph">
-<p><code>&gt;&gt;&gt;</code> <code class="blue">1|2 + 2|3</code><br>
-<code class="green">7|6</code></p>
+<p><code>&gt;&gt;&gt;</code> <code class="blue">1:2 + 2:3</code><br>
+<code class="green">7:6</code></p>
 </div>
 <div class="paragraph">
-<p><code>&gt;&gt;&gt;</code> <code class="blue">1|2 * 2|3</code><br>
-<code class="green">1|3</code></p>
+<p><code>&gt;&gt;&gt;</code> <code class="blue">1:2 * 2:3</code><br>
+<code class="green">1:3</code></p>
 </div>
 <div class="paragraph">
-<p><code>&gt;&gt;&gt;</code> <code class="blue">1|2 / 1|3</code><br>
-<code class="green">3|2</code></p>
+<p><code>&gt;&gt;&gt;</code> <code class="blue">1:2 / 1:3</code><br>
+<code class="green">3:2</code></p>
 </div>
 <div class="paragraph">
-<p><code>&gt;&gt;&gt;</code> <code class="blue">1|2 ./ 1|3</code> <em class="gray">// Force decimal division</em><br>
+<p><code>&gt;&gt;&gt;</code> <code class="blue">1:2 ./ 1:3</code> <em class="gray">// Force decimal division</em><br>
 <code class="green">1.5</code></p>
 </div>
 <div class="paragraph">
-<p><code>&gt;&gt;&gt;</code> <code class="blue">-1|2</code><br>
-<code class="green">-1|2</code></p>
+<p><code>&gt;&gt;&gt;</code> <code class="blue">-1:2</code><br>
+<code class="green">-1:2</code></p>
 </div>
 <div class="paragraph">
-<p><code>&gt;&gt;&gt;</code> <code class="blue">1|-2</code> <em class="gray">// Invalid sign specification</em><br>
-<em class="red">Eval Error: [1:3] infix operator "|" requires two non-nil operands, got 1</em></p>
+<p><code>&gt;&gt;&gt;</code> <code class="blue">1:-2</code> <em class="gray">// Invalid sign specification</em><br>
+<em class="red">Eval Error: [1:3] infix operator ":" requires two non-nil operands, got 1</em></p>
 </div>
 <div class="paragraph">
-<p><code>&gt;&gt;&gt;</code> <code class="blue">1|(-2)</code><br>
-<code class="green">-1|2</code></p>
+<p><code>&gt;&gt;&gt;</code> <code class="blue">1:(-2)</code><br>
+<code class="green">-1:2</code></p>
 </div>
 <div class="paragraph">
 <p>Fractions can be used together with integers and floats in expressions.</p>
 </div>
 <div class="paragraph">
 <div class="title">Examples</div>
-<p><code>&gt;&gt;&gt;</code> <code class="blue">1|2 + 5</code><br>
-<code class="green">11|2</code></p>
+<p><code>&gt;&gt;&gt;</code> <code class="blue">1:2 + 5</code><br>
+<code class="green">11:2</code></p>
 </div>
 <div class="paragraph">
-<p><code>&gt;&gt;&gt;</code> <code class="blue">4 - 1|2</code><br>
-<code class="green">7|2</code></p>
+<p><code>&gt;&gt;&gt;</code> <code class="blue">4 - 1:2</code><br>
+<code class="green">7:2</code></p>
 </div>
 <div class="paragraph">
-<p><code>&gt;&gt;&gt;</code> <code class="blue">1.0 + 1|2</code><br>
+<p><code>&gt;&gt;&gt;</code> <code class="blue">1.0 + 1:2</code><br>
 <code class="green">1.5</code></p>
 </div>
 </div>
@ -1992,10 +2002,10 @@ These operators have a high priority, in particular higher than the operator <co
 </tr>
 <tr>
 <td class="tableblock halign-center valign-top"><p class="tableblock"><strong>FRACT</strong></p></td>
-<td class="tableblock halign-center valign-top"><p class="tableblock"><code class="blue">|</code></p></td>
+<td class="tableblock halign-center valign-top"><p class="tableblock"><code class="blue">:</code></p></td>
 <td class="tableblock halign-center valign-top"><p class="tableblock"><em>Infix</em></p></td>
 <td class="tableblock halign-center valign-top"><p class="tableblock"><em>Fraction</em></p></td>
-<td class="tableblock halign-center valign-top"><p class="tableblock"><em>integer</em> <code>|</code> <em>integer</em> &#8594; <em>fraction</em></p></td>
+<td class="tableblock halign-center valign-top"><p class="tableblock"><em>integer</em> <code>:</code> <em>integer</em> &#8594; <em>fraction</em></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-center valign-top" rowspan="5"><p class="tableblock"><strong>PROD</strong></p></td>
@ -2066,6 +2076,25 @@ These operators have a high priority, in particular higher than the operator <co
 <td class="tableblock halign-center valign-top"><p class="tableblock"><em>list</em> <code>-</code> <em>list</em> &#8594; <em>list</em></p></td>
 </tr>
 <tr>
+<td class="tableblock halign-center valign-top" rowspan="3"><p class="tableblock"><strong>BINARY</strong></p></td>
+<td class="tableblock halign-center valign-top"><p class="tableblock"><code class="blue">&amp;</code></p></td>
+<td class="tableblock halign-center valign-top"><p class="tableblock"><em>Infix</em></p></td>
+<td class="tableblock halign-center valign-top"><p class="tableblock"><em>Binary And</em></p></td>
+<td class="tableblock halign-center valign-top"><p class="tableblock"><em>number</em> <code>&amp;</code> <em>number</em> &#8594; <em>number</em></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-center valign-top"><p class="tableblock"><code class="blue">|</code></p></td>
+<td class="tableblock halign-center valign-top"><p class="tableblock"><em>Infix</em></p></td>
+<td class="tableblock halign-center valign-top"><p class="tableblock"><em>Binary Or</em></p></td>
+<td class="tableblock halign-center valign-top"><p class="tableblock"><em>number</em> <code>|</code> <em>number</em> &#8594; <em>number</em></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-center valign-top"><p class="tableblock"><code class="blue">~</code></p></td>
+<td class="tableblock halign-center valign-top"><p class="tableblock"><em>Prefix</em></p></td>
+<td class="tableblock halign-center valign-top"><p class="tableblock"><em>Binary Not</em></p></td>
+<td class="tableblock halign-center valign-top"><p class="tableblock"><code>~</code> <em>number</em> &#8594; <em>number</em></p></td>
+</tr>
+<tr>
 <td class="tableblock halign-center valign-top" rowspan="8"><p class="tableblock"><strong>RELATION</strong></p></td>
 <td class="tableblock halign-center valign-top"><p class="tableblock"><code class="blue">&lt;</code></p></td>
 <td class="tableblock halign-center valign-top"><p class="tableblock"><em>Infix</em></p></td>
@ -2432,7 +2461,7 @@ g(@p):any{}`
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-09-30 07:29:03 +0200
+Last updated 2024-12-23 07:20:48 +0100
 </div>
 </div>
 </body>
--- a/operator-binary.go
+++ b/operator-binary.go
@ -11,7 +11,7 @@ func newBinNotTerm(tk *Token) (inst *term) {
 		tk:       *tk,
 		children: make([]*term, 0, 1),
 		position: posPrefix,
-		priority: priNot,
+		priority: priBinary,
 		evalFunc: evalBinaryNot,
 	}
 }
@ -39,7 +39,7 @@ func newBinAndTerm(tk *Token) (inst *term) {
 		tk:       *tk,
 		children: make([]*term, 0, 2),
 		position: posInfix,
-		priority: priAnd,
+		priority: priBinary,
 		evalFunc: evalBinaryAnd,
 	}
 }
@ -71,7 +71,7 @@ func newBinOrTerm(tk *Token) (inst *term) {
 		tk:       *tk,
 		children: make([]*term, 0, 2),
 		position: posInfix,
-		priority: priOr,
+		priority: priBinary,
 		evalFunc: evalBinaryOr,
 	}
 }
--- a/term.go
+++ b/term.go
@ -19,6 +19,7 @@ const (
 	priAnd
 	priNot
 	priRelational
+	priBinary
 	priSum
 	priProduct
 	priFraction
Author	SHA1	Message	Date
Celestino Amoroso	4725145d1c	Doc: changed fraction symbol and introduced binary operators	2024-12-25 07:43:06 +01:00
Celestino Amoroso	edf8818f51	New dedicated priority for binary operators between relational and sum ones	2024-12-25 07:41:08 +01:00