Reorganizing ligen-parser to match ligen-generator API

Cargo.toml

@@ -3,7 +3,8 @@ members = [
     "ligen",
     "ligen/common",
     "ligen/ir",
-    "ligen/parsing",
+    "ligen/parser",
+    "ligen/generator",
     "ligen/utils",
     "ligen/traits",
     "ecosystem/python/parser",
@@ -34,7 +35,8 @@ ligen                  = { path = "ligen" }
 ligen-common           = { path = "ligen/common" }
 ligen-ir               = { path = "ligen/ir" }
 ligen-macro            = { path = "ligen/macro" }
-ligen-parsing          = { path = "ligen/parsing" }
+ligen-parser           = { path = "ligen/parser" }
+ligen-generator        = { path = "ligen/generator" }
 ligen-traits           = { path = "ligen/traits" }
 ligen-utils            = { path = "ligen/utils" }
 #ligen-c                = { path = "ecosystem/c/generator" }

ecosystem/python/parser/src/function/method.rs

@@ -1,4 +1,4 @@
-use ligen::parsing::parser::ParserConfig;
+use ligen::parser::ParserConfig;
 use rustpython_parser::ast::{StmtAsyncFunctionDef, StmtFunctionDef};
 use ligen::ir::{Method, Mutability};
 use crate::parser::PythonParser;

ecosystem/python/parser/src/function/mod.rs

@@ -2,7 +2,7 @@ pub mod parameter;
 pub mod method;
 
 use crate::prelude::*;
-use ligen::parsing::parser::ParserConfig;
+use ligen::parser::ParserConfig;
 use rustpython_parser::ast::{Arguments, Expr, Stmt, StmtAsyncFunctionDef, StmtFunctionDef};
 use ligen::ir::{Function, Synchrony, Visibility, Parameter, Type};
 use crate::function::parameter::ParameterParser;
@@ -85,7 +85,7 @@ impl FunctionParser {
 mod test {
     use crate::function::FunctionParser;
     use ligen::prelude::*;
-    use ligen::parsing::assert::assert_eq;
+    use ligen::parser::assert::assert_eq;
     use ligen_ir::function::mock;
 
     #[test]

ecosystem/python/parser/src/function/parameter.rs

@@ -1,4 +1,4 @@
-use ligen::parsing::parser::ParserConfig;
+use ligen::parser::ParserConfig;
 use rustpython_parser::ast::ArgWithDefault;
 use ligen::ir::Parameter;
 use crate::identifier::IdentifierParser;

ecosystem/python/parser/src/identifier.rs

@@ -1,6 +1,6 @@
 use ligen::ir::{Identifier, Mutability};
-use ligen::parsing::parser::{Parser, ParserConfig};
-use ligen::parsing::parser::universal::identifier::IdentifierParser as InternalParser;
+use ligen::parser::{Parser, ParserConfig};
+use ligen::parser::universal::identifier::IdentifierParser as InternalParser;
 use crate::prelude::*;
 
 #[derive(Default)]

ecosystem/python/parser/src/interface.rs

@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use ligen::parsing::parser::ParserConfig;
+use ligen::parser::ParserConfig;
 use rustpython_parser::ast::StmtClassDef;
 use ligen::ir::Interface;
 use crate::identifier::IdentifierParser;

ecosystem/python/parser/src/lib.rs

@@ -8,4 +8,5 @@ pub mod literal;
 pub mod scope;
 pub mod interface;
 pub mod object;
-pub mod parser;
+mod parser;
+pub use parser::*;

ecosystem/python/parser/src/literal.rs

@@ -1,12 +1,12 @@
 use rustpython_parser::ast::{Constant, ExprConstant};
 use ligen::ir::Literal;
-use ligen::parsing::parser::{Parser, ParserConfig};
+use ligen::parser::{Parser, ParserConfig};
 use crate::prelude::*;
 
 #[derive(Default)]
 pub struct LiteralParser;
 
-impl ligen::parsing::parser::universal::literal::LiteralParser for LiteralParser {}
+impl ligen::parser::universal::literal::LiteralParser for LiteralParser {}
 
 impl Parser<String> for LiteralParser {
     type Output = Literal;
@@ -45,7 +45,7 @@ mod test {
     use crate::literal::LiteralParser;
     use crate::prelude::*;
     use ligen::ir::literal::mock;
-    use ligen::parsing::assert::*;
+    use ligen::parser::assert::*;
 
     #[test]
     fn literal_string() -> Result<()> {

ecosystem/python/parser/src/macro_attributes/attributes/attribute.rs

@@ -1,2 +1,2 @@
 use crate::literal::LiteralParser;
-pub type AttributeParser = ligen::parsing::parser::universal::attributes::attribute::AttributeParser<LiteralParser>;
+pub type AttributeParser = ligen::parser::universal::attributes::attribute::AttributeParser<LiteralParser>;

ecosystem/python/parser/src/macro_attributes/attributes/mod.rs

@@ -2,7 +2,7 @@ pub mod attribute;
 
 use crate::prelude::*;
 use crate::literal::LiteralParser;
-use ligen::parsing::parser::{universal::attributes::AttributesParser as InternalParser, ParserConfig};
+use ligen::parser::{universal::attributes::AttributesParser as InternalParser, ParserConfig};
 use ligen::ir::Attributes;
 use rustpython_parser::ast::{Expr, Ranged};
 

ecosystem/python/parser/src/module/mod.rs

@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use ligen::{ir::Module, parsing::parser::ParserConfig};
+use ligen::{ir::Module, parser::ParserConfig};
 use rustpython_parser::ast::ModModule;
 use crate::parser::PythonParser;
 

ecosystem/python/parser/src/object.rs

@@ -1,4 +1,4 @@
-use ligen::parsing::parser::ParserConfig;
+use ligen::parser::ParserConfig;
 use rustpython_parser::ast::{Expr, StmtAnnAssign, StmtAssign, StmtAugAssign};
 use ligen::ir::Object;
 use crate::identifier::IdentifierParser;

ecosystem/python/parser/src/parser/config.rs

@@ -1,4 +1,4 @@
-use ligen::parsing::parser::{ParserConfigSet, ParserConfigGet, ParserConfig};
+use ligen::parser::{ParserConfigSet, ParserConfigGet, ParserConfig};
 
 use crate::prelude::*;
 

ecosystem/python/parser/src/parser/mod.rs

@@ -8,7 +8,7 @@ pub mod config;
 pub use config::*;
 
 use ligen::ir::Library;
-use ligen::parsing::parser::ParserConfig;
+use ligen::parser::ParserConfig;
 
 #[derive(Default)]
 pub struct PythonParser {

ecosystem/python/parser/src/prelude.rs

@@ -1,5 +1,5 @@
-pub(crate) use ligen::parsing::parser::Parser;
-pub(crate) use ligen::parsing::utils::WithSource;
+pub(crate) use ligen::parser::Parser;
+pub(crate) use ligen::parser::utils::WithSource;
 pub(crate) use ligen::prelude::*;
 pub(crate) use rustpython_parser::Mode;
 pub(crate) use rustpython_parser::{parse, Parse};

ecosystem/python/parser/src/scope/mod.rs

@@ -1,7 +1,7 @@
 mod scope_type;
 
 use rustpython_parser::ast::{Arguments, Expr, Stmt};
-use ligen::{ir::{Interface, Object, Function, Method, TypeDefinition}, parsing::parser::ParserConfig};
+use ligen::{ir::{Interface, Object, Function, Method, TypeDefinition}, parser::ParserConfig};
 use crate::{prelude::*, parser::PythonParserConfig};
 
 pub use scope_type::*;

ecosystem/python/parser/src/types/type_.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use rustpython_parser::ast::{ExprName, Expr, ExprSubscript, ExprTuple};
-use ligen::{ir::Type, parsing::parser::ParserConfig};
+use ligen::{ir::Type, parser::ParserConfig};
 use crate::prelude::*;
 
 pub struct TypeParser {

ecosystem/python/parser/src/types/type_definition.rs

@@ -1,5 +1,5 @@
 use crate::{prelude::*, identifier::IdentifierParser, macro_attributes::attributes::AttributesParser, function::FunctionParser, types::type_::TypeParser, parser::PythonParserConfig};
-use ligen::{ir::{TypeDefinition, Visibility, Path, KindDefinition, Structure, Attribute, Field}, parsing::parser::ParserConfig};
+use ligen::{ir::{TypeDefinition, Visibility, Path, KindDefinition, Structure, Attribute, Field}, parser::ParserConfig};
 use ligen::ir::macro_attributes::Group;
 use rustpython_parser::ast::{StmtClassDef, Expr, Stmt, StmtAnnAssign, StmtAugAssign, StmtAssign};
 

ecosystem/rust/cargo/Cargo.toml

@@ -9,6 +9,6 @@ license.workspace = true
 ligen-ir.workspace          = true
 ligen-traits.workspace      = true
 ligen-utils.workspace       = true
-ligen-parsing.workspace     = true
+ligen-parser.workspace      = true
 ligen-rust-parser.workspace = true
 cargo_toml = "0.16.0"

ecosystem/rust/cargo/src/parser/library.rs

@@ -1,8 +1,8 @@
 use ligen_ir::Identifier;
 use ligen_ir::prelude::*;
 use ligen_ir::Library;
-use ligen_parsing::parser::Parser;
-use ligen_parsing::parser::ParserConfig;
+use ligen_parser::Parser;
+use ligen_parser::ParserConfig;
 use ligen_rust_parser::module::ModuleParser;
 
 pub struct LibraryParser;

ecosystem/rust/parser/src/function/method.rs

@@ -2,7 +2,7 @@ use ligen::ir::Mutability;
 use crate::prelude::*;
 
 use ligen::ir::{Attributes, Method, Parameter, Type};
-use ligen::parsing::parser::{Parser, ParserConfig};
+use ligen::parser::{Parser, ParserConfig};
 use crate::function::parameter::ParameterParser;
 use crate::function::SynchronyParser;
 use crate::identifier::IdentifierParser;

ecosystem/rust/parser/src/function/mod.rs

@@ -1,7 +1,7 @@
 use crate::prelude::*;
 
 use ligen::ir::{Function, Parameter, Type};
-use ligen::parsing::parser::{Parser, ParserConfig};
+use ligen::parser::{Parser, ParserConfig};
 use crate::function::parameter::ParameterParser;
 use crate::identifier::IdentifierParser;
 use crate::macro_attributes::attributes::AttributesParser;
@@ -90,7 +90,7 @@ impl Parser<&str> for FunctionParser {
 
 #[cfg(test)]
 mod test {
-    use ligen::parsing::assert::assert_eq;
+    use ligen::parser::assert::assert_eq;
     use crate::function::FunctionParser;
     use crate::prelude::*;
 

ecosystem/rust/parser/src/function/parameter.rs

@@ -2,7 +2,7 @@
 
 use crate::prelude::*;
 use ligen::ir::{Identifier, Reference, Type, Mutability, Parameter};
-use ligen::parsing::parser::{Parser, ParserConfig};
+use ligen::parser::{Parser, ParserConfig};
 use crate::identifier::IdentifierParser;
 use crate::macro_attributes::attributes::AttributesParser;
 use crate::types::TypeParser;
@@ -81,7 +81,7 @@ mod test {
     use crate::prelude::*;
 
     use ligen::ir::function::parameter::mock;
-    use ligen::parsing::assert::assert_eq;
+    use ligen::parser::assert::assert_eq;
 
     #[test]
     fn primitive_parameter() -> Result<()> {

ecosystem/rust/parser/src/function/synchrony.rs

@@ -1,5 +1,5 @@
 use ligen::ir::Synchrony;
-use ligen::parsing::parser::{Parser, ParserConfig};
+use ligen::parser::{Parser, ParserConfig};
 use crate::prelude::*;
 
 pub struct SynchronyParser;

ecosystem/rust/parser/src/identifier.rs

@@ -1 +1 @@
-pub type IdentifierParser = ligen::parsing::parser::universal::identifier::IdentifierParser;
+pub type IdentifierParser = ligen::parser::universal::identifier::IdentifierParser;

ecosystem/rust/parser/src/literal.rs

@@ -1,11 +1,11 @@
 use ligen::ir::Literal;
-use ligen::parsing::parser::{Parser, ParserConfig};
+use ligen::parser::{Parser, ParserConfig};
 use crate::prelude::*;
 
 #[derive(Default)]
 pub struct LiteralParser;
 
-impl ligen::parsing::parser::universal::literal::LiteralParser for LiteralParser {}
+impl ligen::parser::universal::literal::LiteralParser for LiteralParser {}
 
 impl Parser<syn::Lit> for LiteralParser {
     type Output = Literal;
@@ -67,7 +67,7 @@ mod test {
     use crate::literal::LiteralParser;
     use crate::prelude::*;
     use ligen::ir::literal::mock;
-    use ligen::parsing::assert::*;
+    use ligen::parser::assert::*;
 
     #[test]
     fn literal_verbatim() -> Result<()> {

ecosystem/rust/parser/src/macro_attributes/attributes/attribute.rs

@@ -2,13 +2,13 @@
 
 use crate::literal::LiteralParser;
 
-pub type AttributeParser = ligen::parsing::parser::universal::attributes::attribute::AttributeParser<LiteralParser>;
+pub type AttributeParser = ligen::parser::universal::attributes::attribute::AttributeParser<LiteralParser>;
 
 #[cfg(test)]
 mod test {
     use crate::prelude::*;
     use super::*;
-    use ligen::parsing::assert::assert_eq;
+    use ligen::parser::assert::assert_eq;
     use ligen::ir::attribute::mock;
 
     #[test]

ecosystem/rust/parser/src/macro_attributes/attributes/mod.rs

@@ -3,14 +3,14 @@ mod attribute;
 pub use attribute::*;
 
 use crate::literal::LiteralParser;
-pub type AttributesParser = ligen::parsing::parser::universal::attributes::AttributesParser<LiteralParser>;
+pub type AttributesParser = ligen::parser::universal::attributes::AttributesParser<LiteralParser>;
 
 #[cfg(test)]
 mod test {
     use crate::prelude::*;
     use super::*;
     use ligen::ir::attributes::mock;
-    use ligen::parsing::assert::assert_eq;
+    use ligen::parser::assert::assert_eq;
 
     #[test]
     fn parse_literals() -> Result<()> {

ecosystem/rust/parser/src/module/import.rs

@@ -2,7 +2,7 @@
 
 use crate::prelude::*;
 use ligen::ir::{Path, Attributes, Visibility, Import};
-use ligen::parsing::parser::{Parser, ParserConfig};
+use ligen::parser::{Parser, ParserConfig};
 use crate::identifier::IdentifierParser;
 use crate::macro_attributes::attributes::AttributesParser;
 use crate::visibility::VisibilityParser;
@@ -98,7 +98,7 @@ impl Parser<ImportsBuilder> for ImportsParser {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use ligen::parsing::assert::*;
+    use ligen::parser::assert::*;
     use ligen::ir::module::import::mock;
 
     #[test]

ecosystem/rust/parser/src/module/mod.rs

@@ -4,7 +4,7 @@ mod import;
 
 use syn::spanned::Spanned;
 use ligen::ir::Object;
-use ligen::parsing::parser::{Parser, ParserConfig};
+use ligen::parser::{Parser, ParserConfig};
 use crate::prelude::*;
 use ligen::ir::{Function, Module, Import, TypeDefinition, Interface};
 use crate::object::ObjectParser;
@@ -142,7 +142,7 @@ mod tests {
     use super::*;
     use quote::quote;
     use ligen::ir::module::mock;
-    use ligen::parsing::assert::*;
+    use ligen::parser::assert::*;
 
     #[test]
     fn module_file() -> Result<()> {

ecosystem/rust/parser/src/object.rs

@@ -1,5 +1,5 @@
 use ligen::ir::{Object, Mutability};
-use ligen::parsing::parser::{Parser, ParserConfig};
+use ligen::parser::{Parser, ParserConfig};
 use crate::identifier::IdentifierParser;
 use crate::literal::LiteralParser;
 use crate::prelude::*;
@@ -59,7 +59,7 @@ mod test {
     use crate::object::ObjectParser;
     use crate::prelude::*;
 
-    use ligen::parsing::assert::assert_eq;
+    use ligen::parser::assert::assert_eq;
     use ligen::ir::object::mock;
 
     #[test]

ecosystem/rust/parser/src/path.rs

@@ -1,5 +1,5 @@
 use ligen::ir::{Path, PathSegment};
-use ligen::parsing::parser::{Parser, ParserConfig};
+use ligen::parser::{Parser, ParserConfig};
 use crate::identifier::IdentifierParser;
 use crate::prelude::*;
 
@@ -55,7 +55,7 @@ mod test {
     use crate::path::PathParser;
     use crate::prelude::*;
 
-    use ligen::parsing::assert::*;
+    use ligen::parser::assert::*;
     use ligen::ir::path::mock;
 
     #[test]

ecosystem/rust/parser/src/prelude/mod.rs

@@ -1,6 +1,6 @@
 pub use ligen::common::*;
 pub use ligen::utils::prelude::*;
 pub use quote::{quote, TokenStreamExt};
-pub(crate) use ligen::parsing::parser::Parser;
+pub(crate) use ligen::parser::Parser;
 
 pub mod syn2;

ecosystem/rust/parser/src/types/generics.rs

@@ -1,5 +1,5 @@
 use ligen::ir::Generics;
-use ligen::parsing::parser::{Parser, ParserConfig};
+use ligen::parser::{Parser, ParserConfig};
 use crate::prelude::*;
 use crate::types::type_::TypeParser;