rename LR/PR to pl/pr

m-span · m-span · commit 461e64707df8 · 2024-06-19T20:20:12.000-04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lutra/lutra/src/compile.rs b/lutra/lutra/src/compile.rs
@@ -4,9 +4,10 @@ use std::str::FromStr;
 use anyhow::Result;
 use prqlc::ir::decl::RootModule;
 use prqlc::ir::pl::{Ident, Literal};
+
+use prqlc::parser_error::Error;
 use prqlc::sql::Dialect;
-use prqlc::{semantic, ErrorMessages};
-use prqlc::{Error, Errors, Options, SourceTree, Target, WithErrorInfo};
+use prqlc::{semantic, ErrorMessages, Errors, Options, SourceTree, Target, WithErrorInfo};
 
 use crate::project::{DatabaseModule, ProjectCompiled, ProjectDiscovered, SqliteConnectionParams};
 
diff --git a/lutra/lutra/src/editing.rs b/lutra/lutra/src/editing.rs
@@ -1,7 +1,7 @@
 use std::fs;
 
 use anyhow::Result;
-use prqlc::Error;
+use prqlc::parser_error::Error;
 
 use crate::ProjectCompiled;
 
diff --git a/lutra/lutra/src/execute.rs b/lutra/lutra/src/execute.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use prqlc::{ir::pl::Ident, Error};
+use prqlc::{ir::pl::Ident, parser_error::Error};
 
 use super::ProjectCompiled;
 
diff --git a/lutra/lutra/src/pull_schema.rs b/lutra/lutra/src/pull_schema.rs
@@ -3,7 +3,7 @@ use arrow::datatypes::{DataType, SchemaRef};
 use connector_arrow::api::SchemaGet;
 use itertools::Itertools;
 use prqlc::ast::{PrimitiveSet, Stmt, Ty, TyKind, TyTupleField, VarDef};
-use prqlc::{Error, WithErrorInfo};
+use prqlc::{parser_error::Error, WithErrorInfo};
 
 use crate::ProjectCompiled;
 
diff --git a/prqlc/bindings/prqlc-python/src/lib.rs b/prqlc/bindings/prqlc-python/src/lib.rs
@@ -148,7 +148,7 @@ impl CompileOptions {
 }
 
 fn convert_options(o: CompileOptions) -> Result<prqlc_lib::Options, prqlc_lib::ErrorMessages> {
-    use prqlc_lib::Error;
+    use prqlc_lib::parser_error::Error;
     let target = prqlc_lib::Target::from_str(&o.target).map_err(prqlc_lib::ErrorMessages::from)?;
 
     Ok(prqlc_lib::Options {
diff --git a/prqlc/prqlc-parser/src/error/parse_error.rs b/prqlc/prqlc-parser/src/error/parse_error.rs
@@ -4,7 +4,7 @@ use std::fmt::Display;
 use std::hash::Hash;
 
 use crate::error::{Error, ErrorSource, Reason, WithErrorInfo};
-use crate::lexer::LR::TokenKind;
+use crate::lexer::lr::TokenKind;
 use crate::span::Span;
 
 #[derive(Clone, Debug)]
diff --git a/prqlc/prqlc-parser/src/lexer/lr/mod.rs b/prqlc/prqlc-parser/src/lexer/lr/mod.rs
diff --git a/prqlc/prqlc-parser/src/lexer/lr/token.rs b/prqlc/prqlc-parser/src/lexer/lr/token.rs
diff --git a/prqlc/prqlc-parser/src/lexer/mod.rs b/prqlc/prqlc-parser/src/lexer/mod.rs
@@ -7,10 +7,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::error::{Error, ErrorSource, Reason, WithErrorInfo};
 use crate::lexer;
-use crate::lexer::LR::{Literal, Token, TokenKind, ValueAndUnit};
+use crate::lexer::lr::{Literal, Token, TokenKind, ValueAndUnit};
 use crate::span::Span;
 
-pub mod LR;
+pub mod lr;
 mod test_lexer;
 
 pub fn lex_string_recovery(source: &str, source_id: u16) -> (Option<Vec<Token>>, Vec<Error>) {
diff --git a/prqlc/prqlc-parser/src/lexer/test_lexer.rs b/prqlc/prqlc-parser/src/lexer/test_lexer.rs
@@ -3,7 +3,7 @@
 use insta::assert_debug_snapshot;
 use insta::assert_snapshot;
 
-use crate::lexer::LR::token::{Literal, TokenKind};
+use crate::lexer::lr::token::{Literal, TokenKind};
 use crate::lexer::{lexer, literal, quoted_string};
 use crate::TokenVec;
 
diff --git a/prqlc/prqlc-parser/src/lib.rs b/prqlc/prqlc-parser/src/lib.rs
@@ -1,13 +1,13 @@
 use crate::error::Error;
-use crate::lexer::LR::TokenKind;
+use crate::lexer::lr::TokenKind;
 use crate::parser::parse_lr_to_pr;
-use crate::parser::PR::Stmt;
+use crate::parser::pr::Stmt;
 
 pub use self::lexer::TokenVec;
 
-mod error;
-mod lexer;
-mod parser;
+pub mod error;
+pub mod lexer;
+pub mod parser;
 pub mod span;
 
 mod test;
diff --git a/prqlc/prqlc-parser/src/parser/common.rs b/prqlc/prqlc-parser/src/parser/common.rs
@@ -1,8 +1,8 @@
 use chumsky::prelude::*;
 
 use crate::error::parse_error::PError;
-use crate::lexer::LR::TokenKind;
-use crate::parser::PR::{Annotation, Expr, ExprKind, Stmt, StmtKind, Ty, TyKind};
+use crate::lexer::lr::TokenKind;
+use crate::parser::pr::{Annotation, Expr, ExprKind, Stmt, StmtKind, Ty, TyKind};
 use crate::span::Span;
 
 pub fn ident_part() -> impl Parser<TokenKind, String, Error = PError> {
diff --git a/prqlc/prqlc-parser/src/parser/expr.rs b/prqlc/prqlc-parser/src/parser/expr.rs
@@ -3,12 +3,12 @@ use std::collections::HashMap;
 use chumsky::prelude::*;
 
 use crate::error::parse_error::PError;
-use crate::lexer::LR::TokenKind;
+use crate::lexer::lr::{Literal, TokenKind};
 use crate::parser::common::{ctrl, ident_part, into_expr, keyword, new_line};
+use crate::parser::pr::ident::Ident;
+use crate::parser::pr::ops::{BinOp, UnOp};
+use crate::parser::pr::*;
 use crate::parser::types::type_expr;
-use crate::parser::PR::ident::Ident;
-use crate::parser::PR::ops::{BinOp, UnOp};
-use crate::parser::PR::*;
 use crate::span::Span;
 
 use super::interpolation;
diff --git a/prqlc/prqlc-parser/src/parser/interpolation.rs b/prqlc/prqlc-parser/src/parser/interpolation.rs
@@ -2,8 +2,8 @@ use chumsky::prelude::*;
 use itertools::Itertools;
 
 use crate::error::parse_error::{ChumError, PError};
-use crate::lexer::LR::TokenKind;
-use crate::parser::PR::*;
+use crate::lexer::lr::{Literal, TokenKind};
+use crate::parser::pr::*;
 use crate::span::{string_stream, Span};
 
 use super::common::into_expr;
diff --git a/prqlc/prqlc-parser/src/parser/mod.rs b/prqlc/prqlc-parser/src/parser/mod.rs
@@ -1,15 +1,15 @@
 use chumsky::{prelude::*, Stream};
 
 use crate::error::Error;
-use crate::lexer::LR::{Token, TokenKind};
-use crate::parser::PR::Stmt;
+use crate::lexer::lr::{Token, TokenKind};
+use crate::parser::pr::Stmt;
 use crate::span::Span;
 
-pub mod PR;
 mod common;
 mod expr;
-mod generic;
+pub mod generic;
 mod interpolation;
+pub mod pr;
 mod stmt;
 mod test_parser;
 mod types;
diff --git a/prqlc/prqlc-parser/src/parser/pr/expr.rs b/prqlc/prqlc-parser/src/parser/pr/expr.rs
@@ -1,11 +1,12 @@
 use std::collections::HashMap;
 
+use crate::lexer::lr::Literal;
 use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 
 use crate::parser::generic;
-use crate::parser::PR::ops::{BinOp, UnOp};
-use crate::parser::PR::{Literal, Ty};
+use crate::parser::pr::ops::{BinOp, UnOp};
+use crate::parser::pr::Ty;
 use crate::span::Span;
 
 impl Expr {
diff --git a/prqlc/prqlc-parser/src/parser/pr/ident.rs b/prqlc/prqlc-parser/src/parser/pr/ident.rs
diff --git a/prqlc/prqlc-parser/src/parser/pr/mod.rs b/prqlc/prqlc-parser/src/parser/pr/mod.rs
@@ -1,15 +1,21 @@
 //this exports everything within as if it was at the root.
 //eg: PR::expr::Expr becomes PR::Expr
 pub use expr::*;
+pub use ident::*;
+pub use ops::*;
 pub use stmt::*;
 pub use types::*;
 
 //re-export Literal from LR, since it's encapsulated in TyKind
-pub use crate::lexer::LR::Literal;
 
 pub mod expr;
 pub mod stmt;
 
 pub mod ident;
 pub mod ops;
 pub mod types;
+
+pub use crate::lexer::lr::Literal;
+pub use crate::lexer::lr::ValueAndUnit;
+pub use crate::parser::generic;
+pub use crate::span::Span;
diff --git a/prqlc/prqlc-parser/src/parser/pr/ops.rs b/prqlc/prqlc-parser/src/parser/pr/ops.rs
diff --git a/prqlc/prqlc-parser/src/parser/pr/stmt.rs b/prqlc/prqlc-parser/src/parser/pr/stmt.rs
@@ -4,8 +4,8 @@ use enum_as_inner::EnumAsInner;
 use semver::VersionReq;
 use serde::{Deserialize, Serialize};
 
-use crate::parser::PR::ident::Ident;
-use crate::parser::PR::{Expr, Ty};
+use crate::parser::pr::ident::Ident;
+use crate::parser::pr::{Expr, Ty};
 use crate::span::Span;
 
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize, Default)]
diff --git a/prqlc/prqlc-parser/src/parser/pr/types.rs b/prqlc/prqlc-parser/src/parser/pr/types.rs
@@ -1,9 +1,9 @@
+use crate::lexer::lr::Literal;
 use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 use strum::AsRefStr;
 
-use crate::parser::PR::ident::Ident;
-use crate::parser::PR::Literal;
+use crate::parser::pr::ident::Ident;
 use crate::span::Span;
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
diff --git a/prqlc/prqlc-parser/src/parser/stmt.rs b/prqlc/prqlc-parser/src/parser/stmt.rs
@@ -5,9 +5,9 @@ use itertools::Itertools;
 use semver::VersionReq;
 
 use crate::error::parse_error::PError;
-use crate::lexer::LR::TokenKind;
+use crate::lexer::lr::{Literal, TokenKind};
+use crate::parser::pr::*;
 use crate::parser::types::type_expr;
-use crate::parser::PR::*;
 
 use super::common::{ctrl, ident_part, into_stmt, keyword, new_line};
 use super::expr::{expr, expr_call, ident, pipeline};
diff --git a/prqlc/prqlc-parser/src/parser/test_parser.rs b/prqlc/prqlc-parser/src/parser/test_parser.rs
@@ -1,7 +1,7 @@
 #![cfg(test)]
 
 use crate::lexer::lex_source;
-use crate::lexer::LR::TokenKind;
+use crate::lexer::lr::TokenKind;
 use crate::parser::prepare_stream;
 use crate::span::Span;
 
diff --git a/prqlc/prqlc-parser/src/parser/types.rs b/prqlc/prqlc-parser/src/parser/types.rs
@@ -1,9 +1,9 @@
 use chumsky::prelude::*;
 
 use crate::error::parse_error::PError;
-use crate::lexer::LR::TokenKind;
+use crate::lexer::lr::TokenKind;
 use crate::parser::expr::ident;
-use crate::parser::PR::*;
+use crate::parser::pr::*;
 
 use super::common::*;
 
diff --git a/prqlc/prqlc-parser/src/test.rs b/prqlc/prqlc-parser/src/test.rs
@@ -4,7 +4,7 @@ use insta::{assert_debug_snapshot, assert_yaml_snapshot};
 use itertools::Itertools;
 
 use crate::error::Error;
-use crate::parser::PR::{Expr, FuncCall, Stmt};
+use crate::parser::pr::{Expr, FuncCall, Stmt};
 
 /// Helper that does not track source_ids
 fn parse_single(source: &str) -> Result<Vec<Stmt>, Vec<Error>> {
diff --git a/prqlc/prqlc/Cargo.toml b/prqlc/prqlc/Cargo.toml
@@ -30,7 +30,6 @@ cli = [
 ]
 default = ["cli"]
 serde_yaml = [
-  "prqlc-ast/serde_yaml",
   "prqlc-parser/serde_yaml",
   "dep:serde_yaml",
 ]
@@ -40,7 +39,6 @@ test-dbs = ["anyhow", "duckdb", "glob", "rusqlite", "tokio"]
 test-dbs-external = ["anyhow", "duckdb", "glob", "mysql", "pg_bigdecimal", "postgres", "rusqlite", "tiberius", "tokio", "tokio-util"]
 
 [dependencies]
-prqlc-ast = {path = "../prqlc-ast", version = "0.12.3"}
 prqlc-parser = {path = "../prqlc-parser", version = "0.12.3"}
 
 anstream = {version = "0.6.14", features = ["auto"]}
diff --git a/prqlc/prqlc/src/cli/docs_generator.rs b/prqlc/prqlc/src/cli/docs_generator.rs
@@ -1,4 +1,4 @@
-use prqlc_parser::ast::{stmt::StmtKind, ExprKind, Stmt, TyKind, VarDefKind};
+use prqlc::ast::{stmt::StmtKind, ExprKind, Stmt, TyKind, VarDefKind};
 
 /// Generate HTML documentation.
 // pub fn generate_html_docs(stmts: Vec<Stmt>) -> String {
diff --git a/prqlc/prqlc/src/codegen/ast.rs b/prqlc/prqlc/src/codegen/ast.rs
@@ -1,7 +1,6 @@
 use std::collections::HashSet;
 use std::sync::OnceLock;
 
-use prqlc_ast::expr::*;
 use regex::Regex;
 
 use super::{WriteOpt, WriteSource};
diff --git a/prqlc/prqlc/src/error_message.rs b/prqlc/prqlc/src/error_message.rs
@@ -8,7 +8,7 @@ use anstream::adapter::strip_str;
 use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
 use serde::Serialize;
 
-pub use crate::ir::Span;
+pub use crate::Span;
 use crate::{Error, Errors, MessageKind, SourceTree};
 
 #[derive(Clone, Serialize)]
diff --git a/prqlc/prqlc/src/ir/mod.rs b/prqlc/prqlc/src/ir/mod.rs
@@ -6,4 +6,4 @@ pub mod generic;
 pub mod pl;
 pub mod rq;
 
-pub use prqlc_ast::span::Span;
+pub use prqlc_parser::span::Span;
diff --git a/prqlc/prqlc/src/ir/pl/expr.rs b/prqlc/prqlc/src/ir/pl/expr.rs
@@ -1,12 +1,12 @@
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
-use prqlc_ast::token::Literal;
+
+use prqlc_parser::parser::generic;
 use serde::{Deserialize, Serialize};
 
 use super::{Lineage, TransformCall};
-use crate::ast::generic;
-use crate::ast::{GenericTypeParam, Ident, Span, Ty};
+use crate::ast::{GenericTypeParam, Ident, Literal, Span, Ty};
 use crate::codegen::write_ty;
 
 // The following code is tested by the tests_misc crate to match expr.rs in prqlc_ast.
diff --git a/prqlc/prqlc/src/ir/pl/extra.rs b/prqlc/prqlc/src/ir/pl/extra.rs
@@ -1,10 +1,9 @@
 use enum_as_inner::EnumAsInner;
-use prqlc_ast::Ident;
 use serde::{Deserialize, Serialize};
 
 use crate::ast::Ty;
 use crate::ir::generic::WindowKind;
-use crate::ir::pl::{Expr, ExprKind, Func, FuncCall, Range};
+use crate::ir::pl::{Expr, ExprKind, Func, FuncCall, Ident, Range};
 
 impl FuncCall {
     pub fn new_simple(name: Expr, args: Vec<Expr>) -> Self {
diff --git a/prqlc/prqlc/src/ir/pl/mod.rs b/prqlc/prqlc/src/ir/pl/mod.rs
@@ -21,7 +21,8 @@ pub use self::fold::*;
 pub use self::lineage::*;
 pub use self::stmt::*;
 pub use self::utils::*;
-pub use crate::ast::{BinOp, BinaryExpr, Ident, Literal, UnOp, UnaryExpr, ValueAndUnit};
+pub use crate::ast::Literal;
+pub use crate::ast::{BinOp, BinaryExpr, Ident, UnOp, UnaryExpr};
 
 pub fn print_mem_sizes() {
     use std::mem::size_of;
diff --git a/prqlc/prqlc/src/ir/pl/utils.rs b/prqlc/prqlc/src/ir/pl/utils.rs
@@ -1,5 +1,5 @@
 use super::{Expr, ExprKind, FuncCall};
-use crate::ast::expr::Ident;
+use crate::ast::Ident;
 
 pub fn maybe_binop(left: Option<Expr>, op_name: &[&str], right: Option<Expr>) -> Option<Expr> {
     match (left, right) {
diff --git a/prqlc/prqlc/src/ir/rq/expr.rs b/prqlc/prqlc/src/ir/rq/expr.rs
@@ -1,9 +1,9 @@
 use enum_as_inner::EnumAsInner;
+use prqlc_parser::lexer::lr::Literal;
 use serde::{Deserialize, Serialize};
 
-use super::super::pl::Literal;
 use super::CId;
-use crate::Span;
+use crate::{ast, Span};
 
 /// Analogous to [crate::ir::pl::Expr], but with fewer kinds.
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
@@ -12,9 +12,9 @@ pub struct Expr {
     pub span: Option<Span>,
 }
 
-pub(super) type Range = crate::ast::generic::Range<Expr>;
-pub(super) type InterpolateItem = crate::ast::generic::InterpolateItem<Expr>;
-pub(super) type SwitchCase = crate::ast::generic::SwitchCase<Expr>;
+pub(super) type Range = ast::generic::Range<Expr>;
+pub(super) type InterpolateItem = ast::generic::InterpolateItem<Expr>;
+pub(super) type SwitchCase = ast::generic::SwitchCase<Expr>;
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, EnumAsInner)]
 pub enum ExprKind {
diff --git a/prqlc/prqlc/src/ir/rq/mod.rs b/prqlc/prqlc/src/ir/rq/mod.rs
@@ -13,12 +13,13 @@ pub use expr::{Expr, ExprKind, UnOp};
 use expr::{InterpolateItem, Range, SwitchCase};
 pub use fold::*;
 pub use ids::*;
+use prqlc_parser::lexer::lr::Literal;
 use serde::{Deserialize, Serialize};
 pub use transform::*;
 pub use utils::*;
 
+use super::pl::QueryDef;
 use super::pl::TableExternRef;
-use super::pl::{Literal, QueryDef};
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
 pub struct RelationalQuery {
diff --git a/prqlc/prqlc/src/lib.rs b/prqlc/prqlc/src/lib.rs
diff --git a/prqlc/prqlc/src/semantic/ast_expand.rs b/prqlc/prqlc/src/semantic/ast_expand.rs
diff --git a/prqlc/prqlc/src/semantic/eval.rs b/prqlc/prqlc/src/semantic/eval.rs
diff --git a/prqlc/prqlc/src/semantic/lowering.rs b/prqlc/prqlc/src/semantic/lowering.rs
diff --git a/prqlc/prqlc/src/sql/gen_expr.rs b/prqlc/prqlc/src/sql/gen_expr.rs
diff --git a/prqlc/prqlc/src/sql/srq/ast.rs b/prqlc/prqlc/src/sql/srq/ast.rs
diff --git a/prqlc/prqlc/tests/integration/queries.rs b/prqlc/prqlc/tests/integration/queries.rs
diff --git a/prqlc/prqlc/tests/integration/resolving.rs b/prqlc/prqlc/tests/integration/resolving.rs
diff --git a/prqlc/prqlc/tests/integration/static_eval.rs b/prqlc/prqlc/tests/integration/static_eval.rs

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ impl CompileOptions {`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`fn convert_options(o: CompileOptions) -> Result<prqlc_lib::Options, prqlc_lib::ErrorMessages> {`
`151`		`- use prqlc_lib::Error;`
	`151`	`+ use prqlc_lib::parser_error::Error;`
`152`	`152`	`let target = prqlc_lib::Target::from_str(&o.target).map_err(prqlc_lib::ErrorMessages::from)?;`
`153`	`153`
`154`	`154`	`Ok(prqlc_lib::Options {`