Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 0 additions & 50 deletions core/src/analyzer/blocks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,53 +124,3 @@ fn exit_block_scope(genv: &mut GlobalEnv) {
fn install_block_parameter(genv: &mut GlobalEnv, lenv: &mut LocalEnv, name: String) -> VertexId {
install_required_parameter(genv, lenv, name)
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_enter_exit_block_scope() {
let mut genv = GlobalEnv::new();

let initial_scope_id = genv.scope_manager.current_scope().id;

enter_block_scope(&mut genv);
let block_scope_id = genv.scope_manager.current_scope().id;

assert_ne!(initial_scope_id, block_scope_id);

exit_block_scope(&mut genv);

assert_eq!(genv.scope_manager.current_scope().id, initial_scope_id);
}

#[test]
fn test_install_block_parameter() {
let mut genv = GlobalEnv::new();
let mut lenv = LocalEnv::new();

enter_block_scope(&mut genv);

let vtx = install_block_parameter(&mut genv, &mut lenv, "x".to_string());

assert_eq!(lenv.get_var("x"), Some(vtx));

exit_block_scope(&mut genv);
}

#[test]
fn test_block_inherits_parent_scope_vars() {
let mut genv = GlobalEnv::new();

genv.scope_manager
.current_scope_mut()
.set_local_var("outer".to_string(), VertexId(100));

enter_block_scope(&mut genv);

assert_eq!(genv.scope_manager.lookup_var("outer"), Some(VertexId(100)));

exit_block_scope(&mut genv);
}
}
30 changes: 0 additions & 30 deletions core/src/analyzer/calls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,3 @@ pub(crate) fn install_method_call(

ret_vtx
}

#[cfg(test)]
mod tests {
use super::*;
use crate::types::Type;

#[test]
fn test_install_method_call_creates_vertex() {
let mut genv = GlobalEnv::new();

let recv_vtx = genv.new_source(Type::string());
let ret_vtx =
install_method_call(&mut genv, recv_vtx, "upcase".to_string(), vec![], None, None, false);

// Return vertex should exist
assert!(genv.get_vertex(ret_vtx).is_some());
}

#[test]
fn test_install_method_call_adds_box() {
let mut genv = GlobalEnv::new();

let recv_vtx = genv.new_source(Type::string());
let _ret_vtx =
install_method_call(&mut genv, recv_vtx, "upcase".to_string(), vec![], None, None, false);

// Box should be added
assert_eq!(genv.box_count(), 1);
}
}
63 changes: 0 additions & 63 deletions core/src/analyzer/parameters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,66 +204,3 @@ pub(crate) fn install_parameters(

(param_vtxs, keyword_param_vtxs)
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_install_required_parameter() {
let mut genv = GlobalEnv::new();
let mut lenv = LocalEnv::new();

let vtx = install_required_parameter(&mut genv, &mut lenv, "name".to_string());

// Parameter should be registered in LocalEnv
assert_eq!(lenv.get_var("name"), Some(vtx));

// Vertex should exist in GlobalEnv (as untyped)
let vertex = genv.get_vertex(vtx);
assert!(vertex.is_some());
}

#[test]
fn test_install_multiple_parameters() {
let mut genv = GlobalEnv::new();
let mut lenv = LocalEnv::new();

let vtx_a = install_required_parameter(&mut genv, &mut lenv, "a".to_string());
let vtx_b = install_required_parameter(&mut genv, &mut lenv, "b".to_string());
let vtx_c = install_required_parameter(&mut genv, &mut lenv, "c".to_string());

// All parameters should be registered
assert_eq!(lenv.get_var("a"), Some(vtx_a));
assert_eq!(lenv.get_var("b"), Some(vtx_b));
assert_eq!(lenv.get_var("c"), Some(vtx_c));

// All vertices should be different
assert_ne!(vtx_a, vtx_b);
assert_ne!(vtx_b, vtx_c);
assert_ne!(vtx_a, vtx_c);
}

#[test]
fn test_install_optional_parameter_inherits_default_type() {
let mut genv = GlobalEnv::new();
let mut lenv = LocalEnv::new();
let mut changes = ChangeSet::new();

// Default value: 0 (Integer)
let default_vtx = genv.new_source(Type::integer());
let vtx = install_optional_parameter(
&mut genv,
&mut lenv,
&mut changes,
"age".to_string(),
default_vtx,
);

assert_eq!(lenv.get_var("age"), Some(vtx));

// Type should propagate from default value
let vertex = genv.get_vertex(vtx).unwrap();
assert_eq!(vertex.show(), "Integer");
}
}
20 changes: 0 additions & 20 deletions core/src/analyzer/variables.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,23 +62,3 @@ pub(crate) fn install_self(genv: &mut GlobalEnv) -> VertexId {
genv.new_source(Type::instance("Object"))
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_install_self_at_top_level() {
let mut genv = GlobalEnv::new();

let vtx = install_self(&mut genv);
assert_eq!(genv.get_source(vtx).unwrap().ty.show(), "Object");
}

#[test]
fn test_local_var_read_not_found() {
let lenv = LocalEnv::new();

assert_eq!(install_local_var_read(&lenv, "unknown"), None);
}
}
75 changes: 0 additions & 75 deletions core/src/env/global_env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -341,78 +341,3 @@ impl Default for GlobalEnv {
Self::new()
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_global_env_new_vertex() {
let mut genv = GlobalEnv::new();

let v1 = genv.new_vertex();
let v2 = genv.new_vertex();

assert_eq!(v1.0, 0);
assert_eq!(v2.0, 1);
}

#[test]
fn test_global_env_new_source() {
let mut genv = GlobalEnv::new();

let s1 = genv.new_source(Type::string());
let s2 = genv.new_source(Type::integer());

assert_eq!(genv.get_source(s1).unwrap().ty.show(), "String");
assert_eq!(genv.get_source(s2).unwrap().ty.show(), "Integer");
}

#[test]
fn test_global_env_edge_propagation() {
let mut genv = GlobalEnv::new();

// Source<String> -> Vertex
let src = genv.new_source(Type::string());
let vtx = genv.new_vertex();

genv.add_edge(src, vtx);

// Verify type propagated to Vertex
assert_eq!(genv.get_vertex(vtx).unwrap().show(), "String");
}

#[test]
fn test_global_env_chain_propagation() {
let mut genv = GlobalEnv::new();

// Source<String> -> Vertex1 -> Vertex2
let src = genv.new_source(Type::string());
let v1 = genv.new_vertex();
let v2 = genv.new_vertex();

genv.add_edge(src, v1);
genv.add_edge(v1, v2);

// Verify type propagated to v2
assert_eq!(genv.get_vertex(v1).unwrap().show(), "String");
assert_eq!(genv.get_vertex(v2).unwrap().show(), "String");
}

#[test]
fn test_global_env_union_propagation() {
let mut genv = GlobalEnv::new();

// Source<String> -> Vertex
// Source<Integer> -> Vertex
let src1 = genv.new_source(Type::string());
let src2 = genv.new_source(Type::integer());
let vtx = genv.new_vertex();

genv.add_edge(src1, vtx);
genv.add_edge(src2, vtx);

// Verify it became Union type
assert_eq!(genv.get_vertex(vtx).unwrap().show(), "(Integer | String)");
}
}