Restoring authorship annotation for <snermolaev@yandex-team.ru>. Commit 2 of 2.

18 files changed, 474 insertions, 474 deletions

diff --git a/contrib/tools/protoc/bin/ya.make b/contrib/tools/protoc/bin/ya.make
index 87e1dda640..f9e74f5e4c 100644
--- a/contrib/tools/protoc/bin/ya.make
+++ b/contrib/tools/protoc/bin/ya.make
@@ -1,26 +1,26 @@
-PROGRAM(protoc) 
- 
-OWNER( 
-    velavokr 
-    g:contrib 
-    g:cpp-contrib 
-) 
- 
+PROGRAM(protoc)
+
+OWNER(
+    velavokr
+    g:contrib
+    g:cpp-contrib
+)
+
 LICENSE(BSD-3-Clause)
- 
-NO_COMPILER_WARNINGS() 
- 
-PEERDIR( 
-    contrib/libs/protoc 
-) 
-SRCDIR( 
-    contrib/libs/protoc 
-) 
- 
-SRCS( 
-    src/google/protobuf/compiler/main.cc 
-) 
- 
-INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/ya.make.induced_deps) 
- 
-END() 
+
+NO_COMPILER_WARNINGS()
+
+PEERDIR(
+    contrib/libs/protoc
+)
+SRCDIR(
+    contrib/libs/protoc
+)
+
+SRCS(
+    src/google/protobuf/compiler/main.cc
+)
+
+INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/ya.make.induced_deps)
+
+END()
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/bin/ya.make b/contrib/tools/protoc/plugins/cpp_styleguide/bin/ya.make
index 9fafacd529..e8f7558208 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/bin/ya.make
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/bin/ya.make
@@ -1,21 +1,21 @@
-OWNER(g:contrib) 
- 
-PROGRAM(cpp_styleguide) 
- 
-NO_COMPILER_WARNINGS() 
- 
-PEERDIR( 
-    contrib/libs/protoc 
-) 
- 
-SRCS( 
-    cpp_styleguide.cpp 
-) 
- 
-SRCDIR( 
-    contrib/tools/protoc/plugins/cpp_styleguide 
-) 
- 
-INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/cpp_styleguide/ya.make.induced_deps) 
- 
-END() 
+OWNER(g:contrib)
+
+PROGRAM(cpp_styleguide)
+
+NO_COMPILER_WARNINGS()
+
+PEERDIR(
+    contrib/libs/protoc
+)
+
+SRCS(
+    cpp_styleguide.cpp
+)
+
+SRCDIR(
+    contrib/tools/protoc/plugins/cpp_styleguide
+)
+
+INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/cpp_styleguide/ya.make.induced_deps)
+
+END()
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/ya.make b/contrib/tools/protoc/plugins/cpp_styleguide/ya.make
index e723aba791..5a5f17d49a 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/ya.make
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/ya.make
@@ -1,13 +1,13 @@
 OWNER(g:contrib)
 
-IF (USE_PREBUILT_TOOLS) 
-    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/cpp_styleguide/ya.make.prebuilt) 
-ENDIF() 
- 
-IF (NOT PREBUILT) 
-    INCLUDE(${ARCADIA_ROOT}/contrib/tools/protoc/plugins/cpp_styleguide/bin/ya.make) 
-ENDIF() 
+IF (USE_PREBUILT_TOOLS)
+    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/cpp_styleguide/ya.make.prebuilt)
+ENDIF()
 
-RECURSE( 
-    bin 
-) 
+IF (NOT PREBUILT)
+    INCLUDE(${ARCADIA_ROOT}/contrib/tools/protoc/plugins/cpp_styleguide/bin/ya.make)
+ENDIF()
+
+RECURSE(
+    bin
+)
diff --git a/contrib/tools/protoc/plugins/grpc_cpp/bin/ya.make b/contrib/tools/protoc/plugins/grpc_cpp/bin/ya.make
index 619a84ec45..f2181ce63a 100644
--- a/contrib/tools/protoc/plugins/grpc_cpp/bin/ya.make
+++ b/contrib/tools/protoc/plugins/grpc_cpp/bin/ya.make
@@ -1,30 +1,30 @@
-OWNER(akastornov g:contrib g:cpp-contrib) 
- 
-PROGRAM(grpc_cpp) 
- 
-LICENSE(Apache-2.0) 
- 
-PEERDIR( 
-    contrib/libs/grpc/src/compiler/grpc_plugin_support 
-) 
- 
-ADDINCL( 
-    contrib/libs/grpc 
-    contrib/libs/grpc/include 
-) 
- 
-NO_COMPILER_WARNINGS() 
- 
-CFLAGS( 
-    -DGRPC_USE_ABSL=0 
-) 
- 
-SRCDIR(contrib/libs/grpc/src/compiler) 
- 
-SRCS( 
-    cpp_plugin.cc 
-) 
- 
-INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/grpc_cpp/ya.make.induced_deps) 
- 
-END() 
+OWNER(akastornov g:contrib g:cpp-contrib)
+
+PROGRAM(grpc_cpp)
+
+LICENSE(Apache-2.0)
+
+PEERDIR(
+    contrib/libs/grpc/src/compiler/grpc_plugin_support
+)
+
+ADDINCL(
+    contrib/libs/grpc
+    contrib/libs/grpc/include
+)
+
+NO_COMPILER_WARNINGS()
+
+CFLAGS(
+    -DGRPC_USE_ABSL=0
+)
+
+SRCDIR(contrib/libs/grpc/src/compiler)
+
+SRCS(
+    cpp_plugin.cc
+)
+
+INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/grpc_cpp/ya.make.induced_deps)
+
+END()
diff --git a/contrib/tools/protoc/plugins/grpc_cpp/ya.make b/contrib/tools/protoc/plugins/grpc_cpp/ya.make
index 27fbb6556f..7add4ebbad 100644
--- a/contrib/tools/protoc/plugins/grpc_cpp/ya.make
+++ b/contrib/tools/protoc/plugins/grpc_cpp/ya.make
@@ -1,16 +1,16 @@
 # Copy of contrib/libs/grpc/src/compiler/grpc_cpp_plugin
 # Generated by devtools/yamaker.
 
-OWNER(akastornov g:contrib g:cpp-contrib) 
- 
-IF (USE_PREBUILT_TOOLS) 
-    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/grpc_cpp/ya.make.prebuilt) 
-ENDIF() 
- 
-IF (NOT PREBUILT) 
-    INCLUDE(${ARCADIA_ROOT}/contrib/tools/protoc/plugins/grpc_cpp/bin/ya.make) 
-ENDIF() 
- 
-RECURSE( 
-    bin 
-) 
+OWNER(akastornov g:contrib g:cpp-contrib)
+
+IF (USE_PREBUILT_TOOLS)
+    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/grpc_cpp/ya.make.prebuilt)
+ENDIF()
+
+IF (NOT PREBUILT)
+    INCLUDE(${ARCADIA_ROOT}/contrib/tools/protoc/plugins/grpc_cpp/bin/ya.make)
+ENDIF()
+
+RECURSE(
+    bin
+)
diff --git a/contrib/tools/protoc/plugins/grpc_java/bin/ya.make b/contrib/tools/protoc/plugins/grpc_java/bin/ya.make
index 60a08ed95a..b5da57408c 100644
--- a/contrib/tools/protoc/plugins/grpc_java/bin/ya.make
+++ b/contrib/tools/protoc/plugins/grpc_java/bin/ya.make
@@ -1,21 +1,21 @@
-OWNER( 
-    akastornov 
-    g:contrib 
-) 
- 
-PROGRAM(grpc_java) 
- 
-NO_COMPILER_WARNINGS() 
- 
-PEERDIR( 
-    contrib/libs/protoc 
-) 
- 
-SRCDIR(contrib/libs/grpc-java/compiler/src/java_plugin/cpp) 
- 
-SRCS( 
-    java_plugin.cpp 
-    java_generator.cpp 
-) 
- 
-END() 
+OWNER(
+    akastornov
+    g:contrib
+)
+
+PROGRAM(grpc_java)
+
+NO_COMPILER_WARNINGS()
+
+PEERDIR(
+    contrib/libs/protoc
+)
+
+SRCDIR(contrib/libs/grpc-java/compiler/src/java_plugin/cpp)
+
+SRCS(
+    java_plugin.cpp
+    java_generator.cpp
+)
+
+END()
diff --git a/contrib/tools/protoc/plugins/grpc_java/ya.make b/contrib/tools/protoc/plugins/grpc_java/ya.make
index 506618d4a7..82b18378a0 100644
--- a/contrib/tools/protoc/plugins/grpc_java/ya.make
+++ b/contrib/tools/protoc/plugins/grpc_java/ya.make
@@ -1,16 +1,16 @@
-OWNER( 
-    akastornov 
-    g:contrib 
-) 
- 
-IF (USE_PREBUILT_TOOLS) 
-    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/ya.make.prebuilt) 
-ENDIF() 
- 
-IF (NOT PREBUILT) 
-    INCLUDE(${ARCADIA_ROOT}/contrib/tools/protoc/plugins/grpc_java/bin/ya.make) 
-ENDIF() 
+OWNER(
+    akastornov
+    g:contrib
+)
 
-RECURSE( 
-    bin 
-) 
+IF (USE_PREBUILT_TOOLS)
+    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/ya.make.prebuilt)
+ENDIF()
+
+IF (NOT PREBUILT)
+    INCLUDE(${ARCADIA_ROOT}/contrib/tools/protoc/plugins/grpc_java/bin/ya.make)
+ENDIF()
+
+RECURSE(
+    bin
+)
diff --git a/contrib/tools/protoc/plugins/grpc_python/bin/ya.make b/contrib/tools/protoc/plugins/grpc_python/bin/ya.make
index 15f197d067..bd0f6a3b48 100644
--- a/contrib/tools/protoc/plugins/grpc_python/bin/ya.make
+++ b/contrib/tools/protoc/plugins/grpc_python/bin/ya.make
@@ -1,28 +1,28 @@
-OWNER(akastornov g:contrib g:cpp-contrib) 
- 
-PROGRAM(grpc_python) 
- 
-LICENSE(Apache-2.0) 
- 
-PEERDIR( 
-    contrib/libs/grpc/src/compiler/grpc_plugin_support 
-) 
- 
-ADDINCL( 
-    contrib/libs/grpc 
-    contrib/libs/grpc/include 
-) 
- 
-NO_COMPILER_WARNINGS() 
- 
-CFLAGS( 
-    -DGRPC_USE_ABSL=0 
-) 
- 
-SRCDIR(contrib/libs/grpc/src/compiler) 
- 
-SRCS( 
-    python_plugin.cc 
-) 
- 
-END() 
+OWNER(akastornov g:contrib g:cpp-contrib)
+
+PROGRAM(grpc_python)
+
+LICENSE(Apache-2.0)
+
+PEERDIR(
+    contrib/libs/grpc/src/compiler/grpc_plugin_support
+)
+
+ADDINCL(
+    contrib/libs/grpc
+    contrib/libs/grpc/include
+)
+
+NO_COMPILER_WARNINGS()
+
+CFLAGS(
+    -DGRPC_USE_ABSL=0
+)
+
+SRCDIR(contrib/libs/grpc/src/compiler)
+
+SRCS(
+    python_plugin.cc
+)
+
+END()
diff --git a/contrib/tools/protoc/plugins/grpc_python/ya.make b/contrib/tools/protoc/plugins/grpc_python/ya.make
index 8de26952d8..1852d8b6fd 100644
--- a/contrib/tools/protoc/plugins/grpc_python/ya.make
+++ b/contrib/tools/protoc/plugins/grpc_python/ya.make
@@ -1,16 +1,16 @@
 # Copy of contrib/libs/grpc/src/compiler/grpc_python_plugin
 # Generated by devtools/yamaker.
 
-OWNER(akastornov g:contrib g:cpp-contrib) 
+OWNER(akastornov g:contrib g:cpp-contrib)
 
-IF (USE_PREBUILT_TOOLS) 
-    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/grpc_python/ya.make.prebuilt) 
-ENDIF() 
- 
-IF (NOT PREBUILT) 
-    INCLUDE(${ARCADIA_ROOT}/contrib/tools/protoc/plugins/grpc_python/bin/ya.make) 
-ENDIF() 
+IF (USE_PREBUILT_TOOLS)
+    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/grpc_python/ya.make.prebuilt)
+ENDIF()
 
-RECURSE( 
-    bin 
-) 
+IF (NOT PREBUILT)
+    INCLUDE(${ARCADIA_ROOT}/contrib/tools/protoc/plugins/grpc_python/bin/ya.make)
+ENDIF()
+
+RECURSE(
+    bin
+)
diff --git a/contrib/tools/protoc/ya.make b/contrib/tools/protoc/ya.make
index 6c42190a21..81244e1259 100644
--- a/contrib/tools/protoc/ya.make
+++ b/contrib/tools/protoc/ya.make
@@ -4,15 +4,15 @@ OWNER(
     g:cpp-contrib
 )
 
-IF (USE_PREBUILT_TOOLS) 
-    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/ya.make.prebuilt) 
-ENDIF() 
+IF (USE_PREBUILT_TOOLS)
+    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/ya.make.prebuilt)
+ENDIF()
 
-IF (NOT PREBUILT) 
-    INCLUDE(${ARCADIA_ROOT}/contrib/tools/protoc/bin/ya.make) 
-ENDIF() 
+IF (NOT PREBUILT)
+    INCLUDE(${ARCADIA_ROOT}/contrib/tools/protoc/bin/ya.make)
+ENDIF()
 
-RECURSE( 
-    bin 
+RECURSE(
+    bin
     plugins
-) 
+)
diff --git a/contrib/tools/python3/pycc/bin/ya.make b/contrib/tools/python3/pycc/bin/ya.make
index 83e9540753..c63399c525 100644
--- a/contrib/tools/python3/pycc/bin/ya.make
+++ b/contrib/tools/python3/pycc/bin/ya.make
@@ -1,28 +1,28 @@
-OWNER(g:contrib g:ymake orivej) 
- 
+OWNER(g:contrib g:ymake orivej)
+
 PY3_PROGRAM_BIN(pycc)
- 
-ENABLE(PYBUILD_NO_PYC) 
- 
-DISABLE(PYTHON_SQLITE3) 
- 
-PEERDIR( 
-    library/python/runtime_py3 
-    library/python/runtime_py3/main 
-) 
- 
-NO_CHECK_IMPORTS() 
- 
-NO_PYTHON_INCLUDES() 
- 
-NO_PYTHON_COVERAGE() 
- 
-SRCDIR( 
-    contrib/tools/python3/pycc 
-) 
- 
-PY_SRCS( 
-    MAIN main.py 
-) 
- 
-END() 
+
+ENABLE(PYBUILD_NO_PYC)
+
+DISABLE(PYTHON_SQLITE3)
+
+PEERDIR(
+    library/python/runtime_py3
+    library/python/runtime_py3/main
+)
+
+NO_CHECK_IMPORTS()
+
+NO_PYTHON_INCLUDES()
+
+NO_PYTHON_COVERAGE()
+
+SRCDIR(
+    contrib/tools/python3/pycc
+)
+
+PY_SRCS(
+    MAIN main.py
+)
+
+END()
diff --git a/contrib/tools/python3/pycc/ya.make b/contrib/tools/python3/pycc/ya.make
index 2f65c7f912..7bc5da9620 100644
--- a/contrib/tools/python3/pycc/ya.make
+++ b/contrib/tools/python3/pycc/ya.make
@@ -1,13 +1,13 @@
-OWNER(g:contrib g:ymake orivej) 
+OWNER(g:contrib g:ymake orivej)
 
-IF (USE_PREBUILT_TOOLS) 
-    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/python3/pycc/ya.make.prebuilt) 
-ENDIF() 
+IF (USE_PREBUILT_TOOLS)
+    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/python3/pycc/ya.make.prebuilt)
+ENDIF()
 
-IF (NOT PREBUILT) 
-    INCLUDE(${ARCADIA_ROOT}/contrib/tools/python3/pycc/bin/ya.make) 
-ENDIF() 
+IF (NOT PREBUILT)
+    INCLUDE(${ARCADIA_ROOT}/contrib/tools/python3/pycc/bin/ya.make)
+ENDIF()
 
-RECURSE( 
-    bin 
-) 
+RECURSE(
+    bin
+)
diff --git a/contrib/tools/python3/src/Include/pyconfig-linux.h b/contrib/tools/python3/src/Include/pyconfig-linux.h
index 4f85b67e88..98de8abc72 100644
--- a/contrib/tools/python3/src/Include/pyconfig-linux.h
+++ b/contrib/tools/python3/src/Include/pyconfig-linux.h
@@ -413,9 +413,9 @@
 
 /* Define if we can use gcc inline assembler to get and set x87 control word
    */
-#if defined(__x86_64__) || defined(__i386__) 
+#if defined(__x86_64__) || defined(__i386__)
 #define HAVE_GCC_ASM_FOR_X87 1
-#endif 
+#endif
 
 /* Define if your compiler provides __uint128_t */
 #define HAVE_GCC_UINT128_T 1
diff --git a/contrib/tools/python3/src/Modules/_decimal/libmpdec/mpdecimal.h b/contrib/tools/python3/src/Modules/_decimal/libmpdec/mpdecimal.h
index d0487a983d..f66f6e5920 100644
--- a/contrib/tools/python3/src/Modules/_decimal/libmpdec/mpdecimal.h
+++ b/contrib/tools/python3/src/Modules/_decimal/libmpdec/mpdecimal.h
@@ -110,9 +110,9 @@ const char *mpd_version(void);
     #error "cannot use CONFIG_64 or CONFIG_32 with UNIVERSAL."
   #endif
   #if defined(__powerpc64__) || defined(_M_AMD64) || defined(__aarch64__)
-    #define CONFIG_64 
-    #define ANSI 
-  #elif defined(__powerpc__) 
+    #define CONFIG_64
+    #define ANSI
+  #elif defined(__powerpc__)
     #define CONFIG_32
     #define ANSI
   #elif defined(__i386__) || defined(_M_IX86)
diff --git a/contrib/tools/ragel6/bin/ya.make b/contrib/tools/ragel6/bin/ya.make
index 098f2a0cd3..3adf88c56b 100644
--- a/contrib/tools/ragel6/bin/ya.make
+++ b/contrib/tools/ragel6/bin/ya.make
@@ -1,116 +1,116 @@
-OWNER(pg g:cpp-contrib) 
- 
-PROGRAM(ragel6) 
- 
-VERSION(6.10) 
- 
-LICENSE(GPL-2.0) 
- 
-PEERDIR( 
-    contrib/tools/ragel5/aapl 
-) 
- 
-ADDINCL( 
-    contrib/tools/ragel6 
-) 
- 
-NO_COMPILER_WARNINGS() 
- 
-NO_UTIL() 
- 
-CFLAGS( 
-    -DHAVE_CONFIG_H 
-) 
- 
-SRCDIR(contrib/tools/ragel6) 
- 
-SRCS( 
-    rlparse.cpp 
-    rlscan.cpp 
-) 
- 
-JOIN_SRCS( 
-    all_cd.cpp 
-    cdcodegen.cpp 
-    cdfflat.cpp 
-    cdfgoto.cpp 
-    cdflat.cpp 
-    cdftable.cpp 
-    cdgoto.cpp 
-    cdipgoto.cpp 
-    cdsplit.cpp 
-    cdtable.cpp 
-) 
- 
-JOIN_SRCS( 
-    all_cs.cpp 
-    cscodegen.cpp 
-    csfflat.cpp 
-    csfgoto.cpp 
-    csflat.cpp 
-    csftable.cpp 
-    csgoto.cpp 
-    csipgoto.cpp 
-    cssplit.cpp 
-    cstable.cpp 
-) 
- 
-JOIN_SRCS( 
-    all_fs.cpp 
-    fsmap.cpp 
-    fsmattach.cpp 
-    fsmbase.cpp 
-    fsmgraph.cpp 
-    fsmmin.cpp 
-    fsmstate.cpp 
-) 
- 
-JOIN_SRCS( 
-    all_go.cpp 
-    gocodegen.cpp 
-    gofflat.cpp 
-    gofgoto.cpp 
-    goflat.cpp 
-    goftable.cpp 
-    gogoto.cpp 
-    goipgoto.cpp 
-    gotable.cpp 
-    gotablish.cpp 
-) 
- 
-JOIN_SRCS( 
-    all_ml.cpp 
-    mlcodegen.cpp 
-    mlfflat.cpp 
-    mlfgoto.cpp 
-    mlflat.cpp 
-    mlftable.cpp 
-    mlgoto.cpp 
-    mltable.cpp 
-) 
- 
-JOIN_SRCS( 
-    all_r.cpp 
-    rbxgoto.cpp 
-    redfsm.cpp 
-    rubycodegen.cpp 
-    rubyfflat.cpp 
-    rubyflat.cpp 
-    rubyftable.cpp 
-    rubytable.cpp 
-) 
- 
-JOIN_SRCS( 
-    all_other.cpp 
-    common.cpp 
-    dotcodegen.cpp 
-    gendata.cpp 
-    inputdata.cpp 
-    javacodegen.cpp 
-    main.cpp 
-    parsedata.cpp 
-    parsetree.cpp 
-    xmlcodegen.cpp 
-) 
- 
-END() 
+OWNER(pg g:cpp-contrib)
+
+PROGRAM(ragel6)
+
+VERSION(6.10)
+
+LICENSE(GPL-2.0)
+
+PEERDIR(
+    contrib/tools/ragel5/aapl
+)
+
+ADDINCL(
+    contrib/tools/ragel6
+)
+
+NO_COMPILER_WARNINGS()
+
+NO_UTIL()
+
+CFLAGS(
+    -DHAVE_CONFIG_H
+)
+
+SRCDIR(contrib/tools/ragel6)
+
+SRCS(
+    rlparse.cpp
+    rlscan.cpp
+)
+
+JOIN_SRCS(
+    all_cd.cpp
+    cdcodegen.cpp
+    cdfflat.cpp
+    cdfgoto.cpp
+    cdflat.cpp
+    cdftable.cpp
+    cdgoto.cpp
+    cdipgoto.cpp
+    cdsplit.cpp
+    cdtable.cpp
+)
+
+JOIN_SRCS(
+    all_cs.cpp
+    cscodegen.cpp
+    csfflat.cpp
+    csfgoto.cpp
+    csflat.cpp
+    csftable.cpp
+    csgoto.cpp
+    csipgoto.cpp
+    cssplit.cpp
+    cstable.cpp
+)
+
+JOIN_SRCS(
+    all_fs.cpp
+    fsmap.cpp
+    fsmattach.cpp
+    fsmbase.cpp
+    fsmgraph.cpp
+    fsmmin.cpp
+    fsmstate.cpp
+)
+
+JOIN_SRCS(
+    all_go.cpp
+    gocodegen.cpp
+    gofflat.cpp
+    gofgoto.cpp
+    goflat.cpp
+    goftable.cpp
+    gogoto.cpp
+    goipgoto.cpp
+    gotable.cpp
+    gotablish.cpp
+)
+
+JOIN_SRCS(
+    all_ml.cpp
+    mlcodegen.cpp
+    mlfflat.cpp
+    mlfgoto.cpp
+    mlflat.cpp
+    mlftable.cpp
+    mlgoto.cpp
+    mltable.cpp
+)
+
+JOIN_SRCS(
+    all_r.cpp
+    rbxgoto.cpp
+    redfsm.cpp
+    rubycodegen.cpp
+    rubyfflat.cpp
+    rubyflat.cpp
+    rubyftable.cpp
+    rubytable.cpp
+)
+
+JOIN_SRCS(
+    all_other.cpp
+    common.cpp
+    dotcodegen.cpp
+    gendata.cpp
+    inputdata.cpp
+    javacodegen.cpp
+    main.cpp
+    parsedata.cpp
+    parsetree.cpp
+    xmlcodegen.cpp
+)
+
+END()
diff --git a/contrib/tools/ragel6/ya.make b/contrib/tools/ragel6/ya.make
index fcf431eb83..2c97f636ae 100644
--- a/contrib/tools/ragel6/ya.make
+++ b/contrib/tools/ragel6/ya.make
@@ -1,15 +1,15 @@
 # Generated by devtools/yamaker from nixpkgs 980c4c3c2f664ccc5002f7fd6e08059cf1f00e75.
 
 OWNER(pg g:cpp-contrib)
- 
-IF (USE_PREBUILT_TOOLS) 
-    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/ragel6/ya.make.prebuilt) 
-ENDIF() 
- 
-IF (NOT PREBUILT) 
-    INCLUDE(${ARCADIA_ROOT}/contrib/tools/ragel6/bin/ya.make) 
-ENDIF() 
-
-RECURSE( 
-    bin 
-) 
+
+IF (USE_PREBUILT_TOOLS)
+    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/ragel6/ya.make.prebuilt)
+ENDIF()
+
+IF (NOT PREBUILT)
+    INCLUDE(${ARCADIA_ROOT}/contrib/tools/ragel6/bin/ya.make)
+ENDIF()
+
+RECURSE(
+    bin
+)
diff --git a/contrib/tools/yasm/bin/ya.make b/contrib/tools/yasm/bin/ya.make
index fc7d195fc7..96ca75c53e 100644
--- a/contrib/tools/yasm/bin/ya.make
+++ b/contrib/tools/yasm/bin/ya.make
@@ -1,11 +1,11 @@
-OWNER( 
-    somov 
-    g:contrib 
-    g:ymake 
-) 
- 
-PROGRAM(yasm) 
- 
+OWNER(
+    somov
+    g:contrib
+    g:ymake
+)
+
+PROGRAM(yasm)
+
 IF (MUSL)
     PEERDIR(contrib/libs/musl_extra)
     PEERDIR(contrib/libs/jemalloc)
@@ -16,105 +16,105 @@ ELSE()
     NO_PLATFORM()
 ENDIF()
 
-NO_CLANG_COVERAGE() 
-NO_COMPILER_WARNINGS() 
-NO_UTIL() 
- 
-ALLOCATOR(FAKE) 
- 
-ADDINCL( 
-    contrib/tools/yasm 
-    contrib/tools/yasm/frontends/yasm 
-    contrib/tools/yasm/modules 
-) 
- 
-CFLAGS( 
-    -DHAVE_CONFIG_H 
-    -DYASM_LIB_SOURCE 
-) 
- 
-SRCDIR(contrib/tools/yasm) 
- 
-SRCS( 
-    frontends/yasm/yasm-options.c 
-    frontends/yasm/yasm.c 
-    libyasm/assocdat.c 
-    libyasm/bc-align.c 
-    libyasm/bc-data.c 
-    libyasm/bc-incbin.c 
-    libyasm/bc-org.c 
-    libyasm/bc-reserve.c 
-    libyasm/bitvect.c 
-    libyasm/bytecode.c 
-    libyasm/cmake-module.c 
-    libyasm/errwarn.c 
-    libyasm/expr.c 
-    libyasm/file.c 
-    libyasm/floatnum.c 
-    libyasm/hamt.c 
-    libyasm/insn.c 
-    libyasm/intnum.c 
-    libyasm/inttree.c 
-    libyasm/linemap.c 
-    libyasm/md5.c 
-    libyasm/mergesort.c 
-    libyasm/phash.c 
-    libyasm/replace_path.c 
-    libyasm/section.c 
-    libyasm/strcasecmp.c 
-    libyasm/strsep.c 
-    libyasm/symrec.c 
-    libyasm/valparam.c 
-    libyasm/value.c 
-    libyasm/xmalloc.c 
-    libyasm/xstrdup.c 
-    modules/arch/lc3b/lc3barch.c 
-    modules/arch/lc3b/lc3bbc.c 
-    modules/arch/x86/x86arch.c 
-    modules/arch/x86/x86bc.c 
-    modules/arch/x86/x86expr.c 
-    modules/arch/x86/x86id.c 
-    modules/dbgfmts/codeview/cv-dbgfmt.c 
-    modules/dbgfmts/codeview/cv-symline.c 
-    modules/dbgfmts/codeview/cv-type.c 
-    modules/dbgfmts/dwarf2/dwarf2-aranges.c 
-    modules/dbgfmts/dwarf2/dwarf2-dbgfmt.c 
-    modules/dbgfmts/dwarf2/dwarf2-info.c 
-    modules/dbgfmts/dwarf2/dwarf2-line.c 
-    modules/dbgfmts/null/null-dbgfmt.c 
-    modules/dbgfmts/stabs/stabs-dbgfmt.c 
-    modules/gas-token.c 
-    modules/init_plugin.c 
-    modules/lc3bid.c 
-    modules/listfmts/nasm/nasm-listfmt.c 
-    modules/nasm-token.c 
-    modules/objfmts/bin/bin-objfmt.c 
-    modules/objfmts/coff/coff-objfmt.c 
-    modules/objfmts/coff/win64-except.c 
-    modules/objfmts/dbg/dbg-objfmt.c 
-    modules/objfmts/elf/elf-objfmt.c 
-    modules/objfmts/elf/elf-x86-amd64.c 
-    modules/objfmts/elf/elf-x86-x32.c 
-    modules/objfmts/elf/elf-x86-x86.c 
-    modules/objfmts/elf/elf.c 
-    modules/objfmts/macho/macho-objfmt.c 
-    modules/objfmts/rdf/rdf-objfmt.c 
-    modules/objfmts/xdf/xdf-objfmt.c 
-    modules/parsers/gas/gas-parse-intel.c 
-    modules/parsers/gas/gas-parse.c 
-    modules/parsers/gas/gas-parser.c 
-    modules/parsers/nasm/nasm-parse.c 
-    modules/parsers/nasm/nasm-parser.c 
-    modules/preprocs/cpp/cpp-preproc.c 
-    modules/preprocs/gas/gas-eval.c 
-    modules/preprocs/gas/gas-preproc.c 
-    modules/preprocs/nasm/nasm-eval.c 
-    modules/preprocs/nasm/nasm-pp.c 
-    modules/preprocs/nasm/nasm-preproc.c 
-    modules/preprocs/nasm/nasmlib.c 
-    modules/preprocs/raw/raw-preproc.c 
-    modules/x86cpu.c 
-    modules/x86regtmod.c 
-) 
- 
-END() 
+NO_CLANG_COVERAGE()
+NO_COMPILER_WARNINGS()
+NO_UTIL()
+
+ALLOCATOR(FAKE)
+
+ADDINCL(
+    contrib/tools/yasm
+    contrib/tools/yasm/frontends/yasm
+    contrib/tools/yasm/modules
+)
+
+CFLAGS(
+    -DHAVE_CONFIG_H
+    -DYASM_LIB_SOURCE
+)
+
+SRCDIR(contrib/tools/yasm)
+
+SRCS(
+    frontends/yasm/yasm-options.c
+    frontends/yasm/yasm.c
+    libyasm/assocdat.c
+    libyasm/bc-align.c
+    libyasm/bc-data.c
+    libyasm/bc-incbin.c
+    libyasm/bc-org.c
+    libyasm/bc-reserve.c
+    libyasm/bitvect.c
+    libyasm/bytecode.c
+    libyasm/cmake-module.c
+    libyasm/errwarn.c
+    libyasm/expr.c
+    libyasm/file.c
+    libyasm/floatnum.c
+    libyasm/hamt.c
+    libyasm/insn.c
+    libyasm/intnum.c
+    libyasm/inttree.c
+    libyasm/linemap.c
+    libyasm/md5.c
+    libyasm/mergesort.c
+    libyasm/phash.c
+    libyasm/replace_path.c
+    libyasm/section.c
+    libyasm/strcasecmp.c
+    libyasm/strsep.c
+    libyasm/symrec.c
+    libyasm/valparam.c
+    libyasm/value.c
+    libyasm/xmalloc.c
+    libyasm/xstrdup.c
+    modules/arch/lc3b/lc3barch.c
+    modules/arch/lc3b/lc3bbc.c
+    modules/arch/x86/x86arch.c
+    modules/arch/x86/x86bc.c
+    modules/arch/x86/x86expr.c
+    modules/arch/x86/x86id.c
+    modules/dbgfmts/codeview/cv-dbgfmt.c
+    modules/dbgfmts/codeview/cv-symline.c
+    modules/dbgfmts/codeview/cv-type.c
+    modules/dbgfmts/dwarf2/dwarf2-aranges.c
+    modules/dbgfmts/dwarf2/dwarf2-dbgfmt.c
+    modules/dbgfmts/dwarf2/dwarf2-info.c
+    modules/dbgfmts/dwarf2/dwarf2-line.c
+    modules/dbgfmts/null/null-dbgfmt.c
+    modules/dbgfmts/stabs/stabs-dbgfmt.c
+    modules/gas-token.c
+    modules/init_plugin.c
+    modules/lc3bid.c
+    modules/listfmts/nasm/nasm-listfmt.c
+    modules/nasm-token.c
+    modules/objfmts/bin/bin-objfmt.c
+    modules/objfmts/coff/coff-objfmt.c
+    modules/objfmts/coff/win64-except.c
+    modules/objfmts/dbg/dbg-objfmt.c
+    modules/objfmts/elf/elf-objfmt.c
+    modules/objfmts/elf/elf-x86-amd64.c
+    modules/objfmts/elf/elf-x86-x32.c
+    modules/objfmts/elf/elf-x86-x86.c
+    modules/objfmts/elf/elf.c
+    modules/objfmts/macho/macho-objfmt.c
+    modules/objfmts/rdf/rdf-objfmt.c
+    modules/objfmts/xdf/xdf-objfmt.c
+    modules/parsers/gas/gas-parse-intel.c
+    modules/parsers/gas/gas-parse.c
+    modules/parsers/gas/gas-parser.c
+    modules/parsers/nasm/nasm-parse.c
+    modules/parsers/nasm/nasm-parser.c
+    modules/preprocs/cpp/cpp-preproc.c
+    modules/preprocs/gas/gas-eval.c
+    modules/preprocs/gas/gas-preproc.c
+    modules/preprocs/nasm/nasm-eval.c
+    modules/preprocs/nasm/nasm-pp.c
+    modules/preprocs/nasm/nasm-preproc.c
+    modules/preprocs/nasm/nasmlib.c
+    modules/preprocs/raw/raw-preproc.c
+    modules/x86cpu.c
+    modules/x86regtmod.c
+)
+
+END()
diff --git a/contrib/tools/yasm/ya.make b/contrib/tools/yasm/ya.make
index ace1161336..d1f8adc08f 100644
--- a/contrib/tools/yasm/ya.make
+++ b/contrib/tools/yasm/ya.make
@@ -6,19 +6,19 @@
 OWNER(
     somov
     g:contrib
-    g:ymake 
+    g:ymake
 )
 
 VERSION(1.3.0)
 
-IF (USE_PREBUILT_TOOLS) 
-    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/yasm/ya.make.prebuilt) 
-ENDIF() 
- 
-IF (NOT PREBUILT) 
-    INCLUDE(${ARCADIA_ROOT}/contrib/tools/yasm/bin/ya.make) 
-ENDIF() 
- 
-RECURSE( 
-    bin 
+IF (USE_PREBUILT_TOOLS)
+    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/yasm/ya.make.prebuilt)
+ENDIF()
+
+IF (NOT PREBUILT)
+    INCLUDE(${ARCADIA_ROOT}/contrib/tools/yasm/bin/ya.make)
+ENDIF()
+
+RECURSE(
+    bin
 )