summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
Diffstat (limited to 'src/app')
-rw-r--r--src/app/init.rs108
-rw-r--r--src/app/main.rs32
-rw-r--r--src/app/new.rs37
-rw-r--r--src/app/print_help.rs33
-rw-r--r--src/app/print_version.rs12
-rw-r--r--src/app/run.rs41
6 files changed, 109 insertions, 154 deletions
diff --git a/src/app/init.rs b/src/app/init.rs
deleted file mode 100644
index 3375d09..0000000
--- a/src/app/init.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- Copyright 2023 Gabriel Bjørnager Jensen.
-
- This file is part of AAS.
-
- AAS is free software: you can redistribute it
- and/or modify it under the terms of the GNU
- General Public License as published by the Free
- Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- AAS is distributed in the hope that it will
- be useful, but WITHOUT ANY WARRANTY; without
- even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU
- General Public License along with AAS. If not,
- see <https://www.gnu.org/licenses/>.
-*/
-
-use crate::app::App;
-use crate::cpu::Cpu;
-use crate::format::Format;
-
-use std::env::args;
-use std::str::FromStr;
-
-macro_rules! use_remainder {
- ($destination: ident, $argument: expr, $index: expr) => {{
- let argument: &[char] = $argument;
- let index: usize = $index + 0x1;
-
- if argument.len() <= index {
- let c = argument[index - 0x1];
- Err(format!("missing value for short '{}'", c))
- } else {
- let value: String = argument[$index + 0x1..].iter().collect();
- $destination = Some(value);
-
- break;
- }
- }};
-}
-
-impl App {
- pub fn init() -> Result<Self, String> {
- if args().len() < 0x2 { Self::print_help() };
-
- let mut input: Option<String> = None;
- let mut output: Option<String> = None;
- let mut cpu: Option<String> = None;
- let mut format: Option<String> = None;
-
- let mut handle_short = |argument: &String| -> Result<(), String> {
- let argument: Vec<char> = argument.chars().collect();
-
- for (index, c) in argument.iter().enumerate().skip(0x1) {
- match c {
- 'f' => use_remainder!(format, &argument, index)?,
- 'h' => Self::print_help(),
- 'o' => use_remainder!(output, &argument, index)?,
- 'm' => use_remainder!(cpu, &argument, index)?,
- 'v' => Self::print_version(),
-
- _ => { return Err(format!("invalid short parameter '{c}'")) },
- };
- }
-
- return Ok(());
- };
-
- for argument in args().skip(0x1) {
- if argument.is_empty() { continue };
-
- if argument.chars().nth(0x0) != Some('-') {
- // This argument is the input path.
-
- if input.is_some() { return Err(format!("input pathy is already set (to \"{}\")", input.as_ref().unwrap())) };
-
- input = Some(argument.to_owned());
- continue;
- }
-
- handle_short(&argument)?;
- }
-
- // Check if any of the mandatory parameters have
- // been set.
- if input.is_none() { return Err("missing input path".to_string()) };
- if output.is_none() { output = Some("a.out".to_string()) };
- if cpu.is_none() { return Err("missing cpu".to_string()) };
-
- let format = match format {
- Some(format) => Format::from_str(&format)?,
- _ => Format::default(),
- };
-
- return Ok(Self {
- input: input.unwrap(),
- output: output.unwrap(),
-
- cpu: Cpu::from_str(&cpu.unwrap())?,
- format,
- });
- }
-}
diff --git a/src/app/main.rs b/src/app/main.rs
index bc99952..828abc8 100644
--- a/src/app/main.rs
+++ b/src/app/main.rs
@@ -1,48 +1,52 @@
/*
- Copyright 2023 Gabriel Bjørnager Jensen.
+ Copyright 2023-2024 Gabriel Bjørnager Jensen.
- This file is part of AAS.
+ This file is part of eAS.
- AAS is free software: you can redistribute it
+ eAS is free software: you can redistribute it
and/or modify it under the terms of the GNU
General Public License as published by the Free
Software Foundation, either version 3 of the
License, or (at your option) any later version.
- AAS is distributed in the hope that it will
+ eAS is distributed in the hope that it will
be useful, but WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU
- General Public License along with AAS. If not,
+ General Public License along with eAS. If not,
see <https://www.gnu.org/licenses/>.
*/
use crate::log;
use crate::app::App;
+use crate::configuration::Configuration;
use std::process::exit;
impl App {
pub fn main() -> ! {
- let app = match App::init() {
+ let configuration = match Configuration::from_arguments() {
Ok(app) => app,
- Err(message) => {
- log!(error, "{message}");
+ Err(error) => {
+ log!(error, error);
exit(0x1);
},
};
- exit(match app.run() {
- Err(message) => {
- log!(error, "{message}");
- 0x1
+ let app = App::new(configuration);
+ match app.run() {
+ Err(error) => {
+ log!(error, error);
+ exit(0x1);
},
- _ => 0x0,
- });
+ _ => {},
+ };
+
+ exit(0x0);
}
}
diff --git a/src/app/new.rs b/src/app/new.rs
new file mode 100644
index 0000000..d0325f8
--- /dev/null
+++ b/src/app/new.rs
@@ -0,0 +1,37 @@
+/*
+ Copyright 2023-2024 Gabriel Bjørnager Jensen.
+
+ This file is part of eAS.
+
+ eAS is free software: you can redistribute it
+ and/or modify it under the terms of the GNU
+ General Public License as published by the Free
+ Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ eAS is distributed in the hope that it will
+ be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU
+ General Public License along with eAS. If not,
+ see <https://www.gnu.org/licenses/>.
+*/
+
+use crate::app::App;
+use crate::configuration::Configuration;
+
+impl App {
+ pub fn new(configuration: Configuration) -> Self {
+ return Self {
+ input: configuration.input,
+ output: configuration.output,
+
+ encoding: configuration.encoding,
+ processor: configuration.processor,
+ format: configuration.format,
+ };
+ }
+}
diff --git a/src/app/print_help.rs b/src/app/print_help.rs
index 0499ee1..41006da 100644
--- a/src/app/print_help.rs
+++ b/src/app/print_help.rs
@@ -1,45 +1,52 @@
/*
- Copyright 2023 Gabriel Bjørnager Jensen.
+ Copyright 2023-2024 Gabriel Bjørnager Jensen.
- This file is part of AAS.
+ This file is part of eAS.
- AAS is free software: you can redistribute it
+ eAS is free software: you can redistribute it
and/or modify it under the terms of the GNU
General Public License as published by the Free
Software Foundation, either version 3 of the
License, or (at your option) any later version.
- AAS is distributed in the hope that it will
+ eAS is distributed in the hope that it will
be useful, but WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU
- General Public License along with AAS. If not,
+ General Public License along with eAS. If not,
see <https://www.gnu.org/licenses/>.
*/
use crate::app::App;
-use crate::cpu::Cpu;
+use crate::encoding::Encoding;
use crate::format::Format;
+use crate::processor::Processor;
use enum_iterator::all;
use std::process::exit;
impl App {
pub fn print_help() -> ! {
- println!("\u{1B}[1mUsage\u{1B}[0m: \u{1B}[1maas\u{1B}[0m \u{1B}[3m[options]\u{1B}[0m <input>");
+ println!("\u{1B}[1mUsage\u{1B}[0m: eas {{<options>}} <input>");
println!();
println!("\u{1B}[1mOptions\u{1B}[0m:");
- println!(" \u{1B}[1m-f\u{1B}[0m\u{1B}[3m<format>\u{1B}[0m set the target executable format (see below)");
- println!(" \u{1B}[1m-h\u{1B}[0m print help");
- println!(" \u{1B}[1m-m\u{1B}[0m\u{1B}[3m<target>\u{1B}[0m set the target cpu (see below)");
- println!(" \u{1B}[1m-v\u{1B}[0m print version");
+ println!(" \u{1B}[1m-c\u{1B}[0m\u{1B}[3m<encoding>\u{1B}[23m sets the expected input file encoding (character set) to \u{1B}[3mencoding\u{1B}[23m");
+ println!(" \u{1B}[1m-f\u{1B}[0m\u{1B}[3m<format>\u{1B}[23m sets the target executable format to \u{1B}[3mformat\u{1B}[23m");
+ println!(" \u{1B}[1m-m\u{1B}[0m\u{1B}[3m<processor>\u{1B}[23m sets the target processor (machine) to \u{1B}[3mmachine\u{1B}[23m");
+ println!();
+ println!(" \u{1B}[1m--help\u{1B}[0m prints help");
+ println!(" \u{1B}[1m--version\u{1B}[0m prints versioning");
+
+ println!();
+ println!("\u{1B}[1mEncodings\u{1B}[0m:");
+ for encoding in all::<Encoding>() { println!(" \u{1B}[3m{encoding}\u{1B}[0m") }
println!();
- println!("\u{1B}[1mCPUs\u{1B}[0m:");
- for cpu in all::<Cpu>() { println!(" \u{1B}[3m{cpu}\u{1B}[0m") }
+ println!("\u{1B}[1mProcessors\u{1B}[0m:");
+ for processor in all::<Processor>() { println!(" \u{1B}[3m{processor}\u{1B}[0m") }
println!();
println!("\u{1B}[1mFormats\u{1B}[0m:");
diff --git a/src/app/print_version.rs b/src/app/print_version.rs
index 73b0743..1f207ca 100644
--- a/src/app/print_version.rs
+++ b/src/app/print_version.rs
@@ -1,22 +1,22 @@
/*
- Copyright 2023 Gabriel Bjørnager Jensen.
+ Copyright 2023-2024 Gabriel Bjørnager Jensen.
- This file is part of AAS.
+ This file is part of eAS.
- AAS is free software: you can redistribute it
+ eAS is free software: you can redistribute it
and/or modify it under the terms of the GNU
General Public License as published by the Free
Software Foundation, either version 3 of the
License, or (at your option) any later version.
- AAS is distributed in the hope that it will
+ eAS is distributed in the hope that it will
be useful, but WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU
- General Public License along with AAS. If not,
+ General Public License along with eAS. If not,
see <https://www.gnu.org/licenses/>.
*/
@@ -27,7 +27,7 @@ use std::process::exit;
impl App {
pub fn print_version() -> ! {
- println!("\u{1B}[1maas\u{1B}[0m {:X}.{:X}.{:X}", VERSION.0, VERSION.1, VERSION.2);
+ println!("\u{1B}[1meAS\u{1B}[0m {:X}.{:X}.{:X}", VERSION.0, VERSION.1, VERSION.2);
println!("\u{1B}[3mCopyright \u{A9} 2023 Gabriel Bj\u{F8}rnager Jensen\u{1B}[0m.");
exit(0x0);
diff --git a/src/app/run.rs b/src/app/run.rs
index f2ef4a4..5e0d838 100644
--- a/src/app/run.rs
+++ b/src/app/run.rs
@@ -1,54 +1,69 @@
/*
- Copyright 2023 Gabriel Bjørnager Jensen.
+ Copyright 2023-2024 Gabriel Bjørnager Jensen.
- This file is part of AAS.
+ This file is part of eAS.
- AAS is free software: you can redistribute it
+ eAS is free software: you can redistribute it
and/or modify it under the terms of the GNU
General Public License as published by the Free
Software Foundation, either version 3 of the
License, or (at your option) any later version.
- AAS is distributed in the hope that it will
+ eAS is distributed in the hope that it will
be useful, but WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU
- General Public License along with AAS. If not,
+ General Public License along with eAS. If not,
see <https://www.gnu.org/licenses/>.
*/
use crate::app::App;
+use crate::error::Error;
+use crate::node::Node;
+use crate::source_location::SourceLocation;
use crate::token::Token;
use std::fs::read_to_string;
impl App {
#[must_use]
- pub fn run(self) -> Result<(), String> {
+ pub fn run(self) -> Result<(), Error> {
if cfg!(debug_assertions) {
println!("\u{1B}[1mSettings\u{1B}[0m:");
println!("\u{B7} input \u{1B}[3m\"{}\"\u{1B}[0m", self.input);
println!("\u{B7} output \u{1B}[3m\"{}\"\u{1B}[0m", self.output);
println!();
- println!("\u{B7} cpu \u{1B}[3m{}\u{1B}[0m", self.cpu);
- println!("\u{B7} format \u{1B}[3m{}\u{1B}[0m", self.format);
+ println!("\u{B7} encoding \u{1B}[3m{}\u{1B}[0m", self.encoding);
+ println!("\u{B7} processor \u{1B}[3m{}\u{1B}[0m", self.processor);
+ println!("\u{B7} format \u{1B}[3m{}\u{1B}[0m", self.format);
println!();
}
let input = match read_to_string(&self.input) {
Ok(content) => content,
- _ => return Err(format!("unable to read file \"{}\"", &self.input)),
+ _ => return Err(Error::AccessDenied(self.input.clone())),
};
- let tokens = Token::tokenise(&input)?;
+ let tokens = Token::tokenise(&input, &mut SourceLocation::new(&self.input))?;
- eprintln!("\u{1B}[1mTokens\u{1B}[0m:");
- for token in &tokens {
- eprintln!("\u{B7} {token:?}");
+ if cfg!(debug_assertions) {
+ eprintln!("\u{1B}[1mTokens\u{1B}[0m:");
+ for (location, token) in &tokens {
+ eprintln!("\u{B7} {location}: {token:?}");
+ }
+ }
+
+ let nodes = Node::parse(&tokens)?;
+
+ if cfg!(debug_assertions) {
+ eprintln!("\u{1B}[1mNodes\u{1B}[0m:");
+ for node in &nodes {
+ eprintln!("\u{B7} {node:?}");
+ }
}
return Ok(());
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 17:38:46 +0100