fix: lexer

Signed-off-by: Blue Kirby <blue.kirby@tutanota.com>
Irys-xyz · May 17, 2023 · 3b741e5 · 3b741e5
1 parent 2e98702
commit 3b741e5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/utils/eip712/lexer.rs b/src/utils/eip712/lexer.rs
@@ -27,7 +27,7 @@ pub enum Token {
     #[regex("[a-zA-Z_$][a-zA-Z0-9_$]*")]
     Identifier,
 
-    #[regex("byte|bytes[1-2][0-9]?|bytes3[0-2]?|bytes[4-9]", validate_bytes)]
+    #[regex("bytes1|bytes[1-2][0-9]?|bytes3[0-2]?|bytes[4-9]", validate_bytes)]
     TypeByte,
 
     #[token("bytes")]
@@ -36,10 +36,10 @@ pub enum Token {
     #[token("bool")]
     TypeBool,
 
-    #[regex("uint|uint256", default_size)]
+    #[regex("uint(8|16|24|32|40|48|56|64|72|80|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256)", default_size)]
     TypeUint,
 
-    #[token("int", default_size)]
+    #[regex("int(8|16|24|32|40|48|56|64|72|80|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256)", default_size)]
     TypeInt,
 
     #[token("string")]

diff --git a/src/utils/eip712/parser.rs b/src/utils/eip712/parser.rs
@@ -118,7 +118,7 @@ mod tests {
 
     #[test]
     fn test_parser() {
-        let source = "byte[][][7][][][][][][][]";
+        let source = "bytes1[][][7][][][][][][][]";
         let ok = parse_type(source).unwrap();
         println!("{:?}", ok);
         assert!(
@@ -158,13 +158,19 @@ mod tests {
 
     #[test]
     fn test_nested_array() {
+        let source = "bytes1[][][7][][][][][][][][]";
+        assert!(parse_type(source).is_err());
+        let source = "byte1[][][7][][][][][][][][]";
+        assert!(parse_type(source).is_err());
         let source = "byte[][][7][][][][][][][][]";
         assert!(parse_type(source).is_err());
     }
 
     #[test]
     fn test_malformed_array_type() {
+        let source = "bytes1[7[]uint][]";
+        assert!(parse_type(source).is_err());
         let source = "byte[7[]uint][]";
-        assert!(parse_type(source).is_err())
+        assert!(parse_type(source).is_err());
     }
 }
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
@@ -1,9 +1,9 @@
 #[cfg(any(feature = "ethereum", feature = "erc20"))]
 mod eip712;
 
-pub use eip712::hash_structured_data;
-pub use eip712::Eip712Error;
-pub use eip712::EIP712;
+pub(crate) use eip712::hash_structured_data;
+pub(crate) use eip712::Eip712Error;
+pub(crate) use eip712::EIP712;
 
 use std::{
     fs::File,