holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove old nushell/merge engine-q

Browse Source
This commit is contained in:
JT
2022-02-07 14:54:06 -05:00
parent 10c4c50f1f
commit d70d91e559
430 changed files with 14543 additions and 7865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
crates/nu-parser/Cargo.toml
View File

@ -1,33 +1,6 @@
[package]
<<<<<<< HEAD
authors = ["The Nu Project Contributors"]
description = "Nushell parser"
edition = "2018"
license = "MIT"
name = "nu-parser"
version = "0.43.0"
[dependencies]
bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
derive-new = "0.5.8"
indexmap = { version="1.6.1", features=["serde-1"] }
log = "0.4"
num-bigint = { version="0.4.3", features=["serde"] }
itertools = "0.10.0"
smart-default = "0.6.0"
nu-errors = { version = "0.43.0", path="../nu-errors" }
nu-data = { version = "0.43.0", path="../nu-data" }
nu-path = { version = "0.43.0", path="../nu-path" }
nu-protocol = { version = "0.43.0", path="../nu-protocol" }
nu-source = { version = "0.43.0", path="../nu-source" }
nu-test-support = { version = "0.43.0", path="../nu-test-support" }
[features]
stable = []
=======
name = "nu-parser"
version = "0.1.0"
version = "0.59.0"
edition = "2021"
[dependencies]
@ -35,10 +8,9 @@ miette = "3.0.0"
thiserror = "1.0.29"
serde_json = "1.0"
nu-path = {path = "../nu-path"}
nu-protocol = { path = "../nu-protocol"}
nu-plugin = { path = "../nu-plugin", optional = true }
nu-protocol = { path = "../nu-protocol", version = "0.59.0" }
nu-plugin = { path = "../nu-plugin", optional = true, version = "0.59.0" }
log = "0.4"
[features]
plugin = ["nu-plugin"]
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce

21
crates/nu-parser/src/errors.rs
View File

@ -1,23 +1,3 @@
<<<<<<< HEAD
// use std::fmt::Debug;
// A combination of an informative parse error, and what has been successfully parsed so far
// #[derive(Debug)]
// pub struct ParseError {
// /// An informative cause for this parse error
// pub cause: nu_errors::ParseError,
// // /// What has been successfully parsed, if anything
// // pub partial: Option<T>,
// }
// pub type ParseResult<T> = Result<T, ParseError<T>>;
// impl<T: Debug> From<ParseError<T>> for nu_errors::ShellError {
// fn from(e: ParseError<T>) -> Self {
// e.cause.into()
// }
// }
=======
use miette::Diagnostic;
use nu_protocol::{Span, Type};
use thiserror::Error;
@ -237,4 +217,3 @@ pub enum ParseError {
#[diagnostic()]
LabeledError(String, String, #[label("{1}")] Span),
}
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce

18
crates/nu-parser/src/lib.rs
View File

@ -1,20 +1,3 @@
<<<<<<< HEAD
#[macro_use]
extern crate derive_new;
mod errors;
mod flag;
mod lex;
mod parse;
mod scope;
mod shapes;
pub use lex::lexer::{lex, parse_block, NewlineMode};
pub use lex::tokens::{LiteBlock, LiteCommand, LiteGroup, LitePipeline};
pub use parse::{classify_block, garbage, parse, parse_full_column_path, parse_math_expression};
pub use scope::ParserScope;
pub use shapes::shapes;
=======
mod errors;
mod flatten;
mod lex;
@ -34,4 +17,3 @@ pub use parser::{find_captures_in_expr, parse, parse_block, trim_quotes, Import}
#[cfg(feature = "plugin")]
pub use parse_keywords::parse_register;
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce