Skip to content

Commit 3565337

Browse files
committed
git
2 parents 74bbfe3 + e1b0d54 commit 3565337

File tree

1 file changed

+31
-0
lines changed

1 file changed

+31
-0
lines changed

src/main.rs

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -868,8 +868,17 @@ impl Executor {
868868
return;
869869
}
870870
}
871+
<<<<<<< HEAD
872+
873+
self.log_print(String::from("Error! item not found in the list\n"));
874+
=======
875+
<<<<<<< HEAD
871876

872877
self.log_print(String::from("Error! item not found in the list\n"));
878+
=======
879+
self.log_print(String::from("Error! item not found in the list").as_str().to_owned() + "\n");
880+
>>>>>>> ce3cc7e (git)
881+
>>>>>>> Stack-Programing-Community-main
873882
self.stack.push(Type::Error(String::from("item-not-found")));
874883
}
875884

@@ -1382,7 +1391,15 @@ impl Executor {
13821391
<<<<<<< HEAD
13831392
=======
13841393
=======
1394+
<<<<<<< HEAD
1395+
>>>>>>> ce80cb2 (git)
1396+
=======
1397+
<<<<<<< HEAD
1398+
>>>>>>> ce3cc7e (git)
1399+
=======
13851400
>>>>>>> ce80cb2 (git)
1401+
>>>>>>> 74bbfe3 (git)
1402+
>>>>>>> Stack-Programing-Community-main
13861403
"index" => {
13871404
let findhint = self.pop_stack().get_string();
13881405
let findtarget = self.pop_stack().get_list();
@@ -1406,11 +1423,25 @@ impl Executor {
14061423
}
14071424

14081425
<<<<<<< HEAD
1426+
<<<<<<< HEAD
1427+
=======
1428+
<<<<<<< HEAD
1429+
>>>>>>> 887510b (git)
1430+
=======
1431+
=======
1432+
>>>>>>> 1d34bfe (Refactoring)
1433+
>>>>>>> ce3cc7e (git)
1434+
=======
1435+
>>>>>>> Stack-Programing-Community-main
14091436
=======
14101437
>>>>>>> 1d34bfe (Refactoring)
14111438
=======
14121439
>>>>>>> 887510b (git)
14131440
>>>>>>> ce80cb2 (git)
1441+
<<<<<<< HEAD
1442+
=======
1443+
>>>>>>> 74bbfe3 (git)
1444+
>>>>>>> Stack-Programing-Community-main
14141445
// If it is not recognized as a command, use it as a string.
14151446
_ => self.stack.push(Type::String(command)),
14161447
}

0 commit comments

Comments
 (0)