diff --git a/Cargo.lock b/Cargo.lock index 35473b0e..db2ca9f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,15 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "Ygen" -version = "0.1.1" -dependencies = [ - "logos", - "object", - "proc", -] - [[package]] name = "adler" version = "1.0.2" @@ -218,9 +209,9 @@ dependencies = [ name = "simplelang" version = "0.1.0" dependencies = [ - "Ygen", "logos", "unescaper", + "ygen", ] [[package]] @@ -291,11 +282,20 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "ygen" +version = "0.1.1" +dependencies = [ + "logos", + "object", + "proc", +] + [[package]] name = "ygen-mc" version = "0.1.0" dependencies = [ - "Ygen", + "ygen", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index ac0e8222..08a93d3a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,11 +6,11 @@ members = [ ] [workspace.dependencies] -Ygen = { path = "." } +ygen = { path = "." } proc = { path = "src/proc/."} [package] -name = "Ygen" +name = "ygen" version = "0.1.1" edition = "2021" authors = ["Cr0a3"] diff --git a/examples/helloworld.rs b/examples/helloworld.rs index eb5089f9..a0416fd6 100644 --- a/examples/helloworld.rs +++ b/examples/helloworld.rs @@ -1,5 +1,5 @@ use std::{error::Error, fs::OpenOptions, path::Path}; -use Ygen::{prelude::*, Support::ColorProfile, Target::initializeAllTargets}; +use ygen::{prelude::*, Support::ColorProfile, Target::initializeAllTargets}; pub fn main() -> Result<(), Box> { diff --git a/examples/obj.rs b/examples/obj.rs index 6a9bb651..0578b328 100644 --- a/examples/obj.rs +++ b/examples/obj.rs @@ -1,6 +1,6 @@ use std::{error::Error, fs::OpenOptions}; -use Ygen::{Obj::*, Target::Triple}; +use ygen::{Obj::*, Target::Triple}; fn main() -> Result<(), Box> { let mut obj = ObjectBuilder::new( diff --git a/examples/simple.rs b/examples/simple.rs index 8d30dd54..6581ffbb 100644 --- a/examples/simple.rs +++ b/examples/simple.rs @@ -1,5 +1,5 @@ use std::{error::Error, fs::OpenOptions, path::Path}; -use Ygen::{prelude::*, Support::ColorProfile, Target::initializeAllTargets}; +use ygen::{prelude::*, Support::ColorProfile, Target::initializeAllTargets}; pub fn main() -> Result<(), Box> { diff --git a/src/Target/x64/asm/instr.rs b/src/Target/x64/asm/instr.rs index 08a091eb..e6c97f25 100644 --- a/src/Target/x64/asm/instr.rs +++ b/src/Target/x64/asm/instr.rs @@ -621,7 +621,7 @@ pub enum Operand { Mem(MemOp), /// The link destination LinkDestination(String, i64), - //// For debugging pourpusis + /// For debugging Debug(String), } diff --git a/tools/simplelang/Cargo.toml b/tools/simplelang/Cargo.toml index 6abf57f5..00f81edd 100644 --- a/tools/simplelang/Cargo.toml +++ b/tools/simplelang/Cargo.toml @@ -8,6 +8,6 @@ name = "simplelang" path = "main.rs" [dependencies] -Ygen = { workspace = true } +ygen = { workspace = true } logos = "0.14.0" unescaper = "0.1.5" \ No newline at end of file diff --git a/tools/simplelang/ast.rs b/tools/simplelang/ast.rs index 34423c1b..3c5dcc7d 100644 --- a/tools/simplelang/ast.rs +++ b/tools/simplelang/ast.rs @@ -1,4 +1,4 @@ -use Ygen::IR::TypeMetadata; +use ygen::IR::TypeMetadata; #[derive(Debug, Clone, PartialEq, Eq)] diff --git a/tools/simplelang/codegen.rs b/tools/simplelang/codegen.rs index 6c2e1830..fce4c8fb 100644 --- a/tools/simplelang/codegen.rs +++ b/tools/simplelang/codegen.rs @@ -1,6 +1,6 @@ use std::collections::{HashMap, VecDeque}; -use Ygen::prelude::*; +use ygen::prelude::*; use crate::ast::*; diff --git a/tools/simplelang/macros.rs b/tools/simplelang/macros.rs index 54c8a9ba..ac65c0e7 100644 --- a/tools/simplelang/macros.rs +++ b/tools/simplelang/macros.rs @@ -14,7 +14,7 @@ macro_rules! expect { macro_rules! err { ($err_var:expr, $($arg:tt)+) => { $err_var = true; - use Ygen::Support::Colorize; + use ygen::Support::Colorize; eprintln!("{}: {}", "Error".red().bold(), format_args!($($arg)+)) }; } @@ -22,7 +22,7 @@ macro_rules! err { #[macro_export] macro_rules! warn { ($($arg:tt)+) => { - use Ygen::Support::Colorize; + use ygen::Support::Colorize; eprintln!("{}: {}", "Warning".yellow().bold(), format_args!($($arg)+)) }; } \ No newline at end of file diff --git a/tools/simplelang/main.rs b/tools/simplelang/main.rs index f0440528..bc31823b 100644 --- a/tools/simplelang/main.rs +++ b/tools/simplelang/main.rs @@ -1,6 +1,6 @@ use std::{error::Error, fs::{File, OpenOptions}, io::Read, process::exit}; use logos::Logos; -use Ygen::{prelude::*, Support::{Cli, ColorProfile, Colorize}, Target::initializeAllTargets}; +use ygen::{prelude::*, Support::{Cli, ColorProfile, Colorize}, Target::initializeAllTargets}; mod lexer; mod parser; diff --git a/tools/simplelang/parser.rs b/tools/simplelang/parser.rs index 0c7eb6fd..a17ff912 100644 --- a/tools/simplelang/parser.rs +++ b/tools/simplelang/parser.rs @@ -1,6 +1,6 @@ use std::collections::VecDeque; -use Ygen::IR::TypeMetadata; +use ygen::IR::TypeMetadata; use crate::lexer::Token; use crate::{ast::*, err, expect, warn}; diff --git a/tools/simplelang/semnatic.rs b/tools/simplelang/semnatic.rs index 27055339..901837ba 100644 --- a/tools/simplelang/semnatic.rs +++ b/tools/simplelang/semnatic.rs @@ -1,6 +1,6 @@ use std::collections::{HashMap, VecDeque}; -use Ygen::IR::TypeMetadata; +use ygen::IR::TypeMetadata; use crate::{ast::*, err, warn}; //use crate::macros::*; diff --git a/tools/ygen-mc/Cargo.toml b/tools/ygen-mc/Cargo.toml index 690aa0fc..54599859 100644 --- a/tools/ygen-mc/Cargo.toml +++ b/tools/ygen-mc/Cargo.toml @@ -8,4 +8,4 @@ name = "ygen-mc" path = "main.rs" [dependencies] -Ygen = { workspace = true } \ No newline at end of file +ygen = { workspace = true } \ No newline at end of file diff --git a/tools/ygen-mc/main.rs b/tools/ygen-mc/main.rs index dd312d8a..8a605b2e 100644 --- a/tools/ygen-mc/main.rs +++ b/tools/ygen-mc/main.rs @@ -1,9 +1,9 @@ #![allow(rustdoc::invalid_html_tags)] -//! # `ygen-mc`: Ygen machine code code playground +//! # `ygen-mc`: ygen machine code code playground //! With the ygen machine code playground you can play around with assembler instructions //! and see their opcodes.
-//! It's suppused to being the Ygen variant of the `llvm-mc` +//! It's suppused to being the ygen variant of the `llvm-mc` //! ### Usage //! **Options:**
//! @@ -19,10 +19,10 @@ use std::error::Error; -use Ygen::{self, Support::{ColorProfile, Colorize}, Target::{initializeAllTargets, Triple}}; +use ygen::{self, Support::{ColorProfile, Colorize}, Target::{initializeAllTargets, Triple}}; fn main() -> Result<(), Box> { - let mut cli = Ygen::Support::Cli::new( + let mut cli = ygen::Support::Cli::new( "ygen-mc", "Ygens machine code playground", "1.0", "Cr0a3" );