Merge branch 'master' into break-the-loop

src/Analysis/Abstract/BadValues.hs

@@ -30,6 +30,8 @@ instance ( Interpreter m effects
       CallError val     -> yield val
       StringError val   -> yield (pack (show val))
       BoolError{}       -> yield True
+      BoundsError{}     -> yield hole
+      IndexError{}      -> yield hole
       NumericError{}    -> yield hole
       Numeric2Error{}   -> yield hole
       ComparisonError{} -> yield hole

src/Control/Abstract/Value.hs

@@ -113,6 +113,10 @@ class (Monad (m effects), Show value) => MonadValue location value (effects :: [
   -- | Construct the nil/null datatype.
   null :: m effects value
 
+  -- | @index x i@ computes @x[i]@, with zero-indexing.
+  index :: value -> value -> m effects value
+
+  -- | Determine whether the given datum is a 'Hole'.
   isHole :: value -> m effects Bool
 
   -- | Build a class value from a name and environment.

src/Data/Abstract/Type.hs

@@ -41,6 +41,7 @@ data TypeError resume where
   NumOpError       :: Type -> Type -> TypeError Type
   BitOpError       :: Type -> Type -> TypeError Type
   UnificationError :: Type -> Type -> TypeError Type
+  SubscriptError   :: Type -> Type -> TypeError Type
 
 deriving instance Show (TypeError resume)
 
@@ -48,6 +49,7 @@ instance Show1 TypeError where
   liftShowsPrec _ _ _ (NumOpError l r)       = showString "NumOpError " . shows [l, r]
   liftShowsPrec _ _ _ (BitOpError l r)       = showString "BitOpError " . shows [l, r]
   liftShowsPrec _ _ _ (UnificationError l r) = showString "UnificationError " . shows [l, r]
+  liftShowsPrec _ _ _ (SubscriptError l r)   = showString "SubscriptError " . shows [l, r]
 
 instance Eq1 TypeError where
   liftEq _ (BitOpError a b) (BitOpError c d)             = a == c && b == d
@@ -122,6 +124,10 @@ instance ( Alternative (m effects)
 
   isHole ty = pure (ty == Hole)
 
+  index (Array (mem:_)) Int   = pure mem
+  index (Product (mem:_)) Int = pure mem
+  index a b                   = throwResumable (SubscriptError a b)
+
   ifthenelse cond if' else' = unify cond Bool *> (if' <|> else')
 
   liftNumeric _ Float      = pure Float

src/Data/Abstract/Value.hs

@@ -12,6 +12,7 @@ import Data.Abstract.Environment (Environment, emptyEnv, mergeEnvs)
 import qualified Data.Abstract.Environment as Env
 import Data.Abstract.FreeVariables
 import qualified Data.Abstract.Number as Number
+import Data.List (genericIndex, genericLength)
 import Data.Scientific (Scientific)
 import Data.Scientific.Exts
 import Data.Semigroup.Reducer
@@ -280,6 +281,14 @@ instance ( Member (EvalClosure term (Value location)) effects
 
   isHole val = pure (prjValue val == Just Hole)
 
+  index = go where
+    tryIdx list ii
+      | ii > genericLength list = throwValueError (BoundsError list ii)
+      | otherwise               = pure (genericIndex list ii)
+    go arr idx
+      | (Just (Array arr, Integer (Number.Integer i))) <- prjPair (arr, idx) = tryIdx arr i
+      | (Just (Tuple tup, Integer (Number.Integer i))) <- prjPair (arr, idx) = tryIdx tup i
+      | otherwise = throwValueError (IndexError arr idx)
 
   liftNumeric f arg
     | Just (Integer (Number.Integer i)) <- prjValue arg = integer $ f i
@@ -367,10 +376,11 @@ instance ( Member (EvalClosure term (Value location)) effects
     Continue    -> loop x)
 
 
--- The type of exceptions that can be thrown when constructing values in `MonadValue`.
+-- | The type of exceptions that can be thrown when constructing values in 'Value'’s 'MonadValue' instance.
 data ValueError location value resume where
   StringError            :: value          -> ValueError location value ByteString
   BoolError              :: value          -> ValueError location value Bool
+  IndexError             :: value -> value -> ValueError location value value
   NamespaceError         :: Prelude.String -> ValueError location value (Environment location value)
   ScopedEnvironmentError :: Prelude.String -> ValueError location value (Environment location value)
   CallError              :: value          -> ValueError location value value
@@ -382,6 +392,9 @@ data ValueError location value resume where
   KeyValueError          :: value          -> ValueError location value (value, value)
   -- Indicates that we encountered an arithmetic exception inside Haskell-native number crunching.
   ArithmeticError :: ArithException -> ValueError location value value
+  -- Out-of-bounds error
+  BoundsError :: [value] -> Prelude.Integer -> ValueError location value value
+
 
 instance Eq value => Eq1 (ValueError location value) where
   liftEq _ (StringError a) (StringError b)                       = a == b
@@ -389,11 +402,13 @@ instance Eq value => Eq1 (ValueError location value) where
   liftEq _ (ScopedEnvironmentError a) (ScopedEnvironmentError b) = a == b
   liftEq _ (CallError a) (CallError b)                           = a == b
   liftEq _ (BoolError a) (BoolError c)                           = a == c
+  liftEq _ (IndexError a b) (IndexError c d)                     = (a == c) && (b == d)
   liftEq _ (Numeric2Error a b) (Numeric2Error c d)               = (a == c) && (b == d)
   liftEq _ (ComparisonError a b) (ComparisonError c d)           = (a == c) && (b == d)
   liftEq _ (Bitwise2Error a b) (Bitwise2Error c d)               = (a == c) && (b == d)
   liftEq _ (BitwiseError a) (BitwiseError b)                     = a == b
   liftEq _ (KeyValueError a) (KeyValueError b)                   = a == b
+  liftEq _ (BoundsError a b) (BoundsError c d)                   = (a == c) && (b == d)
   liftEq _ _             _                                       = False
 
 deriving instance (Show value) => Show (ValueError location value resume)

src/Data/Syntax/Expression.hs

@@ -5,7 +5,7 @@ import Data.Abstract.Evaluatable
 import Data.Abstract.Number (liftIntegralFrac, liftReal, liftedExponent, liftedFloorDiv)
 import Data.Fixed
 import Diffing.Algorithm
-import Prologue
+import Prologue hiding (index)
 
 -- | Typical prefix function application, like `f(x)` in many languages, or `f x` in Haskell.
 data Call a = Call { callContext :: ![a], callFunction :: !a, callParams :: ![a], callBlock :: !a }
@@ -208,7 +208,10 @@ instance Ord1 Subscript where liftCompare = genericLiftCompare
 instance Show1 Subscript where liftShowsPrec = genericLiftShowsPrec
 
 -- TODO: Implement Eval instance for Subscript
-instance Evaluatable Subscript
+instance Evaluatable Subscript where
+  eval (Subscript l [r]) = join (index <$> subtermValue l <*> subtermValue r)
+  eval (Subscript _ _)   = throwResumable (Unspecialized "Eval unspecialized for subscript with slices")
+  eval (Member _ _)      = throwResumable (Unspecialized "Eval unspecialized for member access")
 
 
 -- | Enumeration (e.g. a[1:10:1] in Python (start at index 1, stop at index 10, step 1 element from start to stop))