Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub mod column_path;
|
|
|
|
mod convert;
|
|
|
|
mod debug;
|
|
|
|
pub mod dict;
|
|
|
|
pub mod evaluate;
|
2020-04-26 19:30:52 +02:00
|
|
|
pub mod iter;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub mod primitive;
|
2019-12-04 22:14:52 +01:00
|
|
|
pub mod range;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
mod serde_bigdecimal;
|
|
|
|
mod serde_bigint;
|
|
|
|
|
2020-04-13 09:59:57 +02:00
|
|
|
use crate::hir;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use crate::type_name::{ShellTypeName, SpannedTypeName};
|
|
|
|
use crate::value::dict::Dictionary;
|
2020-04-26 19:30:52 +02:00
|
|
|
use crate::value::iter::{RowValueIter, TableValueIter};
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use crate::value::primitive::Primitive;
|
2019-12-04 22:14:52 +01:00
|
|
|
use crate::value::range::{Range, RangeInclusion};
|
2020-05-21 18:30:58 +02:00
|
|
|
use crate::{ColumnPath, PathMember, UnspannedPathMember};
|
2019-12-04 20:52:31 +01:00
|
|
|
use bigdecimal::BigDecimal;
|
2020-02-13 16:47:04 +01:00
|
|
|
use chrono::{DateTime, Utc};
|
2019-12-04 20:52:31 +01:00
|
|
|
use indexmap::IndexMap;
|
2020-05-21 18:30:58 +02:00
|
|
|
use itertools::Itertools;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use nu_errors::ShellError;
|
2019-12-04 22:14:52 +01:00
|
|
|
use nu_source::{AnchorLocation, HasSpan, Span, Spanned, Tag};
|
2019-12-04 20:52:31 +01:00
|
|
|
use num_bigint::BigInt;
|
2020-04-24 19:28:38 +02:00
|
|
|
use num_traits::ToPrimitive;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
use std::path::PathBuf;
|
2019-12-04 20:52:31 +01:00
|
|
|
use std::time::SystemTime;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// The core structured values that flow through a pipeline
|
2019-12-31 05:05:02 +01:00
|
|
|
#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub enum UntaggedValue {
|
2020-01-18 20:42:36 +01:00
|
|
|
/// A primitive (or fundamental) type of values
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
Primitive(Primitive),
|
2020-05-11 04:47:27 +02:00
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// A table row
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
Row(Dictionary),
|
2020-05-11 04:47:27 +02:00
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// A full inner (or embedded) table
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
Table(Vec<Value>),
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// An error value that represents an error that occurred as the values in the pipeline were built
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
Error(ShellError),
|
|
|
|
|
2020-04-20 08:41:51 +02:00
|
|
|
/// A block of Nu code, eg `{ ls | get name ; echo "done" }`
|
|
|
|
Block(hir::Block),
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
impl UntaggedValue {
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Get the corresponding descriptors (column names) associated with this value
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub fn data_descriptors(&self) -> Vec<String> {
|
|
|
|
match self {
|
|
|
|
UntaggedValue::Primitive(_) => vec![],
|
2019-12-31 08:36:08 +01:00
|
|
|
UntaggedValue::Row(columns) => columns.entries.keys().map(|x| x.to_string()).collect(),
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
UntaggedValue::Block(_) => vec![],
|
|
|
|
UntaggedValue::Table(_) => vec![],
|
|
|
|
UntaggedValue::Error(_) => vec![],
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Convert this UntaggedValue to a Value with the given Tag
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub fn into_value(self, tag: impl Into<Tag>) -> Value {
|
|
|
|
Value {
|
|
|
|
value: self,
|
|
|
|
tag: tag.into(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Convert this UntaggedValue into a Value with an empty Tag
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub fn into_untagged_value(self) -> Value {
|
|
|
|
Value {
|
|
|
|
value: self,
|
|
|
|
tag: Tag::unknown(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Returns true if this value represents boolean true
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub fn is_true(&self) -> bool {
|
|
|
|
match self {
|
|
|
|
UntaggedValue::Primitive(Primitive::Boolean(true)) => true,
|
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-17 19:33:50 +02:00
|
|
|
/// Returns true if this value represents a table
|
|
|
|
pub fn is_table(&self) -> bool {
|
|
|
|
match self {
|
|
|
|
UntaggedValue::Table(_) => true,
|
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Returns true if the value represents something other than Nothing
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub fn is_some(&self) -> bool {
|
|
|
|
!self.is_none()
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Returns true if the value represents Nothing
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub fn is_none(&self) -> bool {
|
|
|
|
match self {
|
|
|
|
UntaggedValue::Primitive(Primitive::Nothing) => true,
|
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Returns true if the value represents an error
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub fn is_error(&self) -> bool {
|
|
|
|
match self {
|
|
|
|
UntaggedValue::Error(_err) => true,
|
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Expect this value to be an error and return it
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub fn expect_error(&self) -> ShellError {
|
|
|
|
match self {
|
|
|
|
UntaggedValue::Error(err) => err.clone(),
|
|
|
|
_ => panic!("Don't call expect_error without first calling is_error"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Expect this value to be a string and return it
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub fn expect_string(&self) -> &str {
|
|
|
|
match self {
|
|
|
|
UntaggedValue::Primitive(Primitive::String(string)) => &string[..],
|
|
|
|
_ => panic!("expect_string assumes that the value must be a string"),
|
|
|
|
}
|
|
|
|
}
|
2019-12-04 20:52:31 +01:00
|
|
|
|
2020-04-24 19:28:38 +02:00
|
|
|
/// Expect this value to be an integer and return it
|
|
|
|
pub fn expect_int(&self) -> i64 {
|
|
|
|
let big_int = match self {
|
|
|
|
UntaggedValue::Primitive(Primitive::Int(int)) => Some(int),
|
|
|
|
_ => None,
|
|
|
|
};
|
|
|
|
|
|
|
|
match big_int.and_then(|i| i.to_i64()) {
|
|
|
|
Some(i) => i,
|
|
|
|
_ => panic!("expect_int assumes that the value must be a integer"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating row values
|
2019-12-04 20:52:31 +01:00
|
|
|
pub fn row(entries: IndexMap<String, Value>) -> UntaggedValue {
|
|
|
|
UntaggedValue::Row(entries.into())
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating table values
|
2019-12-31 08:36:08 +01:00
|
|
|
pub fn table(list: &[Value]) -> UntaggedValue {
|
2019-12-04 20:52:31 +01:00
|
|
|
UntaggedValue::Table(list.to_vec())
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating string values
|
2019-12-04 20:52:31 +01:00
|
|
|
pub fn string(s: impl Into<String>) -> UntaggedValue {
|
|
|
|
UntaggedValue::Primitive(Primitive::String(s.into()))
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating line values
|
2019-12-04 20:52:31 +01:00
|
|
|
pub fn line(s: impl Into<String>) -> UntaggedValue {
|
|
|
|
UntaggedValue::Primitive(Primitive::Line(s.into()))
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating column-path values
|
2019-12-04 20:52:31 +01:00
|
|
|
pub fn column_path(s: Vec<impl Into<PathMember>>) -> UntaggedValue {
|
|
|
|
UntaggedValue::Primitive(Primitive::ColumnPath(ColumnPath::new(
|
|
|
|
s.into_iter().map(|p| p.into()).collect(),
|
|
|
|
)))
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating integer values
|
2019-12-04 20:52:31 +01:00
|
|
|
pub fn int(i: impl Into<BigInt>) -> UntaggedValue {
|
|
|
|
UntaggedValue::Primitive(Primitive::Int(i.into()))
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating glob pattern values
|
2019-12-04 20:52:31 +01:00
|
|
|
pub fn pattern(s: impl Into<String>) -> UntaggedValue {
|
|
|
|
UntaggedValue::Primitive(Primitive::String(s.into()))
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating filepath values
|
2019-12-04 20:52:31 +01:00
|
|
|
pub fn path(s: impl Into<PathBuf>) -> UntaggedValue {
|
|
|
|
UntaggedValue::Primitive(Primitive::Path(s.into()))
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating bytesize values
|
2019-12-04 20:52:31 +01:00
|
|
|
pub fn bytes(s: impl Into<u64>) -> UntaggedValue {
|
|
|
|
UntaggedValue::Primitive(Primitive::Bytes(s.into()))
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating decimal values
|
2019-12-04 20:52:31 +01:00
|
|
|
pub fn decimal(s: impl Into<BigDecimal>) -> UntaggedValue {
|
|
|
|
UntaggedValue::Primitive(Primitive::Decimal(s.into()))
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating binary (non-text) buffer values
|
2019-12-04 20:52:31 +01:00
|
|
|
pub fn binary(binary: Vec<u8>) -> UntaggedValue {
|
|
|
|
UntaggedValue::Primitive(Primitive::Binary(binary))
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating range values
|
2019-12-04 22:14:52 +01:00
|
|
|
pub fn range(
|
|
|
|
left: (Spanned<Primitive>, RangeInclusion),
|
|
|
|
right: (Spanned<Primitive>, RangeInclusion),
|
|
|
|
) -> UntaggedValue {
|
|
|
|
UntaggedValue::Primitive(Primitive::Range(Box::new(Range::new(left, right))))
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating boolean values
|
2019-12-04 20:52:31 +01:00
|
|
|
pub fn boolean(s: impl Into<bool>) -> UntaggedValue {
|
|
|
|
UntaggedValue::Primitive(Primitive::Boolean(s.into()))
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating date duration values
|
2020-04-18 03:50:58 +02:00
|
|
|
pub fn duration(secs: i64) -> UntaggedValue {
|
2019-12-04 20:52:31 +01:00
|
|
|
UntaggedValue::Primitive(Primitive::Duration(secs))
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating datatime values
|
2019-12-04 20:52:31 +01:00
|
|
|
pub fn system_date(s: SystemTime) -> UntaggedValue {
|
|
|
|
UntaggedValue::Primitive(Primitive::Date(s.into()))
|
|
|
|
}
|
|
|
|
|
2020-02-13 16:47:04 +01:00
|
|
|
pub fn date(d: impl Into<DateTime<Utc>>) -> UntaggedValue {
|
|
|
|
UntaggedValue::Primitive(Primitive::Date(d.into()))
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Helper for creating the Nothing value
|
2019-12-04 20:52:31 +01:00
|
|
|
pub fn nothing() -> UntaggedValue {
|
|
|
|
UntaggedValue::Primitive(Primitive::Nothing)
|
|
|
|
}
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// The fundamental structured value that flows through the pipeline, with associated metadata
|
2019-12-31 05:05:02 +01:00
|
|
|
#[derive(Debug, Clone, PartialOrd, PartialEq, Ord, Eq, Hash, Serialize, Deserialize)]
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub struct Value {
|
|
|
|
pub value: UntaggedValue,
|
|
|
|
pub tag: Tag,
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Overload deferencing to give back the UntaggedValue inside of a Value
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
impl std::ops::Deref for Value {
|
|
|
|
type Target = UntaggedValue;
|
|
|
|
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
|
|
&self.value
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Value {
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Get the corresponding anchor (originating location) for the Value
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub fn anchor(&self) -> Option<AnchorLocation> {
|
|
|
|
self.tag.anchor()
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Get the name (url, filepath, etc) behind an anchor for the Value
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub fn anchor_name(&self) -> Option<String> {
|
|
|
|
self.tag.anchor_name()
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Get the metadata for the Value
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub fn tag(&self) -> Tag {
|
|
|
|
self.tag.clone()
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// View the Value as a string, if possible
|
2019-12-03 07:44:59 +01:00
|
|
|
pub fn as_string(&self) -> Result<String, ShellError> {
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
match &self.value {
|
2019-12-03 07:44:59 +01:00
|
|
|
UntaggedValue::Primitive(Primitive::String(string)) => Ok(string.clone()),
|
|
|
|
UntaggedValue::Primitive(Primitive::Line(line)) => Ok(line.clone() + "\n"),
|
2020-04-20 23:45:11 +02:00
|
|
|
UntaggedValue::Primitive(Primitive::Path(path)) => {
|
|
|
|
Ok(path.to_string_lossy().to_string())
|
|
|
|
}
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
_ => Err(ShellError::type_error("string", self.spanned_type_name())),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-21 18:30:58 +02:00
|
|
|
pub fn convert_to_string(&self) -> String {
|
|
|
|
match &self.value {
|
|
|
|
UntaggedValue::Primitive(Primitive::String(s)) => s.clone(),
|
|
|
|
UntaggedValue::Primitive(Primitive::Date(dt)) => dt.format("%Y-%b-%d").to_string(),
|
|
|
|
UntaggedValue::Primitive(Primitive::Boolean(x)) => format!("{}", x),
|
|
|
|
UntaggedValue::Primitive(Primitive::Decimal(x)) => format!("{}", x),
|
|
|
|
UntaggedValue::Primitive(Primitive::Int(x)) => format!("{}", x),
|
|
|
|
UntaggedValue::Primitive(Primitive::Bytes(x)) => format!("{}", x),
|
|
|
|
UntaggedValue::Primitive(Primitive::Path(x)) => format!("{}", x.display()),
|
|
|
|
UntaggedValue::Primitive(Primitive::ColumnPath(path)) => {
|
|
|
|
let joined = path
|
|
|
|
.iter()
|
|
|
|
.map(|member| match &member.unspanned {
|
|
|
|
UnspannedPathMember::String(name) => name.to_string(),
|
|
|
|
UnspannedPathMember::Int(n) => format!("{}", n),
|
|
|
|
})
|
|
|
|
.join(".");
|
|
|
|
|
|
|
|
if joined.contains(' ') {
|
|
|
|
format!("\"{}\"", joined)
|
|
|
|
} else {
|
|
|
|
joined
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
_ => String::from(""),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-09 19:15:47 +02:00
|
|
|
pub fn format(&self, fmt: &str) -> Result<String, ShellError> {
|
|
|
|
match &self.value {
|
|
|
|
UntaggedValue::Primitive(Primitive::Date(dt)) => Ok(dt.format(fmt).to_string()),
|
|
|
|
_ => Err(ShellError::type_error("date", self.spanned_type_name())),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// View into the borrowed string contents of a Value, if possible
|
2019-12-02 17:14:05 +01:00
|
|
|
pub fn as_forgiving_string(&self) -> Result<&str, ShellError> {
|
|
|
|
match &self.value {
|
|
|
|
UntaggedValue::Primitive(Primitive::String(string)) => Ok(&string[..]),
|
|
|
|
_ => Err(ShellError::type_error("string", self.spanned_type_name())),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// View the Value as a path, if possible
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub fn as_path(&self) -> Result<PathBuf, ShellError> {
|
|
|
|
match &self.value {
|
|
|
|
UntaggedValue::Primitive(Primitive::Path(path)) => Ok(path.clone()),
|
2019-12-31 08:36:08 +01:00
|
|
|
UntaggedValue::Primitive(Primitive::String(path_str)) => Ok(PathBuf::from(&path_str)),
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
_ => Err(ShellError::type_error("Path", self.spanned_type_name())),
|
|
|
|
}
|
|
|
|
}
|
2019-12-04 22:14:52 +01:00
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// View the Value as a Primitive value, if possible
|
2019-12-04 22:14:52 +01:00
|
|
|
pub fn as_primitive(&self) -> Result<Primitive, ShellError> {
|
|
|
|
match &self.value {
|
|
|
|
UntaggedValue::Primitive(primitive) => Ok(primitive.clone()),
|
|
|
|
_ => Err(ShellError::type_error(
|
|
|
|
"Primitive",
|
|
|
|
self.spanned_type_name(),
|
|
|
|
)),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-12 10:34:41 +02:00
|
|
|
/// View the Value as a Primitive value, if possible
|
|
|
|
pub fn is_primitive(&self) -> bool {
|
|
|
|
match &self.value {
|
|
|
|
UntaggedValue::Primitive(_) => true,
|
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// View the Value as unsigned 64-bit, if possible
|
2019-12-04 22:14:52 +01:00
|
|
|
pub fn as_u64(&self) -> Result<u64, ShellError> {
|
|
|
|
match &self.value {
|
|
|
|
UntaggedValue::Primitive(primitive) => primitive.as_u64(self.tag.span),
|
|
|
|
_ => Err(ShellError::type_error("integer", self.spanned_type_name())),
|
|
|
|
}
|
|
|
|
}
|
2020-01-17 23:46:18 +01:00
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// View the Value as boolean, if possible
|
2020-01-17 23:46:18 +01:00
|
|
|
pub fn as_bool(&self) -> Result<bool, ShellError> {
|
|
|
|
match &self.value {
|
|
|
|
UntaggedValue::Primitive(Primitive::Boolean(p)) => Ok(*p),
|
|
|
|
_ => Err(ShellError::type_error("boolean", self.spanned_type_name())),
|
|
|
|
}
|
|
|
|
}
|
2020-04-26 19:30:52 +02:00
|
|
|
|
|
|
|
/// Returns an iterator of the values rows
|
|
|
|
pub fn table_entries(&self) -> TableValueIter<'_> {
|
|
|
|
crate::value::iter::table_entries(&self)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns an iterator of the value's cells
|
|
|
|
pub fn row_entries(&self) -> RowValueIter<'_> {
|
|
|
|
crate::value::iter::row_entries(&self)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns true if the value is empty
|
|
|
|
pub fn is_empty(&self) -> bool {
|
|
|
|
match &self {
|
|
|
|
Value {
|
|
|
|
value: UntaggedValue::Primitive(p),
|
|
|
|
..
|
|
|
|
} => p.is_empty(),
|
|
|
|
t
|
|
|
|
@
|
|
|
|
Value {
|
|
|
|
value: UntaggedValue::Table(_),
|
|
|
|
..
|
|
|
|
} => t.table_entries().all(|row| row.is_empty()),
|
|
|
|
r
|
|
|
|
@
|
|
|
|
Value {
|
|
|
|
value: UntaggedValue::Row(_),
|
|
|
|
..
|
|
|
|
} => r.row_entries().all(|(_, value)| value.is_empty()),
|
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
2020-05-27 06:50:26 +02:00
|
|
|
|
|
|
|
pub fn nothing() -> Value {
|
|
|
|
UntaggedValue::nothing().into_untagged_value()
|
|
|
|
}
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
}
|
|
|
|
|
2020-05-18 14:56:01 +02:00
|
|
|
impl From<String> for Value {
|
|
|
|
fn from(s: String) -> Value {
|
|
|
|
let end = s.len();
|
2020-01-24 20:16:41 +01:00
|
|
|
Value {
|
2020-05-18 14:56:01 +02:00
|
|
|
value: s.into(),
|
2020-01-24 20:16:41 +01:00
|
|
|
tag: Tag {
|
|
|
|
anchor: None,
|
|
|
|
span: Span::new(0, end),
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-18 14:56:01 +02:00
|
|
|
impl From<&str> for Value {
|
|
|
|
fn from(s: &str) -> Value {
|
|
|
|
let end = s.len();
|
|
|
|
Value {
|
|
|
|
value: s.into(),
|
|
|
|
tag: Tag {
|
|
|
|
anchor: None,
|
|
|
|
span: Span::new(0, end),
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> From<T> for UntaggedValue
|
|
|
|
where
|
|
|
|
T: Into<Primitive>,
|
|
|
|
{
|
|
|
|
/// Convert a Primitive to an UntaggedValue
|
|
|
|
fn from(input: T) -> UntaggedValue {
|
|
|
|
UntaggedValue::Primitive(input.into())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<ShellError> for UntaggedValue {
|
|
|
|
fn from(e: ShellError) -> Self {
|
|
|
|
UntaggedValue::Error(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<UntaggedValue> for Value {
|
|
|
|
/// Convert an UntaggedValue into a Value with a default tag
|
|
|
|
fn from(value: UntaggedValue) -> Value {
|
|
|
|
Value {
|
|
|
|
value,
|
|
|
|
tag: Tag::default(),
|
|
|
|
}
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-18 14:56:01 +02:00
|
|
|
impl From<Value> for UntaggedValue {
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Convert a Value into an UntaggedValue
|
2020-05-18 14:56:01 +02:00
|
|
|
fn from(v: Value) -> UntaggedValue {
|
|
|
|
v.value
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Convert a borrowed Value into a borrowed UntaggedValue
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
impl<'a> Into<&'a UntaggedValue> for &'a Value {
|
|
|
|
fn into(self) -> &'a UntaggedValue {
|
|
|
|
&self.value
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl HasSpan for Value {
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Return the corresponding Span for the Value
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
fn span(&self) -> Span {
|
|
|
|
self.tag.span
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl ShellTypeName for Value {
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Get the type name for the Value
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
fn type_name(&self) -> &'static str {
|
|
|
|
ShellTypeName::type_name(&self.value)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl ShellTypeName for UntaggedValue {
|
2020-01-18 20:42:36 +01:00
|
|
|
/// Get the type name for the UntaggedValue
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
fn type_name(&self) -> &'static str {
|
|
|
|
match &self {
|
|
|
|
UntaggedValue::Primitive(p) => p.type_name(),
|
|
|
|
UntaggedValue::Row(_) => "row",
|
|
|
|
UntaggedValue::Table(_) => "table",
|
|
|
|
UntaggedValue::Error(_) => "error",
|
|
|
|
UntaggedValue::Block(_) => "block",
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-19 00:46:00 +01:00
|
|
|
impl num_traits::Zero for Value {
|
|
|
|
fn zero() -> Self {
|
|
|
|
Value {
|
|
|
|
value: UntaggedValue::Primitive(Primitive::zero()),
|
|
|
|
tag: Tag::unknown(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn is_zero(&self) -> bool {
|
|
|
|
match &self.value {
|
|
|
|
UntaggedValue::Primitive(primitive) => primitive.is_zero(),
|
|
|
|
UntaggedValue::Row(row) => row.entries.is_empty(),
|
|
|
|
UntaggedValue::Table(rows) => rows.is_empty(),
|
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl std::ops::Mul for Value {
|
|
|
|
type Output = Self;
|
|
|
|
|
|
|
|
fn mul(self, rhs: Self) -> Self {
|
|
|
|
let tag = self.tag.clone();
|
|
|
|
|
|
|
|
match (&*self, &*rhs) {
|
|
|
|
(UntaggedValue::Primitive(left), UntaggedValue::Primitive(right)) => {
|
|
|
|
let left = left.clone();
|
|
|
|
let right = right.clone();
|
|
|
|
|
|
|
|
UntaggedValue::from(left.mul(right)).into_value(tag)
|
|
|
|
}
|
|
|
|
(_, _) => unimplemented!("Internal error: can't multiply non-primitives."),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl std::ops::Add for Value {
|
|
|
|
type Output = Self;
|
|
|
|
|
|
|
|
fn add(self, rhs: Self) -> Self {
|
|
|
|
let tag = self.tag.clone();
|
|
|
|
|
|
|
|
match (&*self, &*rhs) {
|
|
|
|
(UntaggedValue::Primitive(left), UntaggedValue::Primitive(right)) => {
|
|
|
|
let left = left.clone();
|
|
|
|
let right = right.clone();
|
|
|
|
|
|
|
|
UntaggedValue::from(left.add(right)).into_value(tag)
|
|
|
|
}
|
2020-05-24 02:08:39 +02:00
|
|
|
(_, _) => UntaggedValue::Error(ShellError::unimplemented("Can't add non-primitives."))
|
|
|
|
.into_value(tag),
|
2020-03-19 00:46:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-08 06:33:30 +01:00
|
|
|
pub fn merge_descriptors(values: &[Value]) -> Vec<String> {
|
|
|
|
let mut ret: Vec<String> = vec![];
|
2020-05-11 04:47:27 +02:00
|
|
|
let value_column = "".to_string();
|
2020-03-08 06:33:30 +01:00
|
|
|
for value in values {
|
|
|
|
let descs = value.data_descriptors();
|
|
|
|
|
|
|
|
if descs.is_empty() {
|
|
|
|
if !ret.contains(&value_column) {
|
2020-05-11 04:47:27 +02:00
|
|
|
ret.push("".to_string());
|
2020-03-08 06:33:30 +01:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for desc in value.data_descriptors() {
|
|
|
|
if !ret.contains(&desc) {
|
|
|
|
ret.push(desc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ret
|
|
|
|
}
|