Skip to content

Allow appending and then dropping the same number of elements from Stream #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Allow appending and then dropping the same number of elements from Stream #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d0ed3c
throw `DropIndexOverflow` only when drop length exceeds app length
strikef Mar 14, 2025
9e39318
simplify `drop k (app k s)` to avoid erroneous C codegen when |drop| …
strikef Mar 14, 2025
67482fc
Move fix to `Temporal` and add explanatory comments
strikef Mar 27, 2025
b1ad228
Remove redundant diff
strikef Mar 27, 2025
c6e7a99
Fix indent and formatting
strikef Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion copilot-language/src/Copilot/Language/Analyze.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ analyzeAppend refStreams dstn e b f = do
-- append.
analyzeDrop :: Int -> Stream a -> IO ()
analyzeDrop k (Append xs _ _)
| k >= length xs = throw DropIndexOverflow
| k > length xs = throw DropIndexOverflow
| k > fromIntegral (maxBound :: DropIdx) = throw DropMaxViolation
| otherwise = return ()
analyzeDrop _ _ = throw DropAppliedToNonAppend
Expand Down
16 changes: 9 additions & 7 deletions copilot-language/src/Copilot/Language/Operators/Temporal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
-- Copyright © 2011 National Institute of Aerospace / Galois, Inc.

{-# LANGUAGE Safe #-}

-- | Temporal stream transformations.
Expand All @@ -11,7 +10,7 @@ module Copilot.Language.Operators.Temporal
import Copilot.Core (Typed)
import Copilot.Language.Prelude
import Copilot.Language.Stream
import Prelude ()
import Prelude ((==))

infixr 1 ++

Expand All @@ -32,8 +31,11 @@ infixr 1 ++
-- elements. For most kinds of streams, you cannot drop elements without
-- prepending an equal or greater number of elements to them first, as it
-- could result in undefined samples.
drop :: Typed a => Int -> Stream a -> Stream a
drop 0 s = s
drop _ ( Const j ) = Const j
drop i ( Drop j s ) = Drop (fromIntegral i + j) s
drop i s = Drop (fromIntegral i) s
drop :: (Typed a) => Int -> Stream a -> Stream a
drop 0 s = s
-- Along with simplifying the Stream, this also avoids the invalid C code
-- generated from append (array) and drop (indexing) when their lengths are the same
drop i ( Append a _ s ) | i == length a = s
drop _ ( Const j ) = Const j
drop i ( Drop j s ) = Drop (fromIntegral i + j) s
drop i s = Drop (fromIntegral i) s