fix macro hygien

crates/prolog_parser/src/ast.rs

@@ -40,20 +40,23 @@ pub const NEGATIVE_SIGN: u32 = 0x0200;
 #[macro_export]
 macro_rules! clause_name {
     ($name: expr, $tbl: expr) => {
-        ClauseName::User(TabledRc::new($name, $tbl.clone()))
+        $crate::ast::ClauseName::User($crate::tabled_rc::TabledRc::new($name, $tbl.clone()))
     };
     ($name: expr) => {
-        ClauseName::BuiltIn($name)
+        $crate::ast::ClauseName::BuiltIn($name)
     };
 }
 
 #[macro_export]
 macro_rules! atom {
     ($e:expr, $tbl:expr) => {
-        Constant::Atom(ClauseName::User(tabled_rc!($e, $tbl)), None)
+        $crate::ast::Constant::Atom(
+            $crate::ast::ClauseName::User($crate::tabled_rc!($e, $tbl)),
+            None,
+        )
     };
     ($e:expr) => {
-        Constant::Atom(clause_name!($e), None)
+        $crate::ast::Constant::Atom($crate::clause_name!($e), None)
     };
 }
 
@@ -65,95 +68,102 @@ macro_rules! rc_atom {
 }
 macro_rules! is_term {
     ($x:expr) => {
-        ($x & TERM) != 0
+        ($x & $crate::ast::TERM) != 0
     };
 }
 
 macro_rules! is_lterm {
     ($x:expr) => {
-        ($x & LTERM) != 0
+        ($x & $crate::ast::LTERM) != 0
     };
 }
 
 macro_rules! is_op {
     ($x:expr) => {
-        $x & (XF | YF | FX | FY | XFX | XFY | YFX) != 0
+        $x & ($crate::ast::XF
+            | $crate::ast::YF
+            | $crate::ast::FX
+            | $crate::ast::FY
+            | $crate::ast::XFX
+            | $crate::ast::XFY
+            | $crate::ast::YFX)
+            != 0
     };
 }
 
 macro_rules! is_negate {
     ($x:expr) => {
-        ($x & NEGATIVE_SIGN) != 0
+        ($x & $crate::ast::NEGATIVE_SIGN) != 0
     };
 }
 
 #[macro_export]
 macro_rules! is_prefix {
     ($x:expr) => {
-        $x & (FX | FY) != 0
+        $x & ($crate::ast::FX | $crate::ast::FY) != 0
     };
 }
 
 #[macro_export]
 macro_rules! is_postfix {
     ($x:expr) => {
-        $x & (XF | YF) != 0
+        $x & ($crate::ast::XF | $crate::ast::YF) != 0
     };
 }
 
 #[macro_export]
 macro_rules! is_infix {
     ($x:expr) => {
-        ($x & (XFX | XFY | YFX)) != 0
+        ($x & ($crate::ast::XFX | $crate::ast::XFY | $crate::ast::YFX)) != 0
     };
 }
 
 #[macro_export]
 macro_rules! is_xfx {
     ($x:expr) => {
-        ($x & XFX) != 0
+        ($x & $crate::ast::XFX) != 0
     };
 }
 
 #[macro_export]
 macro_rules! is_xfy {
     ($x:expr) => {
-        ($x & XFY) != 0
+        ($x & $crate::ast::XFY) != 0
     };
 }
 
 #[macro_export]
 macro_rules! is_yfx {
     ($x:expr) => {
-        ($x & YFX) != 0
+        ($x & $crate::ast::YFX) != 0
     };
 }
 
 #[macro_export]
 macro_rules! is_yf {
     ($x:expr) => {
-        ($x & YF) != 0
+        ($x & $crate::ast::YF) != 0
     };
 }
 
 #[macro_export]
 macro_rules! is_xf {
     ($x:expr) => {
-        ($x & XF) != 0
+        ($x & $crate::ast::XF) != 0
     };
 }
 
 #[macro_export]
 macro_rules! is_fx {
     ($x:expr) => {
-        ($x & FX) != 0
+        ($x & $crate::ast::FX) != 0
     };
 }
 
 #[macro_export]
 macro_rules! is_fy {
     ($x:expr) => {
-        ($x & FY) != 0
+        ($x & $crate::ast::FY) != 0
     };
 }
 
@@ -227,14 +237,14 @@ impl Default for VarReg {
 #[macro_export]
 macro_rules! temp_v {
     ($x:expr) => {
-        RegType::Temp($x)
+        $crate::ast::RegType::Temp($x)
     };
 }
 
 #[macro_export]
 macro_rules! perm_v {
     ($x:expr) => {
-        RegType::Perm($x)
+        $crate::ast::RegType::Perm($x)
     };
 }
 

crates/prolog_parser/src/lexer.rs

@@ -14,7 +14,7 @@ macro_rules! is_not_eof {
     ($c:expr) => {
         match $c {
             Ok(c) => c,
-            Err(ParserError::UnexpectedEOF) => return Ok(true),
+            Err($crate::ast::ParserError::UnexpectedEOF) => return Ok(true),
             Err(e) => return Err(e),
         }
     };
@@ -26,7 +26,7 @@ macro_rules! consume_chars_with {
             match $e {
                 Ok(Some(c)) => $token.push(c),
                 Ok(None) => continue,
-                Err(ParserError::UnexpectedChar(..)) => break,
+                Err($crate::ast::ParserError::UnexpectedChar(..)) => break,
                 Err(e) => return Err(e),
             }
         }

crates/prolog_parser/src/macros.rs

@@ -1,187 +1,246 @@
 #[macro_export]
 macro_rules! char_class {
     ($c: expr, [$head:expr]) => ($c == $head);
-    ($c: expr, [$head:expr $(, $cs:expr)+]) => ($c == $head || char_class!($c, [$($cs),*]));
+    ($c: expr, [$head:expr $(, $cs:expr)+]) => ($c == $head || $crate::char_class!($c, [$($cs),*]));
 }
 
 #[macro_export]
 macro_rules! symbolic_control_char {
-    ($c: expr) => (char_class!($c, ['a', 'b', 'f', 'n', 'r', 't', 'v', '0']))
+    ($c: expr) => {
+        $crate::char_class!($c, ['a', 'b', 'f', 'n', 'r', 't', 'v', '0'])
+    };
 }
 
 #[macro_export]
 macro_rules! space_char {
-    ($c: expr) => ($c == ' ')
+    ($c: expr) => {
+        $c == ' '
+    };
 }
 
 #[macro_export]
 macro_rules! layout_char {
-    ($c: expr) => (char_class!($c, [' ', '\n', '\t', '\u{0B}', '\u{0C}']))
+    ($c: expr) => {
+        $crate::char_class!($c, [' ', '\n', '\t', '\u{0B}', '\u{0C}'])
+    };
 }
 
 #[macro_export]
 macro_rules! symbolic_hexadecimal_char {
-    ($c: expr) => ($c == 'x')
+    ($c: expr) => {
+        $c == 'x'
+    };
 }
 
 #[macro_export]
 macro_rules! octal_digit_char {
-    ($c: expr) => ($c >= '0' && $c <= '7')
+    ($c: expr) => {
+        $c >= '0' && $c <= '7'
+    };
 }
 
 #[macro_export]
 macro_rules! binary_digit_char {
-    ($c: expr) => ($c >= '0' && $c <= '1')
+    ($c: expr) => {
+        $c >= '0' && $c <= '1'
+    };
 }
 
 #[macro_export]
 macro_rules! hexadecimal_digit_char {
-    ($c: expr) => ($c >= '0' && $c <= '9' ||
+    ($c: expr) => {
-                   $c >= 'A' && $c <= 'F' ||
+        $c >= '0' && $c <= '9' || $c >= 'A' && $c <= 'F' || $c >= 'a' && $c <= 'f'
-                   $c >= 'a' && $c <= 'f')
+    };
 }
 
 #[macro_export]
 macro_rules! exponent_char {
-    ($c: expr) => ($c == 'e' || $c == 'E')
+    ($c: expr) => {
+        $c == 'e' || $c == 'E'
+    };
 }
 
 #[macro_export]
 macro_rules! sign_char {
-    ($c: expr) => ($c == '-' || $c == '+')
+    ($c: expr) => {
+        $c == '-' || $c == '+'
+    };
 }
 
 #[macro_export]
 macro_rules! new_line_char {
-    ($c: expr) => ($c == '\n')
+    ($c: expr) => {
+        $c == '\n'
+    };
 }
 
 #[macro_export]
 macro_rules! end_line_comment_char {
-    ($c: expr) => ($c == '%')
+    ($c: expr) => {
+        $c == '%'
+    };
 }
 
 #[macro_export]
 macro_rules! comment_1_char {
-    ($c: expr) => ($c == '/')
+    ($c: expr) => {
+        $c == '/'
+    };
 }
 
 #[macro_export]
 macro_rules! comment_2_char {
-    ($c: expr) => ($c == '*')
+    ($c: expr) => {
+        $c == '*'
+    };
 }
 
 #[macro_export]
 macro_rules! capital_letter_char {
-    ($c: expr) => ($c >= 'A' && $c <= 'Z')
+    ($c: expr) => {
+        $c >= 'A' && $c <= 'Z'
+    };
 }
 
 #[macro_export]
 macro_rules! small_letter_char {
-    ($c: expr) => ($c >= 'a' && $c <= 'z')
+    ($c: expr) => {
+        $c >= 'a' && $c <= 'z'
+    };
 }
 
 #[macro_export]
 macro_rules! variable_indicator_char {
-    ($c: expr) => ($c == '_')
+    ($c: expr) => {
+        $c == '_'
+    };
 }
 
 #[macro_export]
 macro_rules! graphic_char {
-    ($c: expr) => (char_class!($c, ['#', '$', '&', '*', '+', '-', '.', '/', ':',
+    ($c: expr) => ($crate::char_class!($c, ['#', '$', '&', '*', '+', '-', '.', '/', ':',
                                     '<', '=', '>', '?', '@', '^', '~']))
 }
 
 #[macro_export]
 macro_rules! graphic_token_char {
-    ($c: expr) => (graphic_char!($c) || backslash_char!($c))
+    ($c: expr) => {
+        $crate::graphic_char!($c) || $crate::backslash_char!($c)
+    };
 }
 
 #[macro_export]
 macro_rules! alpha_char {
-    ($c: expr) =>
+    ($c: expr) => {
-        (match $c {
+        match $c {
-            'a' ..= 'z' => true,
+            'a'..='z' => true,
-            'A' ..= 'Z' => true,
+            'A'..='Z' => true,
             '_' => true,
-            '\u{00A0}' ..= '\u{00BF}' => true,
+            '\u{00A0}'..='\u{00BF}' => true,
-            '\u{00C0}' ..= '\u{00D6}' => true,
+            '\u{00C0}'..='\u{00D6}' => true,
-            '\u{00D8}' ..= '\u{00F6}' => true,
+            '\u{00D8}'..='\u{00F6}' => true,
-            '\u{00F8}' ..= '\u{00FF}' => true,
+            '\u{00F8}'..='\u{00FF}' => true,
-            '\u{0100}' ..= '\u{017F}' => true, // Latin Extended-A
+            '\u{0100}'..='\u{017F}' => true, // Latin Extended-A
-            '\u{0180}' ..= '\u{024F}' => true, // Latin Extended-B
+            '\u{0180}'..='\u{024F}' => true, // Latin Extended-B
-            '\u{0250}' ..= '\u{02AF}' => true, // IPA Extensions
+            '\u{0250}'..='\u{02AF}' => true, // IPA Extensions
-            '\u{02B0}' ..= '\u{02FF}' => true, // Spacing Modifier Letters
+            '\u{02B0}'..='\u{02FF}' => true, // Spacing Modifier Letters
-            '\u{0300}' ..= '\u{036F}' => true, // Combining Diacritical Marks
+            '\u{0300}'..='\u{036F}' => true, // Combining Diacritical Marks
-            '\u{0370}' ..= '\u{03FF}' => true, // Greek/Coptic
+            '\u{0370}'..='\u{03FF}' => true, // Greek/Coptic
-            '\u{0400}' ..= '\u{04FF}' => true, // Cyrillic
+            '\u{0400}'..='\u{04FF}' => true, // Cyrillic
-            '\u{0500}' ..= '\u{052F}' => true, // Cyrillic Supplement
+            '\u{0500}'..='\u{052F}' => true, // Cyrillic Supplement
-            '\u{0530}' ..= '\u{058F}' => true, // Armenian
+            '\u{0530}'..='\u{058F}' => true, // Armenian
-            '\u{0590}' ..= '\u{05FF}' => true, // Hebrew
+            '\u{0590}'..='\u{05FF}' => true, // Hebrew
-            '\u{0600}' ..= '\u{06FF}' => true, // Arabic
+            '\u{0600}'..='\u{06FF}' => true, // Arabic
-            '\u{0700}' ..= '\u{074F}' => true, // Syriac
+            '\u{0700}'..='\u{074F}' => true, // Syriac
-            _ => false
+            _ => false,
-        })
+        }
+    };
 }
 
 #[macro_export]
 macro_rules! decimal_digit_char {
-    ($c: expr) => ($c >= '0' && $c <= '9')
+    ($c: expr) => {
+        $c >= '0' && $c <= '9'
+    };
 }
 
 #[macro_export]
 macro_rules! decimal_point_char {
-    ($c: expr) => ($c == '.')
+    ($c: expr) => {
+        $c == '.'
+    };
 }
 
 #[macro_export]
 macro_rules! alpha_numeric_char {
-    ($c: expr) => (alpha_char!($c) || decimal_digit_char!($c))
+    ($c: expr) => {
+        $crate::alpha_char!($c) || $crate::decimal_digit_char!($c)
+    };
 }
 
 #[macro_export]
 macro_rules! cut_char {
-    ($c: expr) => ($c == '!')
+    ($c: expr) => {
+        $c == '!'
+    };
 }
 
 #[macro_export]
 macro_rules! semicolon_char {
-    ($c: expr) => ($c == ';')
+    ($c: expr) => {
+        $c == ';'
+    };
 }
 
 #[macro_export]
 macro_rules! backslash_char {
-    ($c: expr) => ($c == '\\')
+    ($c: expr) => {
+        $c == '\\'
+    };
 }
 
 #[macro_export]
 macro_rules! single_quote_char {
-    ($c: expr) => ($c == '\'')
+    ($c: expr) => {
+        $c == '\''
+    };
 }
 
 #[macro_export]
 macro_rules! double_quote_char {
-    ($c: expr) => ($c == '"')
+    ($c: expr) => {
+        $c == '"'
+    };
 }
 
 #[macro_export]
 macro_rules! back_quote_char {
-    ($c: expr) => ($c == '`')
+    ($c: expr) => {
+        $c == '`'
+    };
 }
 
 #[macro_export]
 macro_rules! meta_char {
-    ($c: expr) => ( char_class!($c, ['\\', '\'', '"', '`']) )
+    ($c: expr) => {
+        $crate::char_class!($c, ['\\', '\'', '"', '`'])
+    };
 }
 
 #[macro_export]
 macro_rules! solo_char {
-    ($c: expr) => ( char_class!($c, ['!', '(', ')', ',', ';', '[', ']',
+    ($c: expr) => {
-                                     '{', '}', '|', '%']) )
+        $crate::char_class!($c, ['!', '(', ')', ',', ';', '[', ']', '{', '}', '|', '%'])
+    };
 }
 
 #[macro_export]
 macro_rules! prolog_char {
-    ($c: expr) => (graphic_char!($c) || alpha_numeric_char!($c) || solo_char!($c) ||
+    ($c: expr) => {
-                   layout_char!($c) || meta_char!($c))
+        $crate::graphic_char!($c)
+            || $crate::alpha_numeric_char!($c)
+            || $crate::solo_char!($c)
+            || $crate::layout_char!($c)
+            || $crate::meta_char!($c)
+    };
 }

crates/prolog_parser/src/tabled_rc.rs

@@ -4,11 +4,11 @@ use std::collections::HashSet;
 use std::fmt;
 use std::hash::{Hash, Hasher};
 use std::ops::Deref;
-use std::rc::{Rc};
+use std::rc::Rc;
 
 pub struct TabledData<T> {
     table: Rc<RefCell<HashSet<Rc<T>>>>,
-    pub(crate) module_name: Rc<String>
+    pub(crate) module_name: Rc<String>,
 }
 
 impl<T: Hash + Eq + fmt::Debug> fmt::Debug for TabledData<T> {
@@ -22,14 +22,15 @@ impl<T: Hash + Eq + fmt::Debug> fmt::Debug for TabledData<T> {
 
 impl<T> Clone for TabledData<T> {
     fn clone(&self) -> Self {
-        TabledData { table: self.table.clone(),
+        TabledData {
-                     module_name: self.module_name.clone() }
+            table: self.table.clone(),
+            module_name: self.module_name.clone(),
+        }
     }
 }
 
 impl<T: PartialEq> PartialEq for TabledData<T> {
-    fn eq(&self, other: &TabledData<T>) -> bool
+    fn eq(&self, other: &TabledData<T>) -> bool {
-    {
         Rc::ptr_eq(&self.table, &other.table) && self.module_name == other.module_name
     }
 }
@@ -39,7 +40,7 @@ impl<T: Hash + Eq> TabledData<T> {
     pub fn new(module_name: Rc<String>) -> Self {
         TabledData {
             table: Rc::new(RefCell::new(HashSet::new())),
-            module_name
+            module_name,
         }
     }
 
@@ -51,7 +52,7 @@ impl<T: Hash + Eq> TabledData<T> {
 
 pub struct TabledRc<T: Hash + Eq> {
     pub(crate) atom: Rc<T>,
-    pub table: TabledData<T>
+    pub table: TabledData<T>,
 }
 
 impl<T: Hash + Eq + fmt::Debug> fmt::Debug for TabledRc<T> {
@@ -67,27 +68,27 @@ impl<T: Hash + Eq + fmt::Debug> fmt::Debug for TabledRc<T> {
 // from complaining when deriving Clone for StringList.
 impl<T: Hash + Eq> Clone for TabledRc<T> {
     fn clone(&self) -> Self {
-        TabledRc { atom: self.atom.clone(), table: self.table.clone() }
+        TabledRc {
+            atom: self.atom.clone(),
+            table: self.table.clone(),
+        }
     }
 }
 
 impl<T: Ord + Hash + Eq> PartialOrd for TabledRc<T> {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering>
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-    {
         Some(self.atom.cmp(&other.atom))
     }
 }
 
 impl<T: Ord + Hash + Eq> Ord for TabledRc<T> {
-    fn cmp(&self, other: &Self) -> Ordering
+    fn cmp(&self, other: &Self) -> Ordering {
-    {
         self.atom.cmp(&other.atom)
     }
 }
 
 impl<T: Hash + Eq> PartialEq for TabledRc<T> {
-    fn eq(&self, other: &TabledRc<T>) -> bool
+    fn eq(&self, other: &TabledRc<T>) -> bool {
-    {
         self.atom == other.atom
     }
 }
@@ -104,7 +105,7 @@ impl<T: Hash + Eq + ToString> TabledRc<T> {
     pub fn new(atom: T, table: TabledData<T>) -> Self {
         let atom = match table.borrow_mut().take(&atom) {
             Some(atom) => atom.clone(),
-            None => Rc::new(atom)
+            None => Rc::new(atom),
         };
 
         table.borrow_mut().insert(atom.clone());
@@ -147,7 +148,7 @@ impl<T: Hash + Eq + fmt::Display> fmt::Display for TabledRc<T> {
 
 #[macro_export]
 macro_rules! tabled_rc {
-    ($e:expr, $tbl:expr) => (
+    ($e:expr, $tbl:expr) => {
-        TabledRc::new(String::from($e), $tbl.clone())
+        $crate::tabled_rc::TabledRc::new(String::from($e), $tbl.clone())
-    )
+    };
 }

src/heap_print.rs

@@ -1,9 +1,9 @@
 use prolog_parser_rebis::ast::*;
 use prolog_parser_rebis::{
-    alpha_char, alpha_numeric_char, backslash_char, capital_letter_char, char_class, clause_name,
+    alpha_numeric_char, capital_letter_char, clause_name, cut_char, decimal_digit_char,
-    cut_char, decimal_digit_char, graphic_char, graphic_token_char, is_fx, is_infix, is_postfix,
+    graphic_token_char, is_fx, is_infix, is_postfix, is_prefix, is_xf, is_xfx, is_xfy, is_yfx,
-    is_prefix, is_xf, is_xfx, is_xfy, is_yfx, semicolon_char, sign_char, single_quote_char,
+    semicolon_char, sign_char, single_quote_char, small_letter_char, solo_char,
-    small_letter_char, solo_char, variable_indicator_char,
+    variable_indicator_char,
 };
 
 use crate::clause_types::*;

src/machine/system_calls.rs

@@ -1,11 +1,10 @@
 use prolog_parser_rebis::ast::*;
 use prolog_parser_rebis::parser::*;
-use prolog_parser_rebis::tabled_rc::*;
 use prolog_parser_rebis::{
-    alpha_char, alpha_numeric_char, backslash_char, binary_digit_char, char_class, clause_name,
+    alpha_char, binary_digit_char, clause_name, decimal_digit_char, exponent_char, graphic_char,
-    decimal_digit_char, exponent_char, graphic_char, graphic_token_char, hexadecimal_digit_char,
+    graphic_token_char, hexadecimal_digit_char, layout_char, meta_char, new_line_char,
-    layout_char, meta_char, new_line_char, octal_digit_char, prolog_char, sign_char, solo_char,
+    octal_digit_char, prolog_char, sign_char, solo_char, symbolic_control_char,
-    symbolic_control_char, symbolic_hexadecimal_char, temp_v,
+    symbolic_hexadecimal_char, temp_v,
 };
 
 use lazy_static::lazy_static;