compiles and works again.

This commit is contained in:
Nicole Dresselhaus 2022-07-19 23:05:58 +02:00
parent c06c3d2665
commit c6a30057c3
5 changed files with 14 additions and 6 deletions

View File

@ -2,5 +2,3 @@ packages: *.cabal
dear-imgui.hs
package dear-implot
ghc-options: -Wall -Wcompat -fno-warn-unused-do-bind
-- shared: true

@ -1 +1 @@
Subproject commit 1a27a51fdecf7ef89ce39346ec423f239207b5a4
Subproject commit 6f4229271d9f212b90c5a93761642f3995a20472

View File

@ -53,7 +53,9 @@ library
-std=c++11
extra-libraries:
stdc++
HSdear-imgui-1.4.0-inplace
HSdear-imgui-2.0.0-inplace-ghc8.10.7
extra-bundled-libraries:
HSdear-implot-1.0.0-inplace
include-dirs:
implot
dear-imgui.hs/imgui
@ -63,7 +65,7 @@ library
build-depends: base
, StateVar
, containers
, dear-imgui == 1.4.0
, dear-imgui == 2.0.0
, inline-c
, inline-c-cpp
, managed

2
implot

@ -1 +1 @@
Subproject commit b47c8bacdbc78bc521691f70666f13924bb522ab
Subproject commit 7a470b2e174584d1d62ea5ebe713fea9c18beb6c

View File

@ -99,6 +99,7 @@ plotHeaders = do
( ( Left <$> try ignoreDefine)
<|> ( Right <$> enumeration enumNamesAndTypes)
<|> ( Left <$> ignoreStruct)
<|> ( Left <$> cppConditionalIgnore)
)
( namedSection "Callbacks" )
@ -442,6 +443,13 @@ cppConditional = do
void $ skipManyTill anySingle ( cppDirective ( \case { "endif" -> Just (); _ -> Nothing } ) )
void $ skipManyTill anySingle ( single EndCPPLine )
cppConditionalIgnore :: MonadParsec e [Tok] m => m ()
cppConditionalIgnore = do
void $ cppDirective ( \case { "ifdef" -> Just (); "ifndef" -> Just (); "if" -> Just (); _ -> Nothing } )
-- assumes no nesting
void $ skipManyTill anySingle ( cppDirective ( \case { "endif" -> Just (); _ -> Nothing } ) )
void $ skipManyTill anySingle ( single EndCPPLine )
ignoreDefine :: MonadParsec e [Tok] m => m ()
ignoreDefine = do
void $ many comment