move precedence parsing to nom-language

Author: Geal

nom-language/src/lib.rs

@@ -6,3 +6,4 @@
 //! at language parsing.
 
 pub mod error;
+pub mod precedence;

src/precedence/mod.rs renamed to nom-language/src/precedence/mod.rs

@@ -1,13 +1,10 @@
 //! Combinators to parse expressions with operator precedence.
-#![cfg(feature = "alloc")]
-#![cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
 
 #[cfg(test)]
 mod tests;
 
-use crate::error::{ErrorKind, FromExternalError, ParseError};
-use crate::lib::std::vec::Vec;
-use crate::{Err, IResult, Parser};
+use nom::error::{ErrorKind, FromExternalError, ParseError};
+use nom::{Err, IResult, Parser};
 
 /// An unary operator.
 pub struct Unary<V, Q: Ord + Copy> {
@@ -203,7 +200,6 @@ where
 /// * It then reads the remaining input and evaluates the increment next in order to preserve its
 /// position in the expression \
 /// `((-a)++)**b`.
-#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
 pub fn precedence<I, O, E, E2, F, G, H1, H3, H2, P1, P2, P3, Q>(
   mut prefix: H1,
   mut postfix: H2,

src/precedence/tests.rs renamed to nom-language/src/precedence/tests.rs

@@ -1,18 +1,17 @@
 use crate::precedence::{binary_op, unary_op, Assoc, Operation};
-use crate::{
+use nom::{
   branch::alt,
   bytes::complete::tag,
   character::complete::digit1,
   combinator::{fail, map_res},
   error::ErrorKind,
-  internal::{Err, IResult},
+  error_node_position, error_position,
   sequence::delimited,
+  Err, IResult,
 };
 
-#[cfg(feature = "alloc")]
 use crate::precedence::precedence;
 
-#[cfg(feature = "alloc")]
 fn parser(i: &str) -> IResult<&str, i64> {
   precedence(
     unary_op(1, tag("-")),
@@ -42,7 +41,6 @@ fn parser(i: &str) -> IResult<&str, i64> {
 }
 
 #[test]
-#[cfg(feature = "alloc")]
 fn precedence_test() {
   assert_eq!(parser("3"), Ok(("", 3)));
   assert_eq!(parser("-3"), Ok(("", -3)));

src/lib.rs

@@ -451,8 +451,6 @@ pub mod bytes;
 
 pub mod character;
 
-pub mod precedence;
-
 mod str;
 
 pub mod number;

tests/expression_ast.rs

@@ -4,10 +4,10 @@ use nom::{
   character::complete::{alphanumeric1 as alphanumeric, digit1 as digit},
   combinator::{map, map_res},
   multi::separated_list0,
-  precedence::{binary_op, precedence, unary_op, Assoc, Operation},
   sequence::delimited,
   IResult, Parser,
 };
+use nom_language::precedence::{binary_op, precedence, unary_op, Assoc, Operation};
 
 // Elements of the abstract syntax tree (ast) that represents an expression.
 #[derive(Debug)]
@@ -119,7 +119,7 @@ fn expression(i: &str) -> IResult<&str, Expr> {
       delimited(tag("("), expression, tag(")")),
     )),
     |op: Operation<PrefixOp, PostfixOp, BinaryOp, Expr>| -> Result<Expr, ()> {
-      use nom::precedence::Operation::*;
+      use nom_language::precedence::Operation::*;
       use BinaryOp::*;
       use PostfixOp::*;
       use PrefixOp::*;