diff --git a/src/ast/types.rs b/src/ast/types.rs index 39dd092..05690ab 100644 --- a/src/ast/types.rs +++ b/src/ast/types.rs @@ -62,8 +62,8 @@ pub struct Definition { /// A reduced value. #[derive(PartialEq, PartialOrd, Debug, Clone)] pub enum Value { - Int(i64), - Float(f64), + Int(i32), + Float(f32), String(String), Boolean(bool), Record(Record), @@ -159,14 +159,14 @@ impl Expr { } } -impl From for Value { - fn from(i: i64) -> Value { +impl From for Value { + fn from(i: i32) -> Value { Value::Int(i) } } -impl From for Expr { - fn from(i: i64) -> Expr { +impl From for Expr { + fn from(i: i32) -> Expr { Expr::Value(i.into()) } } diff --git a/src/parser/scanner.rs b/src/parser/scanner.rs index d137256..86421ec 100644 --- a/src/parser/scanner.rs +++ b/src/parser/scanner.rs @@ -165,7 +165,7 @@ pub fn scan(source: String) -> Tokens { break; } } - let i = str.parse::().unwrap(); + let i = str.parse::().unwrap(); tokens.push(LocatedToken { start, end: scanner.cursor(), diff --git a/src/parser/types.rs b/src/parser/types.rs index 28d9c0a..4bf18ea 100644 --- a/src/parser/types.rs +++ b/src/parser/types.rs @@ -34,7 +34,7 @@ pub enum Token { Colon, True, False, - Number(u32), + Number(u16), String(String), Identifier(String), Label(String),