[devtools] Move C++ formatting to devtools/format.sh

It's now

    devtools/format.sh all-cpp

devtools/format.sh

@@ -5,7 +5,19 @@
 # Usage:
 #   test/format.sh <function name>
 
+REPO_ROOT=$(cd "$(dirname $0)/.."; pwd)
+
 . build/dev-shell.sh  # python3 in $PATH
+. build/common.sh  # $CLANG_DIR
+
+set -o nounset
+set -o pipefail
+set -o errexit
+shopt -s strict:all 2>/dev/null || true  # dogfood for OSH
+
+#
+# Python
+#
 
 yapf-version() {
   python3 -m yapf --version
@@ -17,4 +29,57 @@ yapf-files() {
   python3 -m yapf -i "$@"
 }
 
+#
+# C++
+#
+
+clang-format() {
+  # See //.clang-format for the style config.
+  $CLANG_DIR/bin/clang-format --style=file "$@"
+}
+
+readonly -a CPP_FILES=(
+  {asdl,core}/*.cc
+  benchmarks/*.c
+  cpp/*.{c,cc,h}
+  mycpp/*.{cc,h} 
+  mycpp/demo/*.{cc,h}
+  demo/*.c
+
+  # Could add pyext, but they have sort of a Python style
+  # pyext/fanos.c
+)
+
+cpp-files() {
+  shopt -s nullglob
+  for file in "${CPP_FILES[@]}"; do
+
+    echo $file
+  done
+}
+
+all-cpp() {
+  # see build/common.sh
+  if test -n "$CLANG_IS_MISSING"; then
+    log ''
+    log "  *** $0: Did not find $CLANG_DIR_1"
+    log "  *** Run deps/from-binary.sh to get it"
+    log ''
+    return 1
+  fi
+
+  cpp-files | egrep -v 'greatest.h' | xargs -- $0 clang-format -i 
+  git diff
+}
+
+test-asdl-format() {
+  ### Test how clang-format would like our generated code
+
+  local file=${1:-_gen/asdl/hnode.asdl.h}
+
+  local tmp=_tmp/hnode
+  clang-format $file > $tmp
+  diff -u $file $tmp
+}
+
 "$@"

test/lint.sh

@@ -37,55 +37,6 @@ cpplint() {
     -readability/todo,-legal/copyright,-build/header_guard,-build/include,-whitespace/comments "$@"
 }
 
-clang-format() {
-  # See //.clang-format for the style config.
-  $CLANG_DIR/bin/clang-format --style=file "$@"
-}
-
-readonly -a CPP_FILES=(
-  {asdl,core}/*.cc
-  benchmarks/*.c
-  cpp/*.{c,cc,h}
-  mycpp/*.{cc,h} 
-  mycpp/demo/*.{cc,h}
-  demo/*.c
-
-  # Could add pyext, but they have sort of a Python style
-  # pyext/fanos.c
-)
-
-cpp-files() {
-  shopt -s nullglob
-  for file in "${CPP_FILES[@]}"; do
-
-    echo $file
-  done
-}
-
-format-cpp() {
-  # see build/common.sh
-  if test -n "$CLANG_IS_MISSING"; then
-    log ''
-    log "  *** $0: Did not find $CLANG_DIR_1"
-    log "  *** Run deps/from-binary.sh to get it"
-    log ''
-    return 1
-  fi
-
-  cpp-files | egrep -v 'greatest.h' | xargs -- $0 clang-format -i 
-  git diff
-}
-
-test-asdl-format() {
-  ### Test how clang-format would like our generated code
-
-  local file=${1:-_gen/asdl/hnode.asdl.h}
-
-  local tmp=_tmp/hnode
-  clang-format $file > $tmp
-  diff -u $file $tmp
-}
-
 #
 # Python
 #