fix bug of eval [g_1_1]|x

Author: kotapiku

hs-src/Language/Egison/Core.hs

@@ -289,8 +289,14 @@ evalExpr env (IndexedExpr bool expr indices) = do
                              Userscript n -> evalExprDeep env n >>= extractScalar >>= return . Userscript
                     ) indices
         return $ Value (ScalarData (Div (Plus [(Term 1 [(Symbol id name js2, 1)])]) (Plus [(Term 1 [])])))
-      (Value (ScalarData _)) -> do
-        return $ tensor
+      (Value (ScalarData (Div (Plus [(Term 1 [(Symbol id name js', 1)])]) (Plus [(Term 1 [])])))) -> do
+        js2 <- mapM (\i -> case i of
+                             Superscript n -> evalExprDeep env n >>= extractScalar >>= return . Superscript
+                             Subscript n -> evalExprDeep env n >>= extractScalar >>= return . Subscript
+                             SupSubscript n -> evalExprDeep env n >>= extractScalar >>= return . SupSubscript
+                             Userscript n -> evalExprDeep env n >>= extractScalar >>= return . Userscript
+                    ) indices
+        return $ Value (ScalarData (Div (Plus [(Term 1 [(Symbol id name (js' ++ js2), 1)])]) (Plus [(Term 1 [])])))
       (Value (TensorData (Tensor ns xs is))) -> do
         if bool then tref js (Tensor ns xs js) >>= toTensor >>= tContract' >>= fromTensor >>= return . Value
                 else tref (is ++ js) (Tensor ns xs (is ++ js)) >>= toTensor >>= tContract' >>= fromTensor >>= return . Value

hs-src/Language/Egison/Parser.hs

@@ -172,19 +172,18 @@ exprs = endBy expr whiteSpace
 
 expr :: Parser EgisonExpr
 expr = P.lexeme lexer (do expr0 <- expr' <|> quoteExpr'
-                          expr1 <- option expr0 $ try (do string "..."
-                                                          IndexedExpr False expr0 <$> parseindex)
+                          expr1 <- option expr0 $ try (string "..." >> IndexedExpr False expr0 <$> parseindex)
                                                   <|> IndexedExpr True expr0 <$> parseindex
                           option expr1 $ PowerExpr expr1 <$> (try $ char '^' >> expr'))
                             where parseindex :: Parser [Index EgisonExpr]
                                   parseindex = many1 (try (do
-                                                               char '_' 
-                                                               e1 <- expr'
-                                                               string "..._"
-                                                               e2 <- expr'
-                                                               return $ MultiSubscript e1 e2)
+                                                           char '_' 
+                                                           e1 <- expr'
+                                                           string "..._"
+                                                           e2 <- expr'
+                                                           return $ MultiSubscript e1 e2)
                                                  <|> try (do
-                                                           char '~' 
+                                                           char '~'
                                                            e1 <- expr'
                                                            string "...~"
                                                            e2 <- expr'

hs-src/Language/Egison/Types.hs

@@ -1180,6 +1180,8 @@ instance Show EgisonExpr where
   show (VarExpr name) = show name
   show (PartialVarExpr n) = "%" ++ show n
   show (FunctionExpr args) = "(function [" ++ unwords (map show args) ++ "])"
+  show (IndexedExpr b expr idxs) = show expr ++ concatMap show idxs
+  show (TupleExpr exprs) = "[" ++ unwords (map show exprs) ++ "]"
 
   show (ApplyExpr fn (TupleExpr [])) = "(" ++ show fn ++ ")"
   show (ApplyExpr fn (TupleExpr args)) = "(" ++ show fn ++ " " ++ unwords (map show args) ++ ")"