Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-01-23 02:14:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix multiple on-line-help issues from #907 (#910)

Browse source 
* Fix multiple on-line-help issues from #907

* build-artifacts for previous commit
This commit is contained in:
John Kerl 2022-01-31 23:41:32 -05:00 • committed by GitHub
parent b41e0befaa
commit c327055db7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/src/manpage.md
View file

@ -2682,10 +2682,10 @@ FUNCTIONS FOR FILTER/PUT
(class=arithmetic #args=2) Subtraction, with integer-to-integer overflow.
./
(class=arithmetic #args=2) Integer division; not pythonic.
(class=arithmetic #args=2) Integer division, rounding toward zero.
/
(class=arithmetic #args=2) Division. Integer / integer is floating-point.
(class=arithmetic #args=2) Division. Integer / integer is integer when exact, else floating-point: e.g. 6/3 is 2 but 6/4 is 1.5.
//
(class=arithmetic #args=2) Pythonic integer division, rounding toward negative.
@ -2727,7 +2727,7 @@ FUNCTIONS FOR FILTER/PUT
(class=boolean #args=2) Absent-coalesce operator. $a ?? 1 evaluates to 1 if $a isn't defined in the current record.
???
(class=boolean #args=2) Absent-coalesce operator. $a ?? 1 evaluates to 1 if $a isn't defined in the current record, or has empty value.
(class=boolean #args=2) Absent/empty-coalesce operator. $a ??? 1 evaluates to 1 if $a isn't defined in the current record, or has empty value.
^
(class=arithmetic #args=2) Bitwise XOR.
@ -3134,5 +3134,5 @@ SEE ALSO
2022-01-30 MILLER(1)
2022-02-01 MILLER(1)
</pre>

8
docs/src/manpage.txt
View file

@ -2661,10 +2661,10 @@ FUNCTIONS FOR FILTER/PUT
(class=arithmetic #args=2) Subtraction, with integer-to-integer overflow.
./
(class=arithmetic #args=2) Integer division; not pythonic.
(class=arithmetic #args=2) Integer division, rounding toward zero.
/
(class=arithmetic #args=2) Division. Integer / integer is floating-point.
(class=arithmetic #args=2) Division. Integer / integer is integer when exact, else floating-point: e.g. 6/3 is 2 but 6/4 is 1.5.
//
(class=arithmetic #args=2) Pythonic integer division, rounding toward negative.
@ -2706,7 +2706,7 @@ FUNCTIONS FOR FILTER/PUT
(class=boolean #args=2) Absent-coalesce operator. $a ?? 1 evaluates to 1 if $a isn't defined in the current record.
???
(class=boolean #args=2) Absent-coalesce operator. $a ?? 1 evaluates to 1 if $a isn't defined in the current record, or has empty value.
(class=boolean #args=2) Absent/empty-coalesce operator. $a ??? 1 evaluates to 1 if $a isn't defined in the current record, or has empty value.
^
(class=arithmetic #args=2) Bitwise XOR.
@ -3113,4 +3113,4 @@ SEE ALSO
2022-01-30 MILLER(1)
2022-02-01 MILLER(1)

6
docs/src/reference-dsl-builtin-functions.md
View file

@ -184,14 +184,14 @@ pow (class=arithmetic #args=2) Exponentiation. Same as **, but as a function.
<a id=dot-slash />
### \./
<pre class="pre-non-highlight-non-pair">
./ (class=arithmetic #args=2) Integer division; not pythonic.
./ (class=arithmetic #args=2) Integer division, rounding toward zero.
</pre>
<a id=slash />
### /
<pre class="pre-non-highlight-non-pair">
/ (class=arithmetic #args=2) Division. Integer / integer is floating-point.
/ (class=arithmetic #args=2) Division. Integer / integer is integer when exact, else floating-point: e.g. 6/3 is 2 but 6/4 is 1.5.
</pre>
@ -339,7 +339,7 @@ pow (class=arithmetic #args=2) Exponentiation. Same as **, but as a function.
<a id=absent-empty-coalesce />
### ???
<pre class="pre-non-highlight-non-pair">
??? (class=boolean #args=2) Absent-coalesce operator. $a ?? 1 evaluates to 1 if $a isn't defined in the current record, or has empty value.
??? (class=boolean #args=2) Absent/empty-coalesce operator. $a ??? 1 evaluates to 1 if $a isn't defined in the current record, or has empty value.
</pre>

6
internal/pkg/dsl/cst/builtin_function_manager.go
View file

@ -112,7 +112,7 @@ func makeBuiltinFunctionLookupTable() []BuiltinFunctionInfo {
{
name: "/",
class: FUNC_CLASS_ARITHMETIC,
help: `Division. Integer / integer is floating-point.`,
help: `Division. Integer / integer is integer when exact, else floating-point: e.g. 6/3 is 2 but 6/4 is 1.5.`,
binaryFunc: bifs.BIF_divide,
},
@ -161,7 +161,7 @@ func makeBuiltinFunctionLookupTable() []BuiltinFunctionInfo {
{
name: "./",
class: FUNC_CLASS_ARITHMETIC,
help: `Integer division; not pythonic.`,
help: `Integer division, rounding toward zero.`,
binaryFunc: bifs.BIF_dot_divide,
},
@ -361,7 +361,7 @@ func makeBuiltinFunctionLookupTable() []BuiltinFunctionInfo {
{
name: "???",
class: FUNC_CLASS_BOOLEAN,
help: `Absent-coalesce operator. $a ?? 1 evaluates to 1 if $a isn't defined in the current record, or has empty value.`,
help: `Absent/empty-coalesce operator. $a ??? 1 evaluates to 1 if $a isn't defined in the current record, or has empty value.`,
binaryFunc: BinaryShortCircuitPlaceholder,
},

8
man/manpage.txt
View file

@ -2661,10 +2661,10 @@ FUNCTIONS FOR FILTER/PUT
(class=arithmetic #args=2) Subtraction, with integer-to-integer overflow.
./
(class=arithmetic #args=2) Integer division; not pythonic.
(class=arithmetic #args=2) Integer division, rounding toward zero.
/
(class=arithmetic #args=2) Division. Integer / integer is floating-point.
(class=arithmetic #args=2) Division. Integer / integer is integer when exact, else floating-point: e.g. 6/3 is 2 but 6/4 is 1.5.
//
(class=arithmetic #args=2) Pythonic integer division, rounding toward negative.
@ -2706,7 +2706,7 @@ FUNCTIONS FOR FILTER/PUT
(class=boolean #args=2) Absent-coalesce operator. $a ?? 1 evaluates to 1 if $a isn't defined in the current record.
???
(class=boolean #args=2) Absent-coalesce operator. $a ?? 1 evaluates to 1 if $a isn't defined in the current record, or has empty value.
(class=boolean #args=2) Absent/empty-coalesce operator. $a ??? 1 evaluates to 1 if $a isn't defined in the current record, or has empty value.
^
(class=arithmetic #args=2) Bitwise XOR.
@ -3113,4 +3113,4 @@ SEE ALSO
2022-01-30 MILLER(1)
2022-02-01 MILLER(1)

10
man/mlr.1
View file

@ -2,12 +2,12 @@
.\" Title: mlr
.\" Author: [see the "AUTHOR" section]
.\" Generator: ./mkman.rb
.\" Date: 2022-01-30
.\" Date: 2022-02-01
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
.TH "MILLER" "1" "2022-01-30" "\ \&" "\ \&"
.TH "MILLER" "1" "2022-02-01" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Portability definitions
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -4320,7 +4320,7 @@ Int-valued example: '$n=floor(20+urand()*11)'.
.RS 0
.\}
.nf
(class=arithmetic #args=2) Integer division; not pythonic.
(class=arithmetic #args=2) Integer division, rounding toward zero.
.fi
.if n \{\
.RE
@ -4329,7 +4329,7 @@ Int-valued example: '$n=floor(20+urand()*11)'.
.RS 0
.\}
.nf
(class=arithmetic #args=2) Division. Integer / integer is floating-point.
(class=arithmetic #args=2) Division. Integer / integer is integer when exact, else floating-point: e.g. 6/3 is 2 but 6/4 is 1.5.
.fi
.if n \{\
.RE
@ -4455,7 +4455,7 @@ Int-valued example: '$n=floor(20+urand()*11)'.
.RS 0
.\}
.nf
(class=boolean #args=2) Absent-coalesce operator. $a ?? 1 evaluates to 1 if $a isn't defined in the current record, or has empty value.
(class=boolean #args=2) Absent/empty-coalesce operator. $a ??? 1 evaluates to 1 if $a isn't defined in the current record, or has empty value.
.fi
.if n \{\
.RE

3
todo.txt
View file

@ -15,10 +15,9 @@ RELEASES
k format/unformat
k split
k slwin & shift-lead
* plan 6.2.0
k 0o.. octal literals in the DSL
* plan 6.2.0
? YAML
-> more badges -- ?
================================================================
FEATURES