Generate version macros for preprocessors #847
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
guibou
approved these changes
Apr 26, 2019
|
|
||
| def cpp_ifndef(macro, body): | ||
| """CPP ifndef block.""" | ||
| return "#ifndef {macro}\n{body}\n#endif /* {macro} */".format( |
There was a problem hiding this comment.
return f"#ifndef {macro}\n{body}\n#endif /* {macro} */"
Is enough (provided that python version in >= 3.6
There was a problem hiding this comment.
If I try that I'm getting
return f"#ifndef {macro}\n{body}\n#endif /* {macro} */"
^
SyntaxError: invalid syntax
despite
$ nix-shell --pure --run 'python3 --version'
Python 3.6.8
Is there some escape I'm missing?
There was a problem hiding this comment.
Python 3.6.8 (default, Dec 24 2018, 03:01:30)
[GCC 7.4.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> macro = "hello"
>>> body = "world"
>>> f"#ifndef {macro}\n{body}\n#endif /* {macro} */"
'#ifndef hello\nworld\n#endif /* hello */'
You should be right.
Perhaps the python used by your bazel install is not a python 3.6, despite what your shell claim.
Don't waste time with this nitpick ;)
| ["major1", "major2", "minor"], | ||
| " \\\n".join([ | ||
| "(", | ||
| " (major1) < {} ||".format(major1), |
There was a problem hiding this comment.
This is also a good place for f strisgs
f" (major1) < {major1} ||"
...
There was a problem hiding this comment.
Same issue here
f" (major1) < {major1} ||",
^
SyntaxError: invalid syntax
Profpatsch
approved these changes
Apr 29, 2019
aherrmann
force-pushed
the
version_macros
branch
from
6ca0da1
to
5357ca8
Compare
|
rebased on master |
GHC is capable of defining version macros itself. However, this does not affect the preprocessors c2hs and hsc2hs. Cabal, for example, generates its own version macros header for these preprocessors. This change adds this capability to rules_haskell.
Tests for version macros in - .hs files - .hsc files - .chs files
unix-compat had failed to build due to missing version macros in hsc files.
The code was repeated in haskell/private/haskell_impl.bzl and haskell/import.bzl.
aherrmann
force-pushed
the
version_macros
branch
from
5357ca8
to
bf77c14
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
GHC is capable of defining version macros itself. However, this does not affect the preprocessors
c2hsandhsc2hs. Cabal, for example, generates its own version macros header file for these preprocessors. This PR adds this capability to rules_haskell.Closes #821
versionattribute.version_macrosfield toHaskellBuildInfo.-include <version_macros_header>throughcpp_flagsas defined bycc_interop_info.c2hs,hsc2hs, and regular Haskell files with-XCPP.unix-compatinlining version macros. See hazel: windows: fix unix-compat #828