Enable the new command engine in semantics, batch #1

commit_hash:5b246144e81555f1bc12b2c8ca111e351dcd5ed7

Author: authorius

build/conf/bison_lex.conf

@@ -139,15 +139,17 @@ macro _SRC("y", SRC, SRCFLAGS...) {
     .PEERDIR=build/induced/by_bison
     .CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS ${env:_SRC_y_env} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${output;suf=$_BISON_GEN_EXT;nopath:SRC} ${input:SRC} ${SRCFLAGS} ${hide;kv:"p YC"} ${hide;kv:"pc light-green"} && $_BISON_PP
     .STRUCT_CMD=yes
-    .SEM=target_macroses-ITEM && target_macroses-macro target_bison_parser && target_macroses-args PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o;nopath;noext:SRC} ${hide;nopath;noext;output;suf=.h:SRC} ${hide;nopath;noext;addincl;output;suf=.h:SRC} && platform_vars-BISON_FLAGS ${quo:BISON_FLAGS} && conan-tool_requires m4/1.4.19 && conan-imports 'bin, m4* -> ./bin/m4/bin' && conan-tool_requires bison/3.8.2 && conan-imports 'bin, bison* -> ./bin/bison/bin' && conan-imports 'res, * -> ./bin/bison/res'
+    .SEM=target_macroses-ITEM && target_macroses-macro target_bison_parser && target_macroses-args PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o;nopath;noext:SRC} ${hide;output;suf=.h;nopath;noext:SRC} ${hide;addincl;output;suf=.h;nopath;noext:SRC} && platform_vars-BISON_FLAGS ${join= :BISON_FLAGS} && conan-tool_requires m4/1.4.19 && conan-imports 'bin, m4* -> ./bin/m4/bin' && conan-tool_requires bison/3.8.2 && conan-imports 'bin, bison* -> ./bin/bison/bin' && conan-imports 'res, * -> ./bin/bison/res'
+    .STRUCT_SEM=yes
 }
 
 macro _SRC("ypp", SRC, SRCFLAGS...) {
     .PEERDIR=build/induced/by_bison
     # TODO overloading support and redirection to `$_SRC(y $SRC $SRCFLAGS)`
     .CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS ${env:_SRC_y_env} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${output;suf=$_BISON_GEN_EXT;nopath:SRC} ${input:SRC} ${SRCFLAGS} ${hide;kv:"p YC"} ${hide;kv:"pc light-green"} && $_BISON_PP
     .STRUCT_CMD=yes
-    .SEM=$_SRC(y $SRC $SRCFLAGS)
+    .SEM=target_macroses-ITEM && target_macroses-macro target_bison_parser && target_macroses-args PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o;nopath;noext:SRC} ${hide;output;suf=.h;nopath;noext:SRC} ${hide;addincl;output;suf=.h;nopath;noext:SRC} && platform_vars-BISON_FLAGS ${join= :BISON_FLAGS} && conan-tool_requires m4/1.4.19 && conan-imports 'bin, m4* -> ./bin/m4/bin' && conan-tool_requires bison/3.8.2 && conan-imports 'bin, bison* -> ./bin/bison/bin' && conan-imports 'res, * -> ./bin/bison/res'
+    .STRUCT_SEM=yes
 }
 
 macro _SRC("l", SRC, SRCFLAGS...) {

build/conf/proto.conf

@@ -197,8 +197,9 @@ macro JAVA_PROTO_PLUGIN(NAME, TOOL, DEPS[]) {
     SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS $DEPS)
 }
 
+_ADD_SEM_PROP_IF_NON_EMPTY__CMDS=target_properties-ITEM && target_properties-name $Prop && target_properties-value $Args
 macro _ADD_SEM_PROP_IF_NON_EMPTY(Prop, Args...) {
-    .SEM=${pre=&& target_properties-ITEM && target_properties-name $Prop && target_properties-value :Args}
+    .SEM=$IF(${not;empty:Args} THEN $_ADD_SEM_PROP_IF_NON_EMPTY__CMDS)
 }
 
 # tag:proto tag:java-specific
@@ -216,7 +217,7 @@ macro WITH_KOTLIN_GRPC() {
 # tag:proto tag:cpp-specific
 macro _ADD_CPP_PROTO_OUT(Suf) {
     SET_APPEND(CPP_PROTO_OUTS \${norel;output;suf=$Suf;nopath;noext:File})
-    SET_APPEND(PROTOC_EXTRA_OUTS_SEM && protoc_extra_outs $Suf \${hide;output;suf=.o:Suf} \$_ADD_SEM_PROP_IF_NON_EMPTY(PROTO_NAMESPACE $PROTO_NAMESPACE))
+    SET_APPEND(PROTOC_EXTRA_OUTS_SEM && protoc_extra_outs $Suf && \$_ADD_SEM_PROP_IF_NON_EMPTY(PROTO_NAMESPACE $PROTO_NAMESPACE))
 
     # XXX fix variable expansion in plugins
     SET(CPP_PROTO_SUFFIXES $CPP_PROTO_SUFFIXES $Suf)
@@ -232,7 +233,8 @@ CPP_PROTOBUF_PEERS=
 ### Define protoc plugin for C++ with given Name that emits code into regular outputs
 ### using Tool. Extra dependencies are passed via DEPS.
 macro CPP_PROTO_PLUGIN0(NAME, TOOL, DEPS[], EXTRA_OUT_FLAG="") {
-    .SEM=target_macroses-ITEM && target_macroses-macro target_proto_plugin && target_macroses-args $NAME ${tool;rootrel:TOOL} ${hide;output;suf=.fake.o:NAME}
+    .SEM=target_macroses-ITEM && target_macroses-macro target_proto_plugin && target_macroses-args $NAME ${tool:TOOL} ${hide;output;suf=.fake.o:NAME}
+    .STRUCT_SEM=yes
     SET_APPEND(CPP_PROTO_OPTS $_PROTO_PLUGIN_ARGS_BASE($NAME $TOOL $EXTRA_OUT_FLAG))
 
     # XXX fix variable expansion in plugins
@@ -419,7 +421,7 @@ macro YT_ORM_PROTO_YSON(OUT_OPTS[], Files...) {
 
 _SEM_CPP_PROTO_CMD=target_options-privates-ITEM && target_options-privates-option target_proto_messages && target_options-privates-args ${input:File} \
                    $CPP_PROTO_OUTS_SEM ${hide;output;suf=${OBJ_SUF}.pb.o:File} $DEFAULT_PROTOC_TOOLS \
-                   $PROTOC_EXTRA_OUTS_SEM \
+                   && $PROTOC_EXTRA_OUTS_SEM \
                    && platform_vars-COMMON_PROTOC_FLAGS "" \
                    && target_macroses-ITEM && target_macroses-macro target_proto_outs && target_macroses-args --cpp_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE $PROTOC_STYLEGUIDE_OUT \
                    && target_macroses-ITEM && target_macroses-macro target_proto_addincls && target_macroses-args ./$PROTO_NAMESPACE $ARCADIA_ROOT/$PROTO_NAMESPACE ${_PROTO__INCLUDE} $ARCADIA_BUILD_ROOT $PROTOBUF_INCLUDE_PATH