From: Mark Thom <markjordanthom@gmail.com>
Date: Fri, 13 Mar 2020 21:40:03 +0000 (-0600)
Subject: allow module export of nonterminals (#281)
X-Git-Tag: v0.8.119~48
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=7260eba26aa8755968f6a7bafcc0fba34fcf5c3d;p=scryer-prolog.git

allow module export of nonterminals (#281)
---

diff --git a/src/prolog/machine/toplevel.rs b/src/prolog/machine/toplevel.rs
index bcfe128c..0d93a394 100644
--- a/src/prolog/machine/toplevel.rs
+++ b/src/prolog/machine/toplevel.rs
@@ -224,8 +224,8 @@ fn setup_op_decl(
 fn setup_predicate_indicator(term: &mut Term) -> Result<PredicateKey, ParserError>
 {
     match term {
-        Term::Clause(_, ref name, ref mut terms, Some(_))
-            if name.as_str() == "/" && terms.len() == 2 =>
+        Term::Clause(_, ref slash, ref mut terms, Some(_))
+            if (slash.as_str() == "/" || slash.as_str() == "//") && terms.len() == 2 =>
         {
             let arity = *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())
                 .ok_or(ParserError::InvalidModuleExport)?;
 
-            Ok((name, arity))
-        }
+            if slash.as_str() == "/" {
+                Ok((name, arity))
+            } else {
+                Ok((name, arity + 2))
+            }
+        }        
         _ => Err(ParserError::InvalidModuleExport),
     }
 }