From ede4644dfbe71a441532b88a156684dbcc67d2a6 Mon Sep 17 00:00:00 2001
From: Garrit Franke <garritfranke@gmail.com>
Date: Thu, 17 Dec 2020 16:44:54 +0100
Subject: [PATCH] Move build command to own module

---
 src/command/build.rs | 56 ++++++++++++++++++++++++++++++++++++++++++++
 src/command/mod.rs   | 16 +++++++++++++
 src/main.rs          | 38 ++++--------------------------
 3 files changed, 76 insertions(+), 34 deletions(-)
 create mode 100644 src/command/build.rs
 create mode 100644 src/command/mod.rs

diff --git a/src/command/build.rs b/src/command/build.rs
new file mode 100644
index 0000000..7eae61b
--- /dev/null
+++ b/src/command/build.rs
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2020 Garrit Franke
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+use crate::generator;
+use crate::lexer;
+use crate::parser;
+use crate::Lib;
+use std::fs::File;
+use std::io::Read;
+use std::io::Write;
+use std::path::PathBuf;
+
+pub fn build(in_file: PathBuf, out_file: PathBuf) -> Result<(), String> {
+    let mut file = File::open(in_file).expect("Could not open file");
+    let mut contents = String::new();
+
+    file.read_to_string(&mut contents)
+        .expect("Could not read file");
+    let tokens = lexer::tokenize(&contents);
+    let mut program = parser::parse(tokens, Some(contents))?;
+
+    // C Backend currently does not support stdlib yet, since not all features are implemented
+    if cfg!(feature = "backend_node") {
+        let stdlib = build_stdlib();
+        program.merge_with(stdlib);
+    }
+
+    let output = generator::generate(program);
+    let mut file = std::fs::File::create(out_file).expect("create failed");
+    file.write_all(output.as_bytes()).expect("write failed");
+    file.flush().expect("Could not flush file");
+
+    Ok(())
+}
+
+fn build_stdlib() -> parser::node_type::Program {
+    let stdlib_raw =
+        Lib::get("stdio.sb").expect("Standard library not found. This should not occur.");
+    let stblib_str =
+        std::str::from_utf8(&stdlib_raw).expect("Could not interpret standard library.");
+    let stdlib_tokens = lexer::tokenize(&stblib_str);
+
+    parser::parse(stdlib_tokens, Some(stblib_str.into())).expect("Could not parse stdlib")
+}
diff --git a/src/command/mod.rs b/src/command/mod.rs
new file mode 100644
index 0000000..b4badde
--- /dev/null
+++ b/src/command/mod.rs
@@ -0,0 +1,16 @@
+/**
+ * Copyright 2020 Garrit Franke
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+pub mod build;
diff --git a/src/main.rs b/src/main.rs
index 1fb0f38..f1c6d0c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,12 +17,10 @@ extern crate rust_embed;
 extern crate structopt;
 
 use crate::Opt::Build;
-use std::fs::File;
-use std::io::Read;
-use std::io::Write;
 use std::path::PathBuf;
 use structopt::StructOpt;
 
+mod command;
 mod generator;
 mod lexer;
 mod parser;
@@ -43,9 +41,8 @@ pub struct Builtins;
 enum Opt {
     #[structopt()]
     Build {
-        #[structopt(default_value = "./examples/playground.sb")]
         in_file: PathBuf,
-        #[structopt(short, long, default_value = "./examples_out/playground.js")]
+        #[structopt(short, long)]
         out_file: PathBuf,
     },
 }
@@ -53,36 +50,9 @@ enum Opt {
 fn main() -> Result<(), String> {
     let opts = Opt::from_args();
 
-    let (in_file, out_file) = match opts {
-        Build { in_file, out_file } => (in_file, out_file),
+    match opts {
+        Build { in_file, out_file } => command::build::build(in_file, out_file)?,
     };
-    let mut file = File::open(in_file).expect("Could not open file");
-    let mut contents = String::new();
 
-    file.read_to_string(&mut contents)
-        .expect("Could not read file");
-    let tokens = lexer::tokenize(&contents);
-    let mut program = parser::parse(tokens, Some(contents))?;
-
-    // C Backend currently does not support stdlib yet, since not all features are implemented
-    if cfg!(feature = "backend_node") {
-        let stdlib = build_stdlib();
-        program.merge_with(stdlib);
-    }
-
-    let output = generator::generate(program);
-    let mut file = std::fs::File::create(out_file).expect("create failed");
-    file.write_all(output.as_bytes()).expect("write failed");
-    file.flush().expect("Could not flush file");
     Ok(())
 }
-
-fn build_stdlib() -> parser::node_type::Program {
-    let stdlib_raw =
-        Lib::get("stdio.sb").expect("Standard library not found. This should not occur.");
-    let stblib_str =
-        std::str::from_utf8(&stdlib_raw).expect("Could not interpret standard library.");
-    let stdlib_tokens = lexer::tokenize(&stblib_str);
-
-    parser::parse(stdlib_tokens, Some(stblib_str.into())).expect("Could not parse stdlib")
-}