feat: argument handling, makefile

2024-10-16 02:37:40 -05:00 · 2022-01-25 03:08:41 +07:00 · 2022-01-25 03:08:41 +07:00 · cdd59643a5
parent a92db6a448
commit cdd59643a5
7 changed files with 296 additions and 14 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -11,19 +11,133 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
 [[package]]
 name = "blspc"
 version = "0.1.0"
 dependencies = [
 "regex",
+ "structopt",
 ]

+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags",
+ "strsim",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
+]
+
+[[package]]
+name = "heck"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.113"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eef78b64d87775463c549fbd80e19249ef436ea3bf1de2a1eb7e717ec7fab1e9"
+
 [[package]]
 name = "memchr"
 version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"

+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
+dependencies = [
+ "proc-macro2",
+]
+
 [[package]]
 name = "regex"
 version = "1.5.4"
@ -40,3 +154,105 @@ name = "regex-syntax"
 version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "structopt"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
+dependencies = [
+ "clap",
+ "lazy_static",
+ "structopt-derive",
+]
+
+[[package]]
+name = "structopt-derive"
+version = "0.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,9 +1,16 @@
 [package]
 name = "blspc"
+description = "Bobbylisp compiler."
 version = "0.1.0"
 edition = "2021"
+author = ["azur1s <https://github.com/azur1s>"]
+homepage = "https://github.com/azur1s/bobbylisp"
+repository = "https://github.com/azur1s/bobbylisp"
+license = "AGPL-3.0"
+readme = "README.md"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
 regex = "1.5.4"
+structopt = "0.3.26"
--- a/21
+++ b/21
@ -0,0 +1,21 @@
+all: build install
+debug: build-debug install-debug
+
+build:
+	cargo build --release
+
+install:
+	rm -f ~/bin/blspc
+	cp ./target/release/blspc ~/bin/blspc
+
+build-debug:
+	cargo build
+
+install-debug:
+	rm -f ~/bin/blspc
+	cp ./target/debug/blspc ~/bin/blspc
+
+install-lib:
+	rm -rf ~/.bobbylib/
+	mkdir -p ~/.bobbylib/
+	cp -R ./lib/. ~/.bobbylib/
--- a/README.md
+++ b/README.md
@ -19,11 +19,21 @@ Input(file) -> Parser -> Interpret(TODO)
                              File 
 ```

-Progress:
+## Installation
+```bash
+$ make
+```
+or
+```bsah
+$ make debug
+```
+The binary will be installed in `~/bin/blspc` run it with:
+```
+$ blspc -h
+```
+
+## Progress:
 - [X] Lexer & Parser
 - [ ] Syntax checker & Type checker
 - [ ] Interpreter
- [ ] Compiler
-
-Problems:
- Parser can't detect `(()))` syntax error.
+- [ ] Compiler
--- a/example/hello.blsp
+++ b/example/hello.blsp
@ -1,2 +1 @@
-(print "hi")
-(print "Hello, World!")
+(print "Hello, World!")
--- a/src/args.rs
+++ b/src/args.rs
@ -0,0 +1,15 @@
+use std::path::PathBuf;
+
+use structopt::StructOpt;
+
+#[derive(StructOpt, Debug)]
+#[structopt(name = "blspc")]
+pub struct Args {
+    /// Verbose mode (-v, -vv, -vvv, etc.). Max is 2 currently.
+    #[structopt(short, long, parse(from_occurrences))]
+    pub verbose: u8,
+
+    /// Files to process.
+    #[structopt(name = "FILE", parse(from_os_str))]
+    pub file: PathBuf,
+}
--- a/src/main.rs
+++ b/src/main.rs
@ -1,18 +1,32 @@
-use std::{fs::read_to_string, env::args, path::Path};
+use std::{fs::read_to_string, path::Path};
+
+use structopt::StructOpt;
+
+mod args;
+use args::Args;

 mod util;
 use util::cover_paren;

 mod parser;
-use parser::tokenize;
+use parser::{tokenize, Parser};

 fn main() {
-    let args = args().nth(1).expect("No input file");
+    let args = Args::from_args();
    
-    let src = cover_paren(read_to_string(&args).unwrap());
-    let _file_name = Path::new(&args).file_stem().unwrap().to_str().unwrap();
+    let src = cover_paren(read_to_string(&args.file).unwrap());
+    let _file_name = Path::new(&args.file).file_stem().unwrap().to_str().unwrap();
    
-    let mut parser = parser::Parser::new(tokenize(&src));
+    let tokens = tokenize(&src);
+    let mut parser = Parser::new(tokens.clone());
    let result = parser.parse();
-    println!("{:#?}", result);
+
+    match args.verbose {
+        0 => println!("We don't do anything yet."),
+        1 => println!("{:?}", result),
+        2 | _ => {
+            println!("Tokens: {:?}", tokens);
+            println!("Parsed: {:#?}", result);
+        }
+    }
 }