Skip to content

Commit

Permalink
whoops
Browse files Browse the repository at this point in the history
  • Loading branch information
marklemay committed Apr 8, 2024
1 parent 0c8919e commit f12040d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 16 deletions.
23 changes: 10 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
## TODO

* https://joeyh.name/blog/entry/Haskell_webassembly_in_the_browser/ (can pay this guy?)
https://news.ycombinator.com/item?id=37605688


* put the reasonable ghc cmdline args into cabal
* kill the makefile if possible
* build the regular stuff in "normal" ghc also




# dDynamic
[![Haskell CI](https://github.com/marklemay/dDynamic/actions/workflows/haskell.yml/badge.svg)](https://github.com/marklemay/dDynamic/actions/workflows/haskell.yml)
[![Haskell webasm compile](https://github.com/marklemay/dDynamic/actions/workflows/webasm.yaml/badge.svg)](https://github.com/marklemay/dDynamic/actions/workflows/webasm.yaml)

a minimal dependently typed langugage where deffintional equality can be resolved dynamically at runtime.

Expand Down Expand Up @@ -58,3 +46,12 @@ To run the haskell project: ```cabal new-repl```

To run the test suit: ```cabal new-test```

## TODO

* https://joeyh.name/blog/entry/Haskell_webassembly_in_the_browser/ (can pay this guy?)
https://news.ycombinator.com/item?id=37605688


* put the reasonable ghc cmdline args into cabal
* kill the makefile if possible
* build the regular stuff in "normal" ghc also
4 changes: 2 additions & 2 deletions src/Dynamic/Warning.hs
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ getMsg (EqWarning l info@Info{sr=msr,origL=I origL,origR=I origR} _ r)= let
origR' = runFreshM $ erase origR


in "possibly mismatched types: \n" ++
in "possibly mismatched types: <br>\n" ++
(if (show origL', show origR') /= (show l', show r')
then " " ++ show origL' ++ " =?= " ++ show origR' ++ " ~>\n"
then " " ++ show origL' ++ " =?= " ++ show origR' ++ "\n ~> <br>\n"
else "")
++ " " ++ show l' ++ " =?= " ++ show r'
-- loggg $ lfullshow w
Expand Down
2 changes: 1 addition & 1 deletion src/Ffi/Ffi.hs
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ data Res
{err::ParseError, start::Int, end::Int} -- for dumb codemirror theneeds the literal exact start and end
| TypeError
{typeError::C.Err , typeErrorStart::Int, typeErrorEnd::Int}
| Warnings [WarningWrapper] [BangInfo]
| Warnings {warnings::[WarningWrapper], infos::[BangInfo]}
deriving (Generic)

instance ToJSON Res
Expand Down

0 comments on commit f12040d

Please sign in to comment.