Skip to content

Optimizations #153

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

Merged
webdevred merged 3 commits into from
Mar 10, 2026
Merged

Optimizations #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
011390b
Optimize vertex and node processing
webdevred Jan 17, 2026
74fdba1
Use LBS.count to avoid intermediate list alloc in separatorParser
webdevred Mar 10, 2026
4fa54c7
Merge branch 'master' into optimizations
webdevred Mar 10, 2026
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 src-extra/transformation/JbeamEdit/Transformation.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import Data.Bool (bool)
import Data.Foldable.Extra (notNull)
import Data.Function (on)
import Data.List (foldl', partition)

Check warning on line 7 in src-extra/transformation/JbeamEdit/Transformation.hs

View workflow job for this annotation

GitHub Actions / Build and test with Cabal (GHC latest) on windows-latest 

The import of ‘foldl'’ from module ‘Data.List’ is redundant

Check warning on line 7 in src-extra/transformation/JbeamEdit/Transformation.hs

View workflow job for this annotation

GitHub Actions / Build and test with Cabal (GHC latest) on ubuntu-latest 

The import of ‘foldl'’ from module ‘Data.List’ is redundant

Check warning on line 7 in src-extra/transformation/JbeamEdit/Transformation.hs

View workflow job for this annotation

GitHub Actions / Build for release for 9.10.3 (experimental) 

The import of ‘foldl'’ from module ‘Data.List’ is redundant
import Data.List.NonEmpty (NonEmpty)
import Data.List.NonEmpty qualified as NE
import Data.Map (Map)
Expand Down Expand Up @@ -317,7 +317,7 @@
oMap

(_, listsOfNodes) = mapAccumL stepType initialMeta treesOrder
in V.fromList (concat listsOfNodes)
in foldMap V.fromList listsOfNodes

treesOrder :: [VertexTreeType]
treesOrder = [LeftTree, MiddleTree, RightTree, SupportTree]
Expand Down
2 changes: 1 addition & 1 deletion src/JbeamEdit/Core/Node.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ possiblyChildren n = expectArray n <|> expectObject n

moreNodesThanOne :: Vector Node -> Bool
moreNodesThanOne v
| len == 1 = any moreNodesThanOne . possiblyChildren $ V.head v
| len == 1 = any moreNodesThanOne . possiblyChildren $ V.unsafeHead v
| len > 1 = True
| otherwise = False
where
Expand Down
10 changes: 5 additions & 5 deletions src/JbeamEdit/Parsing/Jbeam.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ separatorParser = do
comma <- MP.optional (MP.label "comma" $ byteChar ',')
ws2 <- MP.takeWhileP Nothing wordIsSpace

let countNewlines = length . filter (== '\n') . map toChar . LBS.unpack
totalNewlines = countNewlines ws1 + countNewlines ws2
hasNewline =
isNothing comma && '\n' `elem` map toChar (LBS.unpack ws1)
|| '\n' `elem` map toChar (LBS.unpack ws2)
let nl = toWord8 '\n'
ws1Newlines = LBS.count nl ws1
ws2Newlines = LBS.count nl ws2
totalNewlines = ws1Newlines + ws2Newlines
hasNewline = isNothing comma && ws1Newlines > 0 || ws2Newlines > 0

modify
( \s ->
Expand Down