Implements binding time analysis

User-TGK · User-TGK · commit 8e0a057aa179 · 2022-04-15T15:51:05.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "group3"
+name = "spl-compiler"
 version = "0.1.0"
 edition = "2021"
 
@@ -11,3 +11,5 @@ regex = "1.5.4"
 nom = "^7.1.0"
 num-bigint = "^0.4.3"
 pretty-trait="0.1.2"
+log = { version = "0.4" }
+simple_logger = { version = "2.1.0", default-features = false }
diff --git a/examples/binding_time_analysis.spl b/examples/binding_time_analysis.spl
@@ -0,0 +1,7 @@
+var f = 123;
+
+f(f) {
+    var f = 3;
+    var f = True;
+    return f;
+}
diff --git a/examples/fun_glob_var_unique.spl b/examples/fun_glob_var_unique.spl
@@ -0,0 +1,13 @@
+var x = 1;
+
+// Disallowed
+// var x = 2;
+
+id(a) {
+    return a;
+}
+
+// Disallowed
+//id(a) {
+//    return a;
+//}
diff --git a/examples/var_decl_in_statement.spl b/examples/var_decl_in_statement.spl
@@ -0,0 +1,7 @@
+f(a) {
+    if (a) {
+        var b = a;
+    } else {
+        var b = !a;
+    }
+}
diff --git a/src/ast/mod.rs b/src/ast/mod.rs
@@ -2,6 +2,7 @@ pub mod pp;
 
 use num_bigint::BigUint;
 
+use std::fmt;
 use std::ops::{Deref, DerefMut};
 
 #[derive(PartialEq, Debug)]
@@ -29,6 +30,12 @@ pub enum Decl {
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct Id(pub String);
 
+impl fmt::Display for Id {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
 impl From<String> for Id {
     fn from(s: String) -> Self {
         Self(s)
diff --git a/src/main.rs b/src/main.rs
@@ -1,15 +1,21 @@
-use group3::ast::pp::PrettyPrintable;
-use group3::parser::*;
-use group3::scanner::Scanner;
-use group3::tc::*;
-use group3::token::{Token, Tokens};
+use spl_compiler::ast::pp::PrettyPrintable;
+use spl_compiler::parser::*;
+use spl_compiler::scanner::Scanner;
+use spl_compiler::tc::*;
+use spl_compiler::token::{Token, Tokens};
 
 use pretty_trait::to_string;
 
+use simple_logger::SimpleLogger;
+
 use std::error::Error;
+use std::fs::File;
+use std::io::prelude::*;
 use std::{env, fs};
 
 pub fn main() -> Result<(), Box<dyn Error>> {
+    SimpleLogger::new().init().unwrap();
+
     let mut args = env::args();
     let binary = args.next().ok_or("No binary available")?;
     let input_filename = args
@@ -31,8 +37,8 @@ pub fn main() -> Result<(), Box<dyn Error>> {
             let max_line = Some(40);
             let tab_size = 4;
 
-            println!("// Successfully parsed and type checked input file.");
-            println!("{}", to_string(&program.to_pretty(), max_line, tab_size));
+            let mut file = File::create("out.spl")?;
+            file.write_all(&to_string(&program.to_pretty(), max_line, tab_size).as_bytes())?;
         }
         Err(e) => {
             println!("{:?}", e);
diff --git a/src/tc/mod.rs b/src/tc/mod.rs
diff --git a/tests/external.rs b/tests/external.rs
