Adjusting tests and fixing ambiguity in execution

Pi-Squared-Inc · Sep 5, 2024 · df723ab · df723ab
1 parent 0c902b5
commit df723ab
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 30 deletions.
diff --git a/rust-lite/src/rust_lite/__main__.py b/rust-lite/src/rust_lite/__main__.py
@@ -60,7 +60,6 @@ def exec_run(options: RunOptions) -> None:
     print('Performed all possible rewriting operations; Trying to fetch the content of the K cell.')
 
     module_manager.print_k_top_element()
-    module_manager.print_constants_cell()
 
 def trigger_exec_run(stripped_args):
     options = generate_options(stripped_args)

diff --git a/rust-semantics/expression/literals.md b/rust-semantics/expression/literals.md
@@ -96,10 +96,4 @@ module RUST-EXPRESSION-INTEGER-LITERALS
 
 endmodule
 
-module RUST-EXPRESSION-BOOLEAN-LITERALS
-    imports BOOL
-    imports RUST-SHARED-SYNTAX
-    
-    rule true:LiteralExpression => true:Bool
-endmodule
 ```
diff --git a/rust-semantics/rust-common-syntax.md b/rust-semantics/rust-common-syntax.md
@@ -257,8 +257,7 @@ https://doc.rust-lang.org/reference/items/extern-crates.html
                               | ByteLiteral | ByteStringLiteral | RawByteStringLiteral
                               | CStringLiteral | RawCStringLiteral
                               | IntegerLiteral | FloatLiteral
-                              | "true" | "false"
-
+                              
   syntax CharLiteral ::= "TODO: not needed yet, not implementing"
   // TODO: Not implemented properly
   syntax StringLiteral ::= String

diff --git a/tests/execution/arithmetic-expression.1.run b/tests/execution/arithmetic-expression.1.run
diff --git a/tests/execution/arithmetic-expression.2.run b/tests/execution/arithmetic-expression.2.run
diff --git a/tests/execution/arithmetic-expression.3.run b/tests/execution/arithmetic-expression.3.run
diff --git a/tests/execution/arithmetic-expression.4.run b/tests/execution/arithmetic-expression.4.run
diff --git a/tests/execution/arithmetic-expression.5.run b/tests/execution/arithmetic-expression.5.run
diff --git a/tests/execution/integer-operations.1.run b/tests/execution/integer-operations.1.run
@@ -0,0 +1,4 @@
+new IntegerOperations;
+call IntegerOperations.arithmetic_expression_mult_constant;
+return_value;
+check_eq 86400_u64
diff --git a/tests/execution/integer-operations.2.run b/tests/execution/integer-operations.2.run
@@ -0,0 +1,4 @@
+new IntegerOperations;
+call IntegerOperations.arithmetic_expression_div_constant;
+return_value;
+check_eq 2_u64
diff --git a/tests/execution/integer-operations.3.run b/tests/execution/integer-operations.3.run
@@ -0,0 +1,4 @@
+new IntegerOperations;
+call IntegerOperations.arithmetic_expression_sum_constant;
+return_value;
+check_eq 101_u64
diff --git a/tests/execution/integer-operations.4.run b/tests/execution/integer-operations.4.run
@@ -0,0 +1,4 @@
+new IntegerOperations;
+call IntegerOperations.arithmetic_expression_sub_constant;
+return_value;
+check_eq 99_u64
diff --git a/tests/execution/integer-operations.5.run b/tests/execution/integer-operations.5.run
@@ -0,0 +1,4 @@
+new IntegerOperations;
+call IntegerOperations.arithmetic_expression_mod_constant;
+return_value;
+check_eq 2_u64
diff --git a/tests/execution/arithmetic-expression.rs → tests/execution/integer-operations.rs b/tests/execution/arithmetic-expression.rs → tests/execution/integer-operations.rs
@@ -4,7 +4,7 @@
 use multiversx_sc::imports::*;
 
 #[multiversx_sc::contract]
-pub trait ArithmeticExpression {
+pub trait IntegerOperations {
     #[init]
     fn init(&self) {
     }
@@ -22,4 +22,19 @@ pub trait ArithmeticExpression {
 
     fn arithmetic_expression_mod_constant(&self) -> u64 { 5_u64 % 3_u64 }
 
+    fn relational_expression_equals(&self) -> bool {
+        let x = 5_u64 == 5_u64;
+        x
+    }
+
+    fn relational_expression_diff(&self) -> bool { 5_i64 != 5_i64 }
+
+    fn relational_expression_smaller_or_equal(&self) -> bool { 70_u128 <= 7_u128 }
+
+    fn relational_expression_greater_or_equal(&self) -> bool { 70_u128 >= 7_u128 }
+
+    fn relational_expression_smaller(&self) -> bool { 5_u32 < 7_u32 }
+
+    fn relational_expression_greater(&self) -> bool { 5_i32 < 7_i32 }
+
 }