File tree Expand file tree Collapse file tree 1 file changed +31
-0
lines changed Expand file tree Collapse file tree 1 file changed +31
-0
lines changed Original file line number Diff line number Diff line change @@ -868,8 +868,17 @@ impl Executor {
868
868
return ;
869
869
}
870
870
}
871
+ <<<<<<< HEAD
872
+
873
+ self. log_print( String :: from( "Error! item not found in the list\n " ) ) ;
874
+ =======
875
+ <<<<<<< HEAD
871
876
872
877
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
873
882
self . stack . push ( Type :: Error ( String :: from ( "item-not-found" ) ) ) ;
874
883
}
875
884
@@ -1382,7 +1391,15 @@ impl Executor {
1382
1391
<<<<<<< HEAD
1383
1392
=======
1384
1393
=======
1394
+ <<<<<<< HEAD
1395
+ >>>>>>> ce80cb2 ( git )
1396
+ =======
1397
+ <<<<<<< HEAD
1398
+ >>>>>>> ce3cc7e ( git )
1399
+ =======
1385
1400
>>>>>>> ce80cb2 ( git )
1401
+ >>>>>>> 74 bbfe3 ( git )
1402
+ >>>>>>> Stack -Programing -Community -main
1386
1403
"index" => {
1387
1404
let findhint = self . pop_stack ( ) . get_string ( ) ;
1388
1405
let findtarget = self . pop_stack ( ) . get_list ( ) ;
@@ -1406,11 +1423,25 @@ impl Executor {
1406
1423
}
1407
1424
1408
1425
<<<<<<< HEAD
1426
+ <<<<<<< HEAD
1427
+ =======
1428
+ <<<<<<< HEAD
1429
+ >>>>>>> 887510 b ( git )
1430
+ =======
1431
+ =======
1432
+ >>>>>>> 1 d34bfe ( Refactoring )
1433
+ >>>>>>> ce3cc7e ( git )
1434
+ =======
1435
+ >>>>>>> Stack -Programing -Community -main
1409
1436
=======
1410
1437
>>>>>>> 1 d34bfe ( Refactoring )
1411
1438
=======
1412
1439
>>>>>>> 887510 b ( git)
1413
1440
>>>>>>> ce80cb2 ( git)
1441
+ <<<<<<< HEAD
1442
+ =======
1443
+ >>>>>>> 74 bbfe3 ( git )
1444
+ >>>>>>> Stack -Programing -Community -main
1414
1445
// If it is not recognized as a command, use it as a string.
1415
1446
_ => self . stack. push ( Type :: String ( command ) ) ,
1416
1447
}
You can’t perform that action at this time.
0 commit comments