bug fix

Author: leonovk

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "minicode"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 
 [dependencies]

Cargo.toml

@@ -21,9 +21,9 @@ pub fn calculate<'a>(
     let old_value = match target.get(key) {
         Some(s) => match s {
             Int(i) => i,
-            Line(_s) => &0,
+            Line(_s) => panic!("wrong type for calculate"),
         },
-        None => &0,
+        None => panic!("not value for calculate"),
     };
 
     let new_value = match o_type {
@@ -51,9 +51,9 @@ pub fn condition(
                     return i != target_value;
                 }
             }
-            Line(_s) => panic!("not value"),
+            Line(_s) => panic!("condition - wrong type value"),
         },
-        None => panic!("not value"),
+        None => panic!("condition - not value"),
     };
 }
 
@@ -65,6 +65,6 @@ pub fn print_value(key: &String, storage: &HashMap<&String, ValueType>) {
             Int(i) => println!("{}", i),
             Line(s) => println!("{}", s),
         },
-        None => panic!("not value"),
+        None => panic!("not value for print"),
     };
 }

src/interpreter/code_operations.rs

@@ -16,7 +16,7 @@ pub fn exegete(operations: Vec<OpCode>) {
             Create(k, v) => code_operations::create(k, v, &mut addresses),
             Print(k) => code_operations::print_value(k, &addresses),
             Operation(k, o, v) => code_operations::calculate(k, o, v, &mut addresses),
-            ErrorCode(e) => panic!("{}", e),
+            ErrorCode(e) => println!("{} - line - {}", e, pointer + 1),
             Condition(k, v, b, p) => {
                 let result = code_operations::condition(k, b, v, &addresses);
                 if result {

src/interpreter/mod.rs

@@ -16,7 +16,7 @@ pub fn calculation(data: Vec<&str>) -> OpCode {
 
     match data[3].to_string().parse::<i64>() {
         Ok(parsed) => Operation(value_name, op, parsed),
-        Err(_e) => ErrorCode("wrong operation".to_string()),
+        Err(_e) => ErrorCode("wrong type for operation".to_string()),
     }
 }
 
@@ -25,17 +25,17 @@ pub fn condition(data: Vec<&str>) -> OpCode {
     let true_or_false = match data[2] {
         "=" => true,
         "!" => false,
-        _ => return ErrorCode("wrong operation".to_string()),
+        _ => return ErrorCode("wrong condition".to_string()),
     };
 
     let target_value = match data[3].parse::<i64>() {
         Ok(parsed) => parsed,
-        Err(_) => return ErrorCode("wrong operation".to_string()),
+        Err(_) => return ErrorCode("wrong target value for operation".to_string()),
     };
 
     let target_pointer = match data[4].parse::<usize>() {
         Ok(parsed) => parsed,
-        Err(_) => return ErrorCode("wrong operation".to_string()),
+        Err(_) => return ErrorCode("wrong target pointer".to_string()),
     };
 
     Condition(value_name, target_value, true_or_false, target_pointer)
@@ -45,7 +45,7 @@ pub fn user_var(data: Vec<&str>) -> OpCode {
     let mut input = String::new();
     let value_name = data[1].to_string();
     io::stdin().read_line(&mut input).expect("dont read");
-    match input.parse::<i64>() {
+    match input.trim().parse::<i64>() {
         Ok(parsed) => Create(value_name, Int(parsed)),
         Err(_e) => Create(value_name, Line(input)),
     }

src/parser/opcode_operations.rs

@@ -19,7 +19,7 @@ pub fn get_opcode(line: &String) -> OpCode {
     } else if parts[0] == "?" {
         opcode_operations::condition(parts)
     } else {
-        ErrorCode("no command".to_string())
+        ErrorCode("Could not recognize the command".to_string())
     }
 }
 

src/parser/opcode_parser.rs

@@ -0,0 +1,3 @@
+$> a
+= a + 10
+p a