Merge pull request #1566 from hzeller/20221216-dependencies
Make sure to include all the used depdnencies in the BUILD file.
diff --git a/.github/bin/github-releases-setup.sh b/.github/bin/github-releases-setup.sh
index 3cffa29..06ca975 100755
--- a/.github/bin/github-releases-setup.sh
+++ b/.github/bin/github-releases-setup.sh
@@ -19,6 +19,7 @@
set -ex
+SCRIPT_DIR=$(dirname $0)
RELEASE_DIR=${1:-/tmp/releases}
rm -rf "$RELEASE_DIR/*"
@@ -41,6 +42,8 @@
ldd $BIN || true # ignore the potential 'not a dynamic executable' errors for non-binaries
done
+${SCRIPT_DIR}/github-pages-setup.sh $PREFIX_BIN
+
# Documentation
cp -a /tmp/pages/* $PREFIX_DOC
# Man pages
diff --git a/releasing/build.sh b/releasing/build.sh
index 2263203..008fd97 100755
--- a/releasing/build.sh
+++ b/releasing/build.sh
@@ -18,5 +18,4 @@
cd $(dirname "$0")/..
-./.github/bin/github-pages-setup.sh
./.github/bin/github-releases-setup.sh /out
diff --git a/verilog/formatting/formatter_test.cc b/verilog/formatting/formatter_test.cc
index f3c3773..e617479 100644
--- a/verilog/formatting/formatter_test.cc
+++ b/verilog/formatting/formatter_test.cc
@@ -5616,6 +5616,13 @@
" .rst (rst),\n"
" .value(value)\n"
");\n"},
+ {"bind foo bar baz(\\\n"
+ "`undef d\\\n"
+ "`undef d);",
+ "bind foo bar baz (\\\n"
+ " `undef d\\\n"
+ " `undef d\n"
+ ");\n"},
{
"bind expaaaaaaaaaaand_meeee looooooooong_name# ("
".W(W_CONST), .H(H_CONST), .D(D_CONST) )"
diff --git a/verilog/formatting/tree_unwrapper.cc b/verilog/formatting/tree_unwrapper.cc
index c8f6176..ef0b748 100644
--- a/verilog/formatting/tree_unwrapper.cc
+++ b/verilog/formatting/tree_unwrapper.cc
@@ -469,7 +469,8 @@
while (!NextUnfilteredToken()->isEOF()) {
EatSpaces();
VLOG(4) << "lookahead token: " << VerboseToken(*NextUnfilteredToken());
- if (IsComment(verilog_tokentype(NextUnfilteredToken()->token_enum()))) {
+ if (auto next_tok = verilog_tokentype(NextUnfilteredToken()->token_enum());
+ IsComment(next_tok) || next_tok == verilog_tokentype::TK_LINE_CONT) {
// TODO(fangism): or IsAttribute(). Basically, any token that is not
// in the syntax tree and not a space.
AdvanceLastVisitedLeaf();