fix convert and looprange

Author: kotapiku

hs-src/Language/Egison/Core.hs

@@ -1067,8 +1067,10 @@ processMStatesAll depth streams = do
      else mappend matches $ processMStatesAll (depth + 1) streams'
  where
   convert :: Map Int [a] -> [[a]]
-  convert = M.foldlWithKey (\l k x -> if length l <= k then l ++ (replicate (k - length l) []) ++ [x]
-                                                       else let (xs, y:ys) = splitAt k l in xs ++ (x:ys)) []
+  convert ms = let ((start, root), ms') = M.deleteFindMin ms in
+                   M.foldlWithKey (\l k x -> let k' = k - start in
+                                                 if length l <= k' then l ++ (replicate (k' - length l) []) ++ [x]
+                                                                   else let (xs, y:ys) = splitAt k' l in xs ++ (x:ys)) [root] ms'
 
 processMStatesLine :: Int -> MatchingStates -> EgisonM MatchingStates
 processMStatesLine depth streams = do

hs-src/Language/Egison/ParserNonS.hs

@@ -654,7 +654,7 @@ loopPat :: Parser EgisonPattern
 loopPat = keywordLoop >> parens (char '$' >> LoopPat <$> identVarWithoutIndex <*> (comma >> loopRange) <*> (comma >> pattern) <*> (comma >> option (NotPat WildCard) pattern))
 
 loopRange :: Parser LoopRange
-loopRange = parens (try (LoopRange <$> expr <* comma <*> expr <* comma <*> option WildCard pattern)
+loopRange = parens (try (LoopRange <$> expr <* comma <*> expr <*> option WildCard (comma >> pattern))
                  <|> (do s <- expr
                          comma
                          ep <- option WildCard pattern