From 51f12c9d71b6848fc27414a6f74f948b34007b5a Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Mon, 12 Sep 2022 12:34:44 -0600 Subject: [PATCH] updated flux spec and nav order (#4452) --- content/flux/v0.x/influxdb-versions.md | 2 +- content/flux/v0.x/spec/system-built-ins.md | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/content/flux/v0.x/influxdb-versions.md b/content/flux/v0.x/influxdb-versions.md index d080a9d75..3a235e871 100644 --- a/content/flux/v0.x/influxdb-versions.md +++ b/content/flux/v0.x/influxdb-versions.md @@ -4,7 +4,7 @@ description: | View what versions of Flux are packaged with each version of InfluxDB. menu: flux_0_x_ref: - weight: 10 + weight: 13 --- View which versions of InfluxDB are packaged with each version of InfluxDB. diff --git a/content/flux/v0.x/spec/system-built-ins.md b/content/flux/v0.x/spec/system-built-ins.md index a09febfe5..2a8c350db 100644 --- a/content/flux/v0.x/spec/system-built-ins.md +++ b/content/flux/v0.x/spec/system-built-ins.md @@ -23,18 +23,19 @@ All such values must have a corresponding builtin statement to declare the exist BuiltinStatement = "builtin" identifier ":" TypeExpression . TypeExpression = MonoType ["where" Constraints] . -MonoType = Tvar | Basic | Array | Record | Function . -Tvar = "A" … "Z" . -Basic = "int" | "uint" | "float" | "string" | "bool" | "time" | "duration" | "bytes" | "regexp" . -Array = "[" MonoType "]" . -Record = ( "{" [Properties] "}" ) | ( "{" Tvar "with" Properties "}" ) . -Function = "(" [Parameters] ")" "=>" MonoType . +MonoType = Tvar | BasicType | ArrayType | RecordType | FunctionType . +Tvar = "A" … "Z" . +BasicType = "int" | "uint" | "float" | "string" | "bool" | "time" | "duration" | "bytes" | "regexp" . +ArrayType = "[" MonoType "]" . +RecordType = ( "{" [RecordTypeProperties] "}" ) | ( "{" Tvar "with" RecordTypeProperties "}" ) . +FunctionType = "(" [FunctionTypeParameters] ")" "=>" MonoType . -Properties = Property { "," Property } . -Property = identifier ":" MonoType . +RecordTypeProperties = RecordTypeProperty { "," RecordTypeProperty } . +RecordTypeProperty = Label ":" MonoType . +Label = identifier | string_lit -Parameters = Parameter { "," Parameter } . -Parameter = [ "<-" | "?" ] identifier ":" MonoType . +FunctionTypeParameters = FunctionTypeParameter { "," FunctionTypeParameter } . +FunctionTypeParameter = [ "<-" | "?" ] identifier ":" MonoType . Constraints = Constraint { "," Constraint } . Constraint = Tvar ":" Kinds .