Kjp/better exceptions

rust-toolchain

@@ -0,0 +1 @@
+nightly-2021-07-25

src/atn_config_set.rs

@@ -59,15 +59,15 @@ impl Hash for Key {
 
 impl Debug for ATNConfigSet {
     fn fmt(&self, _f: &mut Formatter<'_>) -> Result<(), Error> {
-        _f.write_str("ATNConfigSet")?;
+        _f.write_str("ATNConfigSet,hash:")?;
         _f.debug_list().entries(self.configs.iter()).finish()?;
         if self.has_semantic_context {
             _f.write_str(",hasSemanticContext=true")?
         }
         if self.conflicting_alts.is_empty() {
-            _f.write_fmt(format_args!(",uniqueAlt={}", self.unique_alt))
+            _f.write_fmt(format_args!(",hash={},uniqueAlt={}", self.cached_hash, self.unique_alt))
         } else {
-            _f.write_fmt(format_args!(",conflictingAlts={:?}", self.conflicting_alts))
+            _f.write_fmt(format_args!(",hash={},conflictingAlts={:?}", self.cached_hash,self.conflicting_alts))
         }
     }
 }

src/lib.rs

@@ -1,7 +1,5 @@
 #![crate_type = "lib"]
 #![feature(try_blocks)]
-//#![feature(nll)]
-#![feature(raw)]
 #![feature(is_sorted)]
 #![feature(cell_update)]
 #![feature(get_mut_unchecked)]
@@ -13,7 +11,6 @@
 // #![feature(generic_associated_types)]
 #![warn(rust_2018_idioms)]
 #![warn(missing_docs)] // warn if there is missing docs
-#![warn(missing_debug_implementations)]
 #![warn(trivial_numeric_casts)]
 #![allow(incomplete_features)]
 

src/parser_rule_context.rs

@@ -25,6 +25,8 @@ pub trait ParserRuleContext<'input>:
     ParseTree<'input> + RuleContext<'input> + Debug + Tid<'input>
 {
     fn set_exception(&self, _e: ANTLRError) {}
+    fn has_exception(&self) -> bool { false }
+    fn get_exception(&self) -> Option<Box<ANTLRError>> { None }
 
     fn set_start(&self, _t: Option<<Self::TF as TokenFactory<'input>>::Tok>) {}
 
@@ -234,7 +236,7 @@ pub struct BaseParserRuleContext<'input, Ctx: CustomRuleContext<'input>> {
     start: RefCell<<Ctx::TF as TokenFactory<'input>>::Tok>,
     stop: RefCell<<Ctx::TF as TokenFactory<'input>>::Tok>,
     /// error if there was any in this node
-    pub exception: Option<Box<ANTLRError>>,
+    pub exception: RefCell<Option<Box<ANTLRError>>>,
     /// List of children of current node
     pub(crate) children: RefCell<Vec<Rc<<Ctx::Ctx as ParserNodeType<'input>>::Type>>>,
 }
@@ -302,7 +304,31 @@ impl<'input, Ctx: CustomRuleContext<'input>> BorrowMut<Ctx> for BaseParserRuleCo
 impl<'input, Ctx: CustomRuleContext<'input> + TidAble<'input>> ParserRuleContext<'input>
     for BaseParserRuleContext<'input, Ctx>
 {
-    fn set_exception(&self, _e: ANTLRError) { /*self.exception = Some(Box::new(e));*/
+    fn set_exception(&self, e: ANTLRError) {
+        {
+            if self.exception.try_borrow_mut().is_err() {
+                eprintln!("Unable to borrow as mutable: {:?}", self);
+                return;
+            }
+        }
+        self.exception.replace(Some(Box::new(e)));
+    }
+
+    fn has_exception(&self) -> bool {
+        if let Ok(exc) = self.exception.try_borrow() {
+            exc.is_some()
+        } else {
+            true
+        }
+    }
+
+    fn get_exception(&self) -> Option<Box<ANTLRError>> {
+        if let Ok(exc) = self.exception.try_borrow() {
+            exc.clone()
+        } else {
+            eprintln!("Unable to check exception: {:?}", self);
+            None
+        }
     }
 
     fn set_start(&self, t: Option<<Ctx::TF as TokenFactory<'input>>::Tok>) {
@@ -433,7 +459,7 @@ impl<'input, Ctx: CustomRuleContext<'input> + 'input> BaseParserRuleContext<'inp
             base: BaseRuleContext::new_parser_ctx(parent_ctx, invoking_state, ext),
             start: RefCell::new(Ctx::TF::create_invalid()),
             stop: RefCell::new(Ctx::TF::create_invalid()),
-            exception: None,
+            exception: RefCell::new(None),
             children: RefCell::new(vec![]),
         }
     }
@@ -449,7 +475,7 @@ impl<'input, Ctx: CustomRuleContext<'input> + 'input> BaseParserRuleContext<'inp
             ),
             start: RefCell::new(ctx.start_mut().clone()),
             stop: RefCell::new(ctx.stop_mut().clone()),
-            exception: None,
+            exception: RefCell::new(None),
             children: RefCell::new(ctx.get_children().collect()),
         }
     }
@@ -474,6 +500,8 @@ where
     I: ParserRuleContext<'input> + 'input + ?Sized,
 {
     fn set_exception(&self, e: ANTLRError) { self.deref().set_exception(e) }
+    fn has_exception(&self) -> bool { self.deref().has_exception() }
+    fn get_exception(&self) -> Option<Box<ANTLRError>> { self.deref().get_exception() }
 
     fn set_start(&self, t: Option<<Self::TF as TokenFactory<'input>>::Tok>) {
         self.deref().set_start(t)

tests/my_test.rs

@@ -1,6 +1,4 @@
 #![feature(try_blocks)]
-#![feature(inner_deref)]
-#![feature(specialization)]
 #![feature(coerce_unsized)]
 //! Integration tests
 
@@ -9,7 +7,6 @@
 
 mod gen {
     use std::fmt::Write;
-    use std::io::Read;
     use std::iter::FromIterator;
 
     use antlr_rust::common_token_stream::CommonTokenStream;

tests/perf.rs

@@ -1,5 +1,4 @@
 #![feature(try_blocks)]
-#![feature(inner_deref)]
 #![feature(test)]
 #[macro_use]
 extern crate lazy_static;