Name pooling addition #48

Author: mverleg

src/mango/io/util.rs

@@ -5,7 +5,7 @@ use std::collections::HashMap;
 
 // TODO: Use regex! instead of Regex::new to check at compile time. (Also its not on heap). This is actually slower according to 2y old benchmark though. But semantically makes more sense.
 thread_local!{
-    static re: Regex = Regex::new("abc");
+    static re: Regex = Regex::new("abc").unwrap();
 }
 
 pub struct RegexCache {

src/mango/towasm/scope/function.rs

@@ -37,7 +37,7 @@ impl Parameter {
 
 impl Wasm for Parameter {
     fn as_wat(&self) -> String {
-        format!("(param {} {})", self.name().as_wat(), self.typ().as_wat())
+        format!("(param {} {})", self.name().borrow().as_wat(), self.typ().as_wat())
     }
 
     fn write_wasm(&self, file: &mut File) -> io::Result<()> {
@@ -82,8 +82,8 @@ impl Wasm for FunctionSignature {
     fn as_wat(&self) -> String {
         format!(
             "func {} (export \"{}\") {} {}",
-            self.name.as_wat(),
-            self.name.pure_name(),
+            self.name.borrow().as_wat(),
+            self.name.borrow().pure_name(),
             self.parameters.iter().map(|func| func.as_wat()).collect::<Vec<_>>().join("\n"),
             self.results.iter().map(|func| func.as_wat()).collect::<Vec<_>>().join("\n")
         )

src/mango/towasm/scope/module.rs

@@ -1,5 +1,6 @@
 use mango::towasm::scope::Function;
-use mango::towasm::util::NamePool;
+use mango::towasm::util::pool::new_name_pool;
+use mango::towasm::util::pool::NamePool;
 use mango::towasm::Wasm;
 use std::fs::File;
 use std::io;
@@ -35,7 +36,7 @@ pub struct Scope {
 
 impl Scope {
     pub fn new(parent: &mut Scope) -> Self {
-        let names = NamePool::new(parent.names);
+        let names = new_name_pool(&mut parent.names);
         Scope { names }
     }
 }

src/mango/towasm/util/anonymous.rs

@@ -8,5 +8,4 @@
 mod name;
 pub use self::name::{KnownName, Name, PendingName, RawName};
 
-mod pool;
-pub use self::pool::NamePool;
+pub mod pool;

src/mango/towasm/util/given_name.rs

@@ -36,6 +36,21 @@ pub enum RawName {
     Pending(PendingName),
 }
 
+impl RawName {
+    pub fn resolved(&self) -> &KnownName {
+        match self {
+            RawName::Known(name) => &name,
+            RawName::Pending(name) => {
+                self = RawName::Known(KnownName {
+                    // TODO: can I just use choose_name, or need pool to take prefix into account? (do I need id in that case?)
+                    name: format!("{}", self.id), //                    format!("{}{}", name.prefix, 1)
+                });
+                &name
+            }
+        }
+    }
+}
+
 impl RawName {}
 
 pub type Name = Rc<RefCell<RawName>>;

src/mango/towasm/util/mod.rs

@@ -54,4 +54,6 @@ impl RawNamePool {
 
 pub type NamePool = Rc<RefCell<RawNamePool>>;
 
-impl NamePool {}
+pub fn new_name_pool(parent: &mut NamePool) -> NamePool {
+    Rc::new(RefCell::new(RawNamePool::new(parent)))
+}

src/mango/towasm/util/name.rs

@@ -0,0 +1,4 @@
+
+pub fn choose_name(nr: i32) -> String {
+
+}