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
15 changes: 14 additions & 1 deletion rust/src/analyzer/literals.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Literal Handlers - Processing Ruby literal values
//!
//! This module is responsible for:
//! - String, Integer, Float, Hash literals
//! - String, Integer, Float, Hash, Regexp literals
//! - nil, true, false, Symbol literals
//! - Creating Source vertices with fixed types
//!
Expand Down Expand Up @@ -57,6 +57,11 @@ pub fn install_literal(genv: &mut GlobalEnv, node: &Node) -> Option<VertexId> {
return Some(genv.new_source(Type::symbol()));
}

// /pattern/
if node.as_regular_expression_node().is_some() {
return Some(genv.new_source(Type::regexp()));
}

None
}

Expand Down Expand Up @@ -89,4 +94,12 @@ mod tests {
let vtx = genv.new_source(Type::float());
assert_eq!(genv.get_source(vtx).unwrap().ty.show(), "Float");
}

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

let vtx = genv.new_source(Type::regexp());
assert_eq!(genv.get_source(vtx).unwrap().ty.show(), "Regexp");
}
}
54 changes: 54 additions & 0 deletions rust/src/analyzer/tests/integration_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ fn analyze(source: &str) -> (GlobalEnv, LocalEnv) {
genv.register_builtin_method(Type::array(), "map", Type::array());
genv.register_builtin_method(Type::hash(), "each", Type::hash());

// Register Regexp methods
genv.register_builtin_method(Type::regexp(), "match", Type::instance("MatchData"));
genv.register_builtin_method(Type::regexp(), "match?", Type::instance("TrueClass"));
genv.register_builtin_method(Type::regexp(), "source", Type::string());

let mut lenv = LocalEnv::new();
let mut installer = AstInstaller::new(&mut genv, &mut lenv, source);

Expand Down Expand Up @@ -471,3 +476,52 @@ c = x.abs
let c_vtx = lenv.get_var("c").unwrap();
assert_eq!(genv.get_vertex(c_vtx).unwrap().show(), "Float");
}

// ============================================
// Regexp Literal Tests
// ============================================

#[test]
fn test_regexp_literal_basic() {
let source = r#"x = /hello/"#;

let (genv, lenv) = analyze(source);

let x_vtx = lenv.get_var("x").unwrap();
assert_eq!(genv.get_vertex(x_vtx).unwrap().show(), "Regexp");
}

#[test]
fn test_regexp_literal_type_error() {
let source = r#"
class Matcher
def find
x = /pattern/
y = x.upcase
end
end
"#;

let (genv, _lenv) = analyze(source);

// Type error should be detected: Regexp doesn't have upcase method
assert_eq!(genv.type_errors.len(), 1);
assert_eq!(genv.type_errors[0].method_name, "upcase");
}

#[test]
fn test_regexp_specific_methods() {
let source = r#"
x = /hello/
a = x.source
"#;

let (genv, lenv) = analyze(source);

// No type errors - source is a valid Regexp method
assert_eq!(genv.type_errors.len(), 0);

// source returns String
let a_vtx = lenv.get_var("a").unwrap();
assert_eq!(genv.get_vertex(a_vtx).unwrap().show(), "String");
}
6 changes: 6 additions & 0 deletions rust/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,12 @@ impl Type {
}
}

pub fn regexp() -> Self {
Type::Instance {
name: QualifiedName::simple("Regexp"),
}
}

/// Create a generic Array type: Array[element_type]
pub fn array_of(element_type: Type) -> Self {
Type::Generic {
Expand Down