Skip to content

Commit

Permalink
0.4.4.4 bug fixes (including to precedence of pairwise arithmetic ope…
Browse files Browse the repository at this point in the history 
…rators)
  • Loading branch information
@dktr0
dktr0 committed Oct 11, 2023
1 parent e568e08 commit b2670bf
Show file tree
Hide file tree
Showing 6 changed files with 24,337 additions and 24,462 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# ChangeLog

0.4.4.4:

-bug fixes to precedence of pairwise arithmetic operators

0.4.4.3:

-bug fix (to [a,b .. c] expressions)
Expand Down
14 changes: 7 additions & 7 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ clean:

devBuild:
cabal --ghcjs --builddir=dev-result new-build all --disable-library-profiling --disable-documentation --ghcjs-options=-DGHCJS_GC_INTERVAL=60000
cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.4.3/x/punctual/build/punctual/punctual.jsexe/index.html .
cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.4.3/x/punctual/build/punctual/punctual.jsexe/rts.js .
cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.4.3/x/punctual/build/punctual/punctual.jsexe/lib.js .
cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.4.3/x/punctual/build/punctual/punctual.jsexe/out.js .
cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.4.3/x/punctual/build/punctual/punctual.jsexe/runmain.js .
cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.4.4/x/punctual/build/punctual/punctual.jsexe/index.html .
cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.4.4/x/punctual/build/punctual/punctual.jsexe/rts.js .
cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.4.4/x/punctual/build/punctual/punctual.jsexe/lib.js .
cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.4.4/x/punctual/build/punctual/punctual.jsexe/out.js .
cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.4.4/x/punctual/build/punctual/punctual.jsexe/runmain.js .

devTest:
cabal --ghcjs new-test test:tests --disable-library-profiling --disable-documentation
Expand All @@ -50,8 +50,8 @@ buildBenchmark:
cabal --ghcjs --builddir=benchmark new-build punctual-benchmarks --disable-library-profiling --disable-documentation --ghcjs-options=-DGHCJS_GC_INTERVAL=60000

runBenchmark:
node benchmark/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.4.3/b/punctual-benchmarks/build/punctual-benchmarks/punctual-benchmarks.jsexe/all.js
node benchmark/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.4.4/b/punctual-benchmarks/build/punctual-benchmarks/punctual-benchmarks.jsexe/all.js

runBenchmarkInBrowser:
open benchmark/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.4.3/b/punctual-benchmarks/build/punctual-benchmarks/punctual-benchmarks.jsexe/index.html
open benchmark/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.4.4/b/punctual-benchmarks/build/punctual-benchmarks/punctual-benchmarks.jsexe/index.html

2 changes: 1 addition & 1 deletion executable-src/Main.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ intro
main :: IO ()
main = do
hSetBuffering stdout LineBuffering
putStrLn "Punctual standalone, version 0.4.4.3"
putStrLn "Punctual standalone, version 0.4.4.4"
ctx <- getGlobalAudioContextPlayback
putStrLn "global audio context (playback mode) acquired"
putStrLn "loading MusicW audio worklets..."
Expand Down
28 changes: 13 additions & 15 deletions library-src/Sound/Punctual/Parser.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,33 +102,31 @@ haskellSrcExtsParseMode :: ParseMode
haskellSrcExtsParseMode = defaultParseMode {
fixities = Just [
Fixity (AssocRight ()) 9 (UnQual () (Symbol () ".")),
Fixity (AssocLeft ()) 9 (UnQual () (Symbol () "!!")),
Fixity (AssocRight ()) 8 (UnQual () (Symbol () "^")),
Fixity (AssocRight ()) 8 (UnQual () (Symbol () "^^")),
Fixity (AssocRight ()) 8 (UnQual () (Symbol () "**")),
Fixity (AssocRight ()) 8 (UnQual () (Symbol () "**:")),
Fixity (AssocLeft ()) 7 (UnQual () (Symbol () "*")),
Fixity (AssocLeft ()) 7 (UnQual () (Symbol () "*:")),
Fixity (AssocLeft ()) 7 (UnQual () (Symbol () "/")),
Fixity (AssocLeft ()) 7 (UnQual () (Ident () "quot")),
Fixity (AssocLeft ()) 7 (UnQual () (Ident () "rem")),
Fixity (AssocLeft ()) 7 (UnQual () (Ident () "div")),
Fixity (AssocLeft ()) 7 (UnQual () (Ident () "mod")),
Fixity (AssocLeft ()) 7 (UnQual () (Symbol () "/:")),
Fixity (AssocLeft ()) 7 (UnQual () (Symbol () "%")),
Fixity (AssocLeft ()) 7 (UnQual () (Symbol () "%:")),
Fixity (AssocLeft ()) 6 (UnQual () (Symbol () "+")),
Fixity (AssocLeft ()) 6 (UnQual () (Symbol () "+:")),
Fixity (AssocLeft ()) 6 (UnQual () (Symbol () "-")),
Fixity (AssocRight ()) 5 (UnQual () (Symbol () ":")),
Fixity (AssocLeft ()) 6 (UnQual () (Symbol () "-:")),
Fixity (AssocRight ()) 5 (UnQual () (Symbol () "++")),
Fixity (AssocNone ()) 4 (UnQual () (Symbol () "==")),
Fixity (AssocNone ()) 4 (UnQual () (Symbol () "==:")),
Fixity (AssocNone ()) 4 (UnQual () (Symbol () "/=")),
Fixity (AssocNone ()) 4 (UnQual () (Symbol () "/=:")),
Fixity (AssocNone ()) 4 (UnQual () (Symbol () "<")),
Fixity (AssocNone ()) 4 (UnQual () (Symbol () "<:")),
Fixity (AssocNone ()) 4 (UnQual () (Symbol () "<=")),
Fixity (AssocNone ()) 4 (UnQual () (Symbol () "<=:")),
Fixity (AssocNone ()) 4 (UnQual () (Symbol () ">=")),
Fixity (AssocNone ()) 4 (UnQual () (Symbol () ">=:")),
Fixity (AssocNone ()) 4 (UnQual () (Symbol () ">")),
Fixity (AssocNone ()) 4 (UnQual () (Ident () "elem")),
Fixity (AssocNone ()) 4 (UnQual () (Ident () "notElem")),
Fixity (AssocLeft ()) 4 (UnQual () (Symbol () "<$>")),
Fixity (AssocLeft ()) 4 (UnQual () (Symbol () "<$")),
Fixity (AssocLeft ()) 4 (UnQual () (Symbol () "<*>")),
Fixity (AssocLeft ()) 4 (UnQual () (Symbol () "<*")),
Fixity (AssocLeft ()) 4 (UnQual () (Symbol () "*>")),
Fixity (AssocNone ()) 4 (UnQual () (Symbol () ">:")),
Fixity (AssocRight ()) 3 (UnQual () (Symbol () "&&")),
Fixity (AssocRight ()) 2 (UnQual () (Symbol () "||")),
Fixity (AssocLeft ()) 0 (UnQual () (Symbol () ">>")), -- modified from Haskell default (1) to have equal priority to ops below...
Expand Down
48,749 changes: 24,311 additions & 24,438 deletions out.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion punctual.cabal
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: punctual
version: 0.4.4.3
version: 0.4.4.4
synopsis: Live coding language
description: Please see README.md
homepage: http://github.com/dktr0/Punctual/blob/master/README.md
Expand Down

0 comments on commit b2670bf

Please sign in to comment.