Merge pull request #9 from ian-h-chamberlain/develop

Add label support, CLI, and more

Author: ian-h-chamberlain

.travis.yml

@@ -0,0 +1,15 @@
+language: rust
+
+rust:
+  - stable
+  - beta
+  - nightly
+
+cache: cargo
+
+matrix:
+  allow_failures:
+    - rust: nightly
+    - rust: beta
+
+  fast_finish: true

Cargo.lock

@@ -9,3 +9,4 @@ itertools = "0.8.0"
 lazy_static = "1.2.0"
 pest_derive = "2.1.0"
 pest = "2.1.0"
+structopt = "0.2.15"

Cargo.toml

@@ -0,0 +1,34 @@
+use std::{error::Error, fs, path::PathBuf};
+
+use structopt::StructOpt;
+
+use crate::parser;
+
+#[derive(Debug, StructOpt)]
+/// Parse and save Redcode files
+struct CliOptions {
+    /// Input file
+    #[structopt(parse(from_os_str))]
+    input_file: PathBuf,
+
+    /// Output file; defaults to stdout
+    #[structopt(long, short, parse(from_os_str))]
+    output_file: Option<PathBuf>,
+}
+
+pub fn run() -> Result<(), Box<dyn Error>> {
+    let cli_options = CliOptions::from_args();
+
+    let input_program = fs::read_to_string(cli_options.input_file)?;
+
+    let parsed_input = parser::parse(input_program.as_str())?;
+    let parse_output = parsed_input.dump();
+
+    if let Some(output_path) = cli_options.output_file {
+        fs::write(output_path, parse_output)?;
+    } else {
+        println!("{}", parse_output);
+    };
+
+    Ok(())
+}

src/cli.rs

@@ -2,12 +2,16 @@ WHITESPACE = _{ " " | "\t" }
 
 COMMENT = @{ ";" ~ (!NEWLINE ~ ANY)* ~ &NEWLINE }
 
-AssemblyFile = { SOI ~ Line+ ~ EOI }
+File = { SOI ~ (Line ~ NEWLINE)+ ~ Line? ~ EOI }
 
-Line = { Instruction? ~ NEWLINE }
+Line = { LabelDeclaration* ~ Instruction? }
 
 Instruction = _{ Operation ~ Field ~ ("," ~ Field)? }
 
+LabelDeclaration = _{ !Operation ~ Label ~ (":")? }
+
+Label = @{ Alpha ~ Alphanumeral* }
+
 Operation = ${ Opcode ~ ("." ~ Modifier)? }
 
 Field = !{ AddressMode? ~ Expr }
@@ -22,6 +26,10 @@ Modifier = { ^"AB" | ^"BA" | ^"A" | ^"B" | ^"F" | ^"X" | ^"I" }
 
 AddressMode = { "#" | "$" | "*" | "@" | "{" | "<" | "}" | ">" }
 
-Expr = { Number }
+Expr = { Number | Label }
+
+Number = @{ ("-" | "+")? ~ ASCII_DIGIT+ }
+
+Alpha = _{ ASCII_ALPHA | "_" }
 
-Number = @{ ASCII_DIGIT+ }
+Alphanumeral = _{ ASCII_ALPHANUMERIC | "_" }

src/data/redcode.pest

@@ -5,12 +5,18 @@ extern crate pest_derive;
 // Extern crates
 extern crate itertools;
 extern crate pest;
+extern crate structopt;
 
+// Public modules
+pub mod cli;
+
+// Exported functions
 pub use parser::parse;
 
 // Modules requiring macro_use
 #[macro_use]
 mod util;
 
+// Private modules
 mod load_file;
 mod parser;