Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Validate predicate usage against declared arity #362

Merged
merged 2 commits into from
Sep 19, 2023
Merged

Validate predicate usage against declared arity #362

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ed9264
Validate predicate usage against declared arity
mmarx Sep 19, 2023
2577631
Verify that declared arity matches source arity
mmarx Sep 19, 2023
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
102 changes: 98 additions & 4 deletions nemo/src/program_analysis/analysis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ pub struct RuleAnalysis {
}

/// Errors than can occur during rule analysis
#[derive(Error, Debug, Copy, Clone)]
#[derive(Error, Debug, Copy, Clone, PartialEq, Eq)]
#[allow(clippy::enum_variant_names)]
pub enum RuleAnalysisError {
/// Unsupported feature: Overloading of predicate names by arity/type
Expand Down Expand Up @@ -744,10 +744,26 @@ impl ChaseProgram {

/// Check if the program contains rules with unsupported features
pub fn check_for_unsupported_features(&self) -> Result<(), RuleAnalysisError> {
let mut arities = HashMap::new();
let mut arities = self
.parsed_predicate_declarations()
.iter()
.map(|(predicate, types)| (predicate.clone(), types.len()))
.collect::<HashMap<_, _>>();

for source in self.sources() {
arities.insert(source.predicate.clone(), source.input_types().arity());
match arities.entry(source.predicate.clone()) {
std::collections::hash_map::Entry::Occupied(slot) => {
// both declared and in a source
let arity = slot.get();

if *arity != source.input_types().arity() {
return Err(RuleAnalysisError::UnsupportedFeaturePredicateOverloading);
}
}
std::collections::hash_map::Entry::Vacant(slot) => {
slot.insert(source.input_types().arity());
}
}
}

for rule in self.rules() {
Expand Down Expand Up @@ -924,12 +940,13 @@ mod test {
use std::collections::HashMap;

use crate::{
io::parser::parse_program,
model::{
chase_model::{ChaseAtom, ChaseProgram, ChaseRule},
DataSourceDeclaration, DsvFile, Identifier, NativeDataSource, PrimitiveType, Term,
TupleConstraint, Variable,
},
program_analysis::analysis::get_fresh_rule_predicate,
program_analysis::analysis::{get_fresh_rule_predicate, RuleAnalysisError},
};

fn get_test_rules_and_predicates() -> (
Expand Down Expand Up @@ -1412,4 +1429,81 @@ mod test {
.unwrap();
assert_eq!(inferred_types, expected_types);
}

#[test]
fn overloading_is_unsupported() {
let program = ChaseProgram::try_from(
parse_program(
r#"
@source q[3]: load-rdf("dummy.nt") .
p(?x, ?y) :- q(?x), q(?y) .
"#,
)
.unwrap(),
)
.unwrap();

assert_eq!(
program.check_for_unsupported_features(),
Err(RuleAnalysisError::UnsupportedFeaturePredicateOverloading)
);

let program = ChaseProgram::try_from(
parse_program(
r#"
@source q[3]: load-rdf("dummy.nt") .
@declare q(integer, integer) .
"#,
)
.unwrap(),
)
.unwrap();

assert_eq!(
program.check_for_unsupported_features(),
Err(RuleAnalysisError::UnsupportedFeaturePredicateOverloading)
);

let program =
ChaseProgram::try_from(parse_program(r#"q(?x, ?y) :- q(?x), q(?y) ."#).unwrap())
.unwrap();

assert_eq!(
program.check_for_unsupported_features(),
Err(RuleAnalysisError::UnsupportedFeaturePredicateOverloading)
);

let program = ChaseProgram::try_from(
parse_program(
r#"
p(?x, ?y) :- q(?x), q(?y) .
q(23, 42) .
"#,
)
.unwrap(),
)
.unwrap();

assert_eq!(
program.check_for_unsupported_features(),
Err(RuleAnalysisError::UnsupportedFeaturePredicateOverloading)
);

let program = ChaseProgram::try_from(
parse_program(
r#"
@declare q(integer, integer) .
p(?x, ?y) :- q(?x), q(?y) .
q(23) .
"#,
)
.unwrap(),
)
.unwrap();

assert_eq!(
program.check_for_unsupported_features(),
Err(RuleAnalysisError::UnsupportedFeaturePredicateOverloading)
);
}
}