♻️ fix routines sortby

cmp.sh

@@ -3,13 +3,17 @@
 foones() {
   TEST_INPUT="test/mamarracho/test$1.flecha"
   FOONES="_cmp/foones/test$1.mam"
+  FOONES_OUT="_cmp/foones/test$1.output"
   ./bin/flecha_foones "$TEST_INPUT" > "$FOONES"
+  ./bin/mamarracho "$FOONES" > "$FOONES_OUT"
 }
 
 diwy() {
   TEST_INPUT="test/mamarracho/test$1.flecha"
   DIWY="_cmp/diwy/test$1.mam"
+  DIWY_OUT="_cmp/diwy/test$1.output"
   cabal run --verbose=silent flecha -- "$TEST_INPUT" --mam > "$DIWY"
+  ./bin/mamarracho "$DIWY" > "$DIWY_OUT"
 }
 
 RUN_MODE=$1

src/Mamarracho.hs

@@ -9,6 +9,7 @@ import Control.Monad.State (execState, MonadState(put, get))
 import Data.Char (ord)
 import Data.Function (on)
 import Data.List (intercalate, sortBy, (\\), union)
+import Data.Text (unpack, replace, pack)
 
 -- Compilation
 
@@ -208,7 +209,10 @@ getCode mam = [Jump "start"]
            ++ code mam
 
 unfoldRoutines :: [CodeRoutine] -> [Instruction]
-unfoldRoutines = unfoldRoutines' [] . sortBy (compare `on` fst)
+unfoldRoutines = unfoldRoutines' [] . sortBy (compare `on` fstNum)
+
+fstNum :: (Label, [Instruction]) -> Int
+fstNum (label, _) = read $ unpack $ replace (pack "rtn") (pack "") (pack label) :: Int
 
 unfoldRoutines' :: [Instruction] -> [CodeRoutine] -> [Instruction]
 unfoldRoutines' ins [] = ins