Fixed BasicInterpreterTests runner

Hirevo · Jul 21, 2020 · c5ae8e2 · c5ae8e2
1 parent fcbb9d9
commit c5ae8e2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git 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
@@ -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))
     }
 }