rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow module export of nonterminals (#281)

Browse Source
This commit is contained in:
Mark Thom
2020-03-13 15:40:03 -06:00
parent 7e7a1b2caf
commit 7260eba26a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/prolog/machine/toplevel.rs
View File

@@ -224,8 +224,8 @@ fn setup_op_decl(
fn setup_predicate_indicator(term: &mut Term) -> Result<PredicateKey, ParserError> fn setup_predicate_indicator(term: &mut Term) -> Result<PredicateKey, ParserError>
{ {
match term { match term {
Term::Clause(_, ref name, ref mut terms, Some(_)) Term::Clause(_, ref slash, ref mut terms, Some(_))
if name.as_str() == "/" && terms.len() == 2 => if (slash.as_str() == "/" || slash.as_str() == "//") && terms.len() == 2 =>
{ {
let arity = *terms.pop().unwrap(); let arity = *terms.pop().unwrap();
let name = *terms.pop().unwrap(); let name = *terms.pop().unwrap();
@@ -241,8 +241,12 @@ fn setup_predicate_indicator(term: &mut Term) -> Result<PredicateKey, ParserErro
.and_then(|c| c.to_atom()) .and_then(|c| c.to_atom())
.ok_or(ParserError::InvalidModuleExport)?; .ok_or(ParserError::InvalidModuleExport)?;
Ok((name, arity)) if slash.as_str() == "/" {
} Ok((name, arity))
} else {
Ok((name, arity + 2))
}
}
_ => Err(ParserError::InvalidModuleExport), _ => Err(ParserError::InvalidModuleExport),
} }
} }