From c5ae8e248ca8f37b31246d1acb40baaffb1a5529 Mon Sep 17 00:00:00 2001
From: Nicolas Polomack <nicolas@polomack.eu>
Date: Tue, 21 Jul 2020 13:33:54 +0200
Subject: [PATCH] Fixed BasicInterpreterTests runner

---
 som-interpreter/tests/basic_interpreter_tests.rs | 9 ++-------
 som-parser-core/src/lib.rs                       | 4 +++-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/som-interpreter/tests/basic_interpreter_tests.rs b/som-interpreter/tests/basic_interpreter_tests.rs
index 8c2ead33..b161f331 100644
--- a/som-interpreter/tests/basic_interpreter_tests.rs
+++ b/som-interpreter/tests/basic_interpreter_tests.rs
@@ -6,8 +6,8 @@ use som_interpreter::invokable::Return;
 use som_interpreter::universe::Universe;
 use som_interpreter::value::Value;
 use som_lexer::{Lexer, Token};
+
 use som_parser::lang;
-use som_parser::Parser;
 
 fn setup_universe() -> Universe {
     let classpath = vec![
@@ -140,12 +140,7 @@ fn basic_interpreter_tests() {
             "could not fully tokenize test expression"
         );
 
-        let (ast, rest) = lang::expression().parse(tokens.as_slice()).unwrap();
-        assert!(
-            rest.is_empty(),
-            "could not fully parse test expression: {:?}",
-            rest
-        );
+        let ast = som_parser::apply(lang::expression(), tokens.as_slice()).unwrap();
 
         let kind = FrameKind::Method {
             holder: universe.system_class(),
diff --git a/som-parser-core/src/lib.rs b/som-parser-core/src/lib.rs
index d517323f..abcf2aa3 100644
--- a/som-parser-core/src/lib.rs
+++ b/som-parser-core/src/lib.rs
@@ -88,7 +88,9 @@ where
     B: Parser<T, I>,
 {
     fn parse(&mut self, input: I) -> Option<(T, I)> {
-        self.p1.parse(input.clone()).or_else(|| self.p2.parse(input))
+        self.p1
+            .parse(input.clone())
+            .or_else(|| self.p2.parse(input))
     }
 }