Make a literal hold a i128 representation always

ms705 · Aug 22, 2019 · bbc9d9a · bbc9d9a
1 parent 0e38846
commit bbc9d9a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/src/common.rs b/src/common.rs
@@ -84,8 +84,7 @@ pub struct Real {
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub enum Literal {
     Null,
-    Integer(i64),
-    UnsignedInteger(u64),
+    Integer(i128),
     FixedPoint(Real),
     String(String),
     Blob(Vec<u8>),
@@ -95,15 +94,21 @@ pub enum Literal {
     Placeholder,
 }
 
+impl From<i128> for Literal {
+    fn from(i: i128) -> Self {
+        Literal::Integer(i)
+    }
+}
+
 impl From<i64> for Literal {
     fn from(i: i64) -> Self {
-        Literal::Integer(i)
+        Literal::Integer(i.into())
     }
 }
 
 impl From<u64> for Literal {
     fn from(i: u64) -> Self {
-        Literal::UnsignedInteger(i)
+        Literal::Integer(i.into())
     }
 }
 
@@ -115,7 +120,7 @@ impl From<i32> for Literal {
 
 impl From<u32> for Literal {
     fn from(i: u32) -> Self {
-        Literal::UnsignedInteger(i.into())
+        Literal::Integer(i.into())
     }
 }
 
@@ -136,7 +141,6 @@ impl ToString for Literal {
         match *self {
             Literal::Null => "NULL".to_string(),
             Literal::Integer(ref i) => format!("{}", i),
-            Literal::UnsignedInteger(ref i) => format!("{}", i),
             Literal::FixedPoint(ref f) => format!("{}.{}", f.integral, f.fractional),
             Literal::String(ref s) => format!("'{}'", s.replace('\'', "''")),
             Literal::Blob(ref bv) => format!(
@@ -884,13 +888,7 @@ named!(pub integer_literal<CompleteByteSlice, Literal>,
             if sign.is_some() {
                 intval *= -1;
             }
-            if intval > std::i64::MAX as i128 {
-                Literal::UnsignedInteger(intval as u64)
-            } else if intval < std::i64::MIN as i128 {
-                panic!("{:?} can't fit in a Literal::Integer", intval)
-            } else {
-                Literal::Integer(intval as i64)
-            }
+            Literal::Integer(intval)
         })
     )
 );

diff --git a/src/create.rs b/src/create.rs
@@ -283,7 +283,7 @@ named!(pub column_constraint<CompleteByteSlice, Option<ColumnConstraint>>,
                               })
                     ))
                   | do_parse!(d: digit >> (
-                        Literal::Integer(i64::from_str(str::from_utf8(*d).unwrap()).unwrap())
+                        Literal::Integer(i128::from_str(str::from_utf8(*d).unwrap()).unwrap())
                     ))
                   | do_parse!(tag!("''") >> (Literal::String(String::from(""))))
                   | do_parse!(tag_no_case!("null") >> (Literal::Null))