From 6f9ffcedf269fc79d2cc808fa7b1d01ce7d82f70 Mon Sep 17 00:00:00 2001
From: 0rphon <59403052+0rphon@users.noreply.github.com>
Date: Wed, 23 Feb 2022 17:24:51 -0800
Subject: [PATCH] more edge cases

---
 .../expression/access/array_access.leo.out    |  22 +
 .../access/array_range_access.leo.out         |  33 +
 .../parser/expression/access/tuple.leo.out    |  13 +
 .../parser/expression/literal/group.leo.out   |  43 ++
 .../parser/expression/literal/int.leo.out     |   1 +
 .../literal/int_parse/field.leo.out           |  10 +
 .../expression/literal/int_parse/i128.leo.out |  11 +
 .../expression/literal/int_parse/i16.leo.out  |  11 +
 .../expression/literal/int_parse/i32.leo.out  |  11 +
 .../expression/literal/int_parse/i64.leo.out  |  11 +
 .../expression/literal/int_parse/i8.leo.out   |  11 +
 .../literal/int_parse/implicit.leo.out        |  10 +
 .../literal/int_parse/mono_group.leo.out      |  11 +
 .../expression/literal/int_parse/u128.leo.out |  11 +
 .../expression/literal/int_parse/u16.leo.out  | 635 +++++++++---------
 .../expression/literal/int_parse/u32.leo.out  |  11 +
 .../expression/literal/int_parse/u64.leo.out  |  11 +
 .../expression/literal/int_parse/u8.leo.out   |  11 +
 .../parser/expression/unary/negate.leo.out    |  21 +
 .../parser/expression/access/array_access.leo |   1 +
 .../expression/access/array_range_access.leo  |   2 +
 tests/parser/expression/access/tuple.leo      |   3 +-
 tests/parser/expression/literal/group.leo     |   6 +
 tests/parser/expression/literal/int.leo       |   2 +
 .../expression/literal/int_parse/field.leo    |   2 +
 .../expression/literal/int_parse/i128.leo     |   2 +
 .../expression/literal/int_parse/i16.leo      |   2 +
 .../expression/literal/int_parse/i32.leo      |   2 +
 .../expression/literal/int_parse/i64.leo      |   2 +
 .../expression/literal/int_parse/i8.leo       |   2 +
 .../expression/literal/int_parse/implicit.leo |   2 +
 .../literal/int_parse/mono_group.leo          |   2 +
 .../expression/literal/int_parse/u128.leo     |   2 +
 .../expression/literal/int_parse/u16.leo      | 210 +++---
 .../expression/literal/int_parse/u32.leo      |   2 +
 .../expression/literal/int_parse/u64.leo      |   2 +
 .../expression/literal/int_parse/u8.leo       |   2 +
 tests/parser/expression/unary/negate.leo      |   5 +-
 38 files changed, 733 insertions(+), 418 deletions(-)

diff --git a/tests/expectations/parser/parser/expression/access/array_access.leo.out b/tests/expectations/parser/parser/expression/access/array_access.leo.out
index 045d403df6..b30b0f4baf 100644
--- a/tests/expectations/parser/parser/expression/access/array_access.leo.out
+++ b/tests/expectations/parser/parser/expression/access/array_access.leo.out
@@ -287,3 +287,25 @@ outputs:
           col_stop: 10
           path: ""
           content: "x[x].0[x]"
+  - Access:
+      Array:
+        array:
+          Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x[0xb1]\\\"}\"}"
+        index:
+          Value:
+            Implicit:
+              - "0xb1"
+              - span:
+                  line_start: 1
+                  line_stop: 1
+                  col_start: 3
+                  col_stop: 7
+                  path: ""
+                  content: "x[0xb1]"
+        span:
+          line_start: 1
+          line_stop: 1
+          col_start: 1
+          col_stop: 8
+          path: ""
+          content: "x[0xb1]"
diff --git a/tests/expectations/parser/parser/expression/access/array_range_access.leo.out b/tests/expectations/parser/parser/expression/access/array_range_access.leo.out
index d930ff5e17..5ca975ae4d 100644
--- a/tests/expectations/parser/parser/expression/access/array_range_access.leo.out
+++ b/tests/expectations/parser/parser/expression/access/array_range_access.leo.out
@@ -127,6 +127,39 @@ outputs:
           col_stop: 10
           path: ""
           content: "x[0..100]"
+  - Access:
+      ArrayRange:
+        array:
+          Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x[0xb1..0xb3]\\\"}\"}"
+        left:
+          Value:
+            Implicit:
+              - "0xb1"
+              - span:
+                  line_start: 1
+                  line_stop: 1
+                  col_start: 3
+                  col_stop: 7
+                  path: ""
+                  content: "x[0xb1..0xb3]"
+        right:
+          Value:
+            Implicit:
+              - "0xb3"
+              - span:
+                  line_start: 1
+                  line_stop: 1
+                  col_start: 9
+                  col_stop: 13
+                  path: ""
+                  content: "x[0xb1..0xb3]"
+        span:
+          line_start: 1
+          line_stop: 1
+          col_start: 1
+          col_stop: 14
+          path: ""
+          content: "x[0xb1..0xb3]"
   - Access:
       Array:
         array:
diff --git a/tests/expectations/parser/parser/expression/access/tuple.leo.out b/tests/expectations/parser/parser/expression/access/tuple.leo.out
index e904278a34..3a7a8bf43f 100644
--- a/tests/expectations/parser/parser/expression/access/tuple.leo.out
+++ b/tests/expectations/parser/parser/expression/access/tuple.leo.out
@@ -116,3 +116,16 @@ outputs:
           col_stop: 6
           path: ""
           content: x.2.2
+  - Access:
+      Tuple:
+        tuple:
+          Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x.0x1\\\"}\"}"
+        index:
+          value: "0x1"
+        span:
+          line_start: 1
+          line_stop: 1
+          col_start: 1
+          col_stop: 6
+          path: ""
+          content: x.0x1
diff --git a/tests/expectations/parser/parser/expression/literal/group.leo.out b/tests/expectations/parser/parser/expression/literal/group.leo.out
index 0fc89b3546..d14795a232 100644
--- a/tests/expectations/parser/parser/expression/literal/group.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/group.leo.out
@@ -680,3 +680,46 @@ outputs:
             col_stop: 16
             path: ""
             content: "(123, 456)group"
+  - Value:
+      Group:
+        Single:
+          - "1"
+          - span:
+              line_start: 1
+              line_stop: 1
+              col_start: 1
+              col_stop: 7
+              path: ""
+              content: 1group
+  - Value:
+      Group:
+        Single:
+          - "0xb"
+          - span:
+              line_start: 1
+              line_stop: 1
+              col_start: 1
+              col_stop: 9
+              path: ""
+              content: "0xbgroup"
+  - Unary:
+      inner:
+        Value:
+          Group:
+            Single:
+              - "1"
+              - span:
+                  line_start: 1
+                  line_stop: 1
+                  col_start: 2
+                  col_stop: 8
+                  path: ""
+                  content: "-1group"
+      op: Negate
+      span:
+        line_start: 1
+        line_stop: 1
+        col_start: 1
+        col_stop: 8
+        path: ""
+        content: "-1group"
diff --git a/tests/expectations/parser/parser/expression/literal/int.leo.out b/tests/expectations/parser/parser/expression/literal/int.leo.out
index ccac03f213..474e5931e8 100644
--- a/tests/expectations/parser/parser/expression/literal/int.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int.leo.out
@@ -7,6 +7,7 @@ outputs:
   - "'123' @ 1:1-4"
   - "'456' @ 1:1-4"
   - "'123' @ 1:1-4,'456' @ 1:5-8"
+  - "'0x1b' @ 1:1-5"
   - "'87377802873778028737780287377802873778028737780287377802873778028737780287377802' @ 1:1-81"
   - "'8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802' @ 1:1-401"
   - "'340130024' @ 1:1-10"
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/field.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/field.leo.out
index cb5554a989..7009ee5072 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/field.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/field.leo.out
@@ -32,6 +32,16 @@ outputs:
             col_stop: 9
             path: ""
             content: 456field
+  - Value:
+      Implicit:
+        - ""
+        - span:
+            line_start: 0
+            line_stop: 0
+            col_start: 0
+            col_stop: 0
+            path: ""
+            content: ""
   - Value:
       Field:
         - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/i128.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/i128.leo.out
index d77ef66839..a520e07664 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/i128.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/i128.leo.out
@@ -34,6 +34,17 @@ outputs:
             col_stop: 8
             path: ""
             content: 456i128
+  - Value:
+      Integer:
+        - I128
+        - "0xb"
+        - span:
+            line_start: 1
+            line_stop: 1
+            col_start: 1
+            col_stop: 8
+            path: ""
+            content: "0xbi128"
   - Value:
       Integer:
         - I128
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/i16.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/i16.leo.out
index 31e8e2dd46..7309299bf9 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/i16.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/i16.leo.out
@@ -34,6 +34,17 @@ outputs:
             col_stop: 7
             path: ""
             content: 456i16
+  - Value:
+      Integer:
+        - I16
+        - "0xb"
+        - span:
+            line_start: 1
+            line_stop: 1
+            col_start: 1
+            col_stop: 7
+            path: ""
+            content: "0xbi16"
   - Value:
       Integer:
         - I16
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/i32.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/i32.leo.out
index 33de0e6589..40c09d7d35 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/i32.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/i32.leo.out
@@ -34,6 +34,17 @@ outputs:
             col_stop: 7
             path: ""
             content: 456i32
+  - Value:
+      Integer:
+        - I32
+        - "0xb"
+        - span:
+            line_start: 1
+            line_stop: 1
+            col_start: 1
+            col_stop: 7
+            path: ""
+            content: "0xbi32"
   - Value:
       Integer:
         - I32
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/i64.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/i64.leo.out
index 8340b59d0a..8fbfd813a8 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/i64.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/i64.leo.out
@@ -34,6 +34,17 @@ outputs:
             col_stop: 7
             path: ""
             content: 456i64
+  - Value:
+      Integer:
+        - I64
+        - "0xb"
+        - span:
+            line_start: 1
+            line_stop: 1
+            col_start: 1
+            col_stop: 7
+            path: ""
+            content: "0xbi64"
   - Value:
       Integer:
         - I64
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/i8.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/i8.leo.out
index cbbf890a54..9096bc234a 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/i8.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/i8.leo.out
@@ -34,6 +34,17 @@ outputs:
             col_stop: 6
             path: ""
             content: 456i8
+  - Value:
+      Integer:
+        - I8
+        - "0xb"
+        - span:
+            line_start: 1
+            line_stop: 1
+            col_start: 1
+            col_stop: 6
+            path: ""
+            content: "0xbi8"
   - Value:
       Integer:
         - I8
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/implicit.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/implicit.leo.out
index 45764d3e0d..572e639c1c 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/implicit.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/implicit.leo.out
@@ -32,6 +32,16 @@ outputs:
             col_stop: 4
             path: ""
             content: "456"
+  - Value:
+      Implicit:
+        - "0xb"
+        - span:
+            line_start: 1
+            line_stop: 1
+            col_start: 1
+            col_stop: 4
+            path: ""
+            content: "0xb"
   - Value:
       Implicit:
         - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/mono_group.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/mono_group.leo.out
index 26e2547c9f..f08b1b65cc 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/mono_group.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/mono_group.leo.out
@@ -34,6 +34,17 @@ outputs:
               col_stop: 9
               path: ""
               content: 456group
+  - Value:
+      Group:
+        Single:
+          - "0xb"
+          - span:
+              line_start: 1
+              line_stop: 1
+              col_start: 1
+              col_stop: 9
+              path: ""
+              content: "0xbgroup"
   - Value:
       Group:
         Single:
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/u128.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/u128.leo.out
index e1867b83cf..9247af4eff 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/u128.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/u128.leo.out
@@ -34,6 +34,17 @@ outputs:
             col_stop: 8
             path: ""
             content: 456u128
+  - Value:
+      Integer:
+        - U128
+        - "0xb"
+        - span:
+            line_start: 1
+            line_stop: 1
+            col_start: 1
+            col_stop: 8
+            path: ""
+            content: "0xbu128"
   - Value:
       Integer:
         - U128
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/u16.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/u16.leo.out
index ac3fd8bffa..f92d542f72 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/u16.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/u16.leo.out
@@ -4,15 +4,15 @@ expectation: Pass
 outputs:
   - Value:
       Integer:
-        - U8
+        - U16
         - "123"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 6
+            col_stop: 7
             path: ""
-            content: 123u8
+            content: 123u16
   - Value:
       Implicit:
         - "123"
@@ -25,1134 +25,1145 @@ outputs:
             content: "123"
   - Value:
       Integer:
-        - U8
+        - U16
         - "456"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 6
+            col_stop: 7
             path: ""
-            content: 456u8
+            content: 456u16
   - Value:
       Integer:
-        - U8
+        - U16
+        - "0xb"
+        - span:
+            line_start: 1
+            line_stop: 1
+            col_start: 1
+            col_stop: 7
+            path: ""
+            content: "0xbu16"
+  - Value:
+      Integer:
+        - U16
         - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 83
+            col_stop: 84
             path: ""
-            content: 87377802873778028737780287377802873778028737780287377802873778028737780287377802u8
+            content: 87377802873778028737780287377802873778028737780287377802873778028737780287377802u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 403
+            col_stop: 404
             path: ""
-            content: 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802u8
+            content: 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "340130024"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 340130024u8
+            content: 340130024u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "158951116"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 158951116u8
+            content: 158951116u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "155529659"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 155529659u8
+            content: 155529659u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "642023166"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 642023166u8
+            content: 642023166u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "228481736"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 228481736u8
+            content: 228481736u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "469712960"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 469712960u8
+            content: 469712960u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "929437719"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 929437719u8
+            content: 929437719u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "721072814"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 721072814u8
+            content: 721072814u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "363254789"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 363254789u8
+            content: 363254789u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "906732565"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 906732565u8
+            content: 906732565u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "288246391"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 288246391u8
+            content: 288246391u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "724940549"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 724940549u8
+            content: 724940549u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "487101620"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 487101620u8
+            content: 487101620u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "261373583"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 261373583u8
+            content: 261373583u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "891163927"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 891163927u8
+            content: 891163927u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "743967544"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 743967544u8
+            content: 743967544u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "8372586"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 10
+            col_stop: 11
             path: ""
-            content: 8372586u8
+            content: 8372586u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "461793278"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 461793278u8
+            content: 461793278u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "806307045"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 806307045u8
+            content: 806307045u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "122764546"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 122764546u8
+            content: 122764546u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "356336181"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 356336181u8
+            content: 356336181u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "158370903"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 158370903u8
+            content: 158370903u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "774460877"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 774460877u8
+            content: 774460877u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "557174131"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 557174131u8
+            content: 557174131u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "492401267"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 492401267u8
+            content: 492401267u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "893445620"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 893445620u8
+            content: 893445620u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "957757048"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 957757048u8
+            content: 957757048u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "721540649"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 721540649u8
+            content: 721540649u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "390746493"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 390746493u8
+            content: 390746493u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "211251725"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 211251725u8
+            content: 211251725u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "938266114"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 938266114u8
+            content: 938266114u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "156985870"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 156985870u8
+            content: 156985870u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "703831126"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 703831126u8
+            content: 703831126u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "729964155"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 729964155u8
+            content: 729964155u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "988151305"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 988151305u8
+            content: 988151305u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "320872435"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 320872435u8
+            content: 320872435u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "719287167"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 719287167u8
+            content: 719287167u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "152289486"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 152289486u8
+            content: 152289486u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "740067975"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 740067975u8
+            content: 740067975u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "728627816"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 728627816u8
+            content: 728627816u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "385008978"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 385008978u8
+            content: 385008978u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "553967635"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 553967635u8
+            content: 553967635u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "71980713"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 11
+            col_stop: 12
             path: ""
-            content: 71980713u8
+            content: 71980713u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "519444716"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 519444716u8
+            content: 519444716u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "116499965"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 116499965u8
+            content: 116499965u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "717422268"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 717422268u8
+            content: 717422268u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "18966279"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 11
+            col_stop: 12
             path: ""
-            content: 18966279u8
+            content: 18966279u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "22458638"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 11
+            col_stop: 12
             path: ""
-            content: 22458638u8
+            content: 22458638u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "857282620"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 857282620u8
+            content: 857282620u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "920675898"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 920675898u8
+            content: 920675898u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "762235516"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 762235516u8
+            content: 762235516u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "469018377"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 469018377u8
+            content: 469018377u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "199986521"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 199986521u8
+            content: 199986521u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "536679358"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 536679358u8
+            content: 536679358u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "591399452"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 591399452u8
+            content: 591399452u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "83083158"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 11
+            col_stop: 12
             path: ""
-            content: 83083158u8
+            content: 83083158u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "599449051"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 599449051u8
+            content: 599449051u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "445442318"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 445442318u8
+            content: 445442318u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "585486590"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 585486590u8
+            content: 585486590u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "209278800"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 209278800u8
+            content: 209278800u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "873568117"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 873568117u8
+            content: 873568117u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "664470940"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 664470940u8
+            content: 664470940u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "465262783"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 465262783u8
+            content: 465262783u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "605652874"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 605652874u8
+            content: 605652874u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "376803940"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 376803940u8
+            content: 376803940u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "965247040"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 965247040u8
+            content: 965247040u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "598474509"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 598474509u8
+            content: 598474509u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "845119918"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 845119918u8
+            content: 845119918u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "648159133"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 648159133u8
+            content: 648159133u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "669051032"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 669051032u8
+            content: 669051032u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "800600261"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 800600261u8
+            content: 800600261u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "434689764"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 434689764u8
+            content: 434689764u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "520060080"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 520060080u8
+            content: 520060080u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "804659385"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 804659385u8
+            content: 804659385u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "537828058"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 537828058u8
+            content: 537828058u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "716600292"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 716600292u8
+            content: 716600292u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "387020273"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 387020273u8
+            content: 387020273u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "199375617"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 199375617u8
+            content: 199375617u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "680337189"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 680337189u8
+            content: 680337189u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "818479931"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 818479931u8
+            content: 818479931u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "893693281"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 893693281u8
+            content: 893693281u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "87377802"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 11
+            col_stop: 12
             path: ""
-            content: 87377802u8
+            content: 87377802u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "84699261"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 11
+            col_stop: 12
             path: ""
-            content: 84699261u8
+            content: 84699261u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "292826090"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 292826090u8
+            content: 292826090u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "569171405"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 569171405u8
+            content: 569171405u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "387436237"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 387436237u8
+            content: 387436237u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "150682190"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 150682190u8
+            content: 150682190u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "888770419"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 888770419u8
+            content: 888770419u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "824696431"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 824696431u8
+            content: 824696431u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "765659803"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 765659803u8
+            content: 765659803u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "270163693"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 270163693u8
+            content: 270163693u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "427940240"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 427940240u8
+            content: 427940240u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "504997332"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 504997332u8
+            content: 504997332u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "337808338"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 337808338u8
+            content: 337808338u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "907200008"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 907200008u8
+            content: 907200008u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "757177889"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 757177889u8
+            content: 757177889u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "696697188"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 696697188u8
+            content: 696697188u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "41376051"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 11
+            col_stop: 12
             path: ""
-            content: 41376051u8
+            content: 41376051u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "496293518"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 496293518u8
+            content: 496293518u16
   - Value:
       Integer:
-        - U8
+        - U16
         - "251218820"
         - span:
             line_start: 1
             line_stop: 1
             col_start: 1
-            col_stop: 12
+            col_stop: 13
             path: ""
-            content: 251218820u8
+            content: 251218820u16
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/u32.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/u32.leo.out
index 0e9a45c823..3a6f205ab1 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/u32.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/u32.leo.out
@@ -34,6 +34,17 @@ outputs:
             col_stop: 7
             path: ""
             content: 456u32
+  - Value:
+      Integer:
+        - U32
+        - "0xb"
+        - span:
+            line_start: 1
+            line_stop: 1
+            col_start: 1
+            col_stop: 7
+            path: ""
+            content: "0xbu32"
   - Value:
       Integer:
         - U32
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/u64.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/u64.leo.out
index 0e9a45c823..e5c4c3397e 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/u64.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/u64.leo.out
@@ -34,6 +34,17 @@ outputs:
             col_stop: 7
             path: ""
             content: 456u32
+  - Value:
+      Integer:
+        - U64
+        - "0xb"
+        - span:
+            line_start: 1
+            line_stop: 1
+            col_start: 1
+            col_stop: 7
+            path: ""
+            content: "0xbu64"
   - Value:
       Integer:
         - U32
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/u8.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/u8.leo.out
index ac3fd8bffa..e57e3679bb 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/u8.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/u8.leo.out
@@ -34,6 +34,17 @@ outputs:
             col_stop: 6
             path: ""
             content: 456u8
+  - Value:
+      Integer:
+        - U8
+        - "0xb"
+        - span:
+            line_start: 1
+            line_stop: 1
+            col_start: 1
+            col_stop: 6
+            path: ""
+            content: "0xbu8"
   - Value:
       Integer:
         - U8
diff --git a/tests/expectations/parser/parser/expression/unary/negate.leo.out b/tests/expectations/parser/parser/expression/unary/negate.leo.out
index 03766862d2..2bac6e2c01 100644
--- a/tests/expectations/parser/parser/expression/unary/negate.leo.out
+++ b/tests/expectations/parser/parser/expression/unary/negate.leo.out
@@ -143,3 +143,24 @@ outputs:
             col_stop: 5
             path: ""
             content: "-5i8"
+  - Value:
+      Implicit:
+        - "-0xb"
+        - span:
+            line_start: 1
+            line_stop: 1
+            col_start: 1
+            col_stop: 5
+            path: ""
+            content: "-0xb"
+  - Value:
+      Integer:
+        - U8
+        - "-0xb"
+        - span:
+            line_start: 1
+            line_stop: 1
+            col_start: 1
+            col_stop: 7
+            path: ""
+            content: "-0xbu8"
diff --git a/tests/parser/expression/access/array_access.leo b/tests/parser/expression/access/array_access.leo
index 9773b41982..51c6652239 100644
--- a/tests/parser/expression/access/array_access.leo
+++ b/tests/parser/expression/access/array_access.leo
@@ -12,3 +12,4 @@ x[0]()
 x()[0]
 x(y)::y(x)
 x[x].0[x]
+x[0xb1]
\ No newline at end of file
diff --git a/tests/parser/expression/access/array_range_access.leo b/tests/parser/expression/access/array_range_access.leo
index 4ae4f62c3f..2fb418a8ec 100644
--- a/tests/parser/expression/access/array_range_access.leo
+++ b/tests/parser/expression/access/array_range_access.leo
@@ -8,6 +8,8 @@ x[1..]
 x[..1]
 x[1..1]
 x[0..100]
+x[0xb1..0xb3]
+
 
 x[323452345.2345234523453453][323452345.2345234523453453]
 
diff --git a/tests/parser/expression/access/tuple.leo b/tests/parser/expression/access/tuple.leo
index c96e38953f..2b09806562 100644
--- a/tests/parser/expression/access/tuple.leo
+++ b/tests/parser/expression/access/tuple.leo
@@ -8,4 +8,5 @@ x.1
 x.2
 x.0.0
 x.1.1
-x.2.2
\ No newline at end of file
+x.2.2
+x.0x1
\ No newline at end of file
diff --git a/tests/parser/expression/literal/group.leo b/tests/parser/expression/literal/group.leo
index c69a52b93c..fcecaf92cb 100644
--- a/tests/parser/expression/literal/group.leo
+++ b/tests/parser/expression/literal/group.leo
@@ -66,3 +66,9 @@ expectation: Pass
 (123, 456)group
 
 (123, 456)group
+
+1group
+
+0xbgroup
+
+-1group
\ No newline at end of file
diff --git a/tests/parser/expression/literal/int.leo b/tests/parser/expression/literal/int.leo
index a2421a23a2..731cfb7a7c 100644
--- a/tests/parser/expression/literal/int.leo
+++ b/tests/parser/expression/literal/int.leo
@@ -12,6 +12,8 @@ expectation: Pass
 
 123 456
 
+0x1b
+
 87377802873778028737780287377802873778028737780287377802873778028737780287377802
 
 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802
diff --git a/tests/parser/expression/literal/int_parse/field.leo b/tests/parser/expression/literal/int_parse/field.leo
index e8537beb68..9e89345ade 100644
--- a/tests/parser/expression/literal/int_parse/field.leo
+++ b/tests/parser/expression/literal/int_parse/field.leo
@@ -8,6 +8,8 @@ expectation: Pass
 123
 456field
 
+// 0xbfield
+
 87377802873778028737780287377802873778028737780287377802873778028737780287377802field
 
 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802field
diff --git a/tests/parser/expression/literal/int_parse/i128.leo b/tests/parser/expression/literal/int_parse/i128.leo
index 93e554eee9..d79a2b873f 100644
--- a/tests/parser/expression/literal/int_parse/i128.leo
+++ b/tests/parser/expression/literal/int_parse/i128.leo
@@ -8,6 +8,8 @@ expectation: Pass
 123
 456i128
 
+0xbi128
+
 87377802873778028737780287377802873778028737780287377802873778028737780287377802i128
 
 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802i128
diff --git a/tests/parser/expression/literal/int_parse/i16.leo b/tests/parser/expression/literal/int_parse/i16.leo
index 20b4af030c..8aaf6e2fe0 100644
--- a/tests/parser/expression/literal/int_parse/i16.leo
+++ b/tests/parser/expression/literal/int_parse/i16.leo
@@ -8,6 +8,8 @@ expectation: Pass
 123
 456i16
 
+0xbi16
+
 87377802873778028737780287377802873778028737780287377802873778028737780287377802i16
 
 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802i16
diff --git a/tests/parser/expression/literal/int_parse/i32.leo b/tests/parser/expression/literal/int_parse/i32.leo
index 518f8cd778..08c2bf3411 100644
--- a/tests/parser/expression/literal/int_parse/i32.leo
+++ b/tests/parser/expression/literal/int_parse/i32.leo
@@ -8,6 +8,8 @@ expectation: Pass
 123
 456i32
 
+0xbi32
+
 87377802873778028737780287377802873778028737780287377802873778028737780287377802i32
 
 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802i32
diff --git a/tests/parser/expression/literal/int_parse/i64.leo b/tests/parser/expression/literal/int_parse/i64.leo
index fd1a259200..0b5bee3fa7 100644
--- a/tests/parser/expression/literal/int_parse/i64.leo
+++ b/tests/parser/expression/literal/int_parse/i64.leo
@@ -8,6 +8,8 @@ expectation: Pass
 123
 456i64
 
+0xbi64
+
 87377802873778028737780287377802873778028737780287377802873778028737780287377802i64
 
 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802i64
diff --git a/tests/parser/expression/literal/int_parse/i8.leo b/tests/parser/expression/literal/int_parse/i8.leo
index 899b42fecc..29f3080196 100644
--- a/tests/parser/expression/literal/int_parse/i8.leo
+++ b/tests/parser/expression/literal/int_parse/i8.leo
@@ -8,6 +8,8 @@ expectation: Pass
 123
 456i8
 
+0xbi8
+
 87377802873778028737780287377802873778028737780287377802873778028737780287377802i8
 
 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802i8
diff --git a/tests/parser/expression/literal/int_parse/implicit.leo b/tests/parser/expression/literal/int_parse/implicit.leo
index 34c1eed0bd..227681710d 100644
--- a/tests/parser/expression/literal/int_parse/implicit.leo
+++ b/tests/parser/expression/literal/int_parse/implicit.leo
@@ -8,6 +8,8 @@ expectation: Pass
 123
 456
 
+0xb
+
 87377802873778028737780287377802873778028737780287377802873778028737780287377802
 
 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802
diff --git a/tests/parser/expression/literal/int_parse/mono_group.leo b/tests/parser/expression/literal/int_parse/mono_group.leo
index 8871214875..c3b5cdc8c4 100644
--- a/tests/parser/expression/literal/int_parse/mono_group.leo
+++ b/tests/parser/expression/literal/int_parse/mono_group.leo
@@ -8,6 +8,8 @@ expectation: Pass
 123
 456group
 
+0xbgroup
+
 87377802873778028737780287377802873778028737780287377802873778028737780287377802group
 
 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802group
diff --git a/tests/parser/expression/literal/int_parse/u128.leo b/tests/parser/expression/literal/int_parse/u128.leo
index d010081723..9da4ae35cc 100644
--- a/tests/parser/expression/literal/int_parse/u128.leo
+++ b/tests/parser/expression/literal/int_parse/u128.leo
@@ -8,6 +8,8 @@ expectation: Pass
 123
 456u128
 
+0xbu128
+
 87377802873778028737780287377802873778028737780287377802873778028737780287377802u128
 
 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802u128
diff --git a/tests/parser/expression/literal/int_parse/u16.leo b/tests/parser/expression/literal/int_parse/u16.leo
index 1518748456..22bc862509 100644
--- a/tests/parser/expression/literal/int_parse/u16.leo
+++ b/tests/parser/expression/literal/int_parse/u16.leo
@@ -3,112 +3,114 @@ namespace: ParseExpression
 expectation: Pass
 */
 
-123u8
+123u16
 
 123
-456u8
+456u16
 
-87377802873778028737780287377802873778028737780287377802873778028737780287377802u8
+0xbu16
 
-8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802u8
+87377802873778028737780287377802873778028737780287377802873778028737780287377802u16
 
-340130024u8
-158951116u8
-155529659u8
-642023166u8
-228481736u8
-469712960u8
-929437719u8
-721072814u8
-363254789u8
-906732565u8
-288246391u8
-724940549u8
-487101620u8
-261373583u8
-891163927u8
-743967544u8
-8372586u8
-461793278u8
-806307045u8
-122764546u8
-356336181u8
-158370903u8
-774460877u8
-557174131u8
-492401267u8
-893445620u8
-957757048u8
-721540649u8
-390746493u8
-211251725u8
-938266114u8
-156985870u8
-703831126u8
-729964155u8
-988151305u8
-320872435u8
-719287167u8
-152289486u8
-740067975u8
-728627816u8
-385008978u8
-553967635u8
-71980713u8
-519444716u8
-116499965u8
-717422268u8
-18966279u8
-22458638u8
-857282620u8
-920675898u8
-762235516u8
-469018377u8
-199986521u8
-536679358u8
-591399452u8
-83083158u8
-599449051u8
-445442318u8
-585486590u8
-209278800u8
-873568117u8
-664470940u8
-465262783u8
-605652874u8
-376803940u8
-965247040u8
-598474509u8
-845119918u8
-648159133u8
-669051032u8
-800600261u8
-434689764u8
-520060080u8
-804659385u8
-537828058u8
-716600292u8
-387020273u8
-199375617u8
-680337189u8
-818479931u8
-893693281u8
-87377802u8
-84699261u8
-292826090u8
-569171405u8
-387436237u8
-150682190u8
-888770419u8
-824696431u8
-765659803u8
-270163693u8
-427940240u8
-504997332u8
-337808338u8
-907200008u8
-757177889u8
-696697188u8
-41376051u8
-496293518u8
-251218820u8
\ No newline at end of file
+8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802u16
+
+340130024u16
+158951116u16
+155529659u16
+642023166u16
+228481736u16
+469712960u16
+929437719u16
+721072814u16
+363254789u16
+906732565u16
+288246391u16
+724940549u16
+487101620u16
+261373583u16
+891163927u16
+743967544u16
+8372586u16
+461793278u16
+806307045u16
+122764546u16
+356336181u16
+158370903u16
+774460877u16
+557174131u16
+492401267u16
+893445620u16
+957757048u16
+721540649u16
+390746493u16
+211251725u16
+938266114u16
+156985870u16
+703831126u16
+729964155u16
+988151305u16
+320872435u16
+719287167u16
+152289486u16
+740067975u16
+728627816u16
+385008978u16
+553967635u16
+71980713u16
+519444716u16
+116499965u16
+717422268u16
+18966279u16
+22458638u16
+857282620u16
+920675898u16
+762235516u16
+469018377u16
+199986521u16
+536679358u16
+591399452u16
+83083158u16
+599449051u16
+445442318u16
+585486590u16
+209278800u16
+873568117u16
+664470940u16
+465262783u16
+605652874u16
+376803940u16
+965247040u16
+598474509u16
+845119918u16
+648159133u16
+669051032u16
+800600261u16
+434689764u16
+520060080u16
+804659385u16
+537828058u16
+716600292u16
+387020273u16
+199375617u16
+680337189u16
+818479931u16
+893693281u16
+87377802u16
+84699261u16
+292826090u16
+569171405u16
+387436237u16
+150682190u16
+888770419u16
+824696431u16
+765659803u16
+270163693u16
+427940240u16
+504997332u16
+337808338u16
+907200008u16
+757177889u16
+696697188u16
+41376051u16
+496293518u16
+251218820u16
\ No newline at end of file
diff --git a/tests/parser/expression/literal/int_parse/u32.leo b/tests/parser/expression/literal/int_parse/u32.leo
index 05efd55c47..dfde56b641 100644
--- a/tests/parser/expression/literal/int_parse/u32.leo
+++ b/tests/parser/expression/literal/int_parse/u32.leo
@@ -8,6 +8,8 @@ expectation: Pass
 123
 456u32
 
+0xbu32
+
 87377802873778028737780287377802873778028737780287377802873778028737780287377802u32
 
 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802u32
diff --git a/tests/parser/expression/literal/int_parse/u64.leo b/tests/parser/expression/literal/int_parse/u64.leo
index 05efd55c47..e623496208 100644
--- a/tests/parser/expression/literal/int_parse/u64.leo
+++ b/tests/parser/expression/literal/int_parse/u64.leo
@@ -8,6 +8,8 @@ expectation: Pass
 123
 456u32
 
+0xbu64
+
 87377802873778028737780287377802873778028737780287377802873778028737780287377802u32
 
 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802u32
diff --git a/tests/parser/expression/literal/int_parse/u8.leo b/tests/parser/expression/literal/int_parse/u8.leo
index 1518748456..c0d3c58a4b 100644
--- a/tests/parser/expression/literal/int_parse/u8.leo
+++ b/tests/parser/expression/literal/int_parse/u8.leo
@@ -8,6 +8,8 @@ expectation: Pass
 123
 456u8
 
+0xbu8
+
 87377802873778028737780287377802873778028737780287377802873778028737780287377802u8
 
 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802u8
diff --git a/tests/parser/expression/unary/negate.leo b/tests/parser/expression/unary/negate.leo
index 035a0c3c26..91fb2d0a03 100644
--- a/tests/parser/expression/unary/negate.leo
+++ b/tests/parser/expression/unary/negate.leo
@@ -11,4 +11,7 @@ expectation: Pass
 -!x
 
 -5
--5i8
\ No newline at end of file
+-5i8
+
+-0xb
+-0xbu8
\ No newline at end of file